Changeset 2f42718 for src/SymTab/Autogen.cc

Timestamp:

Feb 22, 2019, 10:43:29 AM (5 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

no_list

Parents:

43e0949

Message:

Parameters and return value of functions are now vectors (and some related clean-up)

File:

• src/SymTab/Autogen.cc (modified) (5 diffs)

src/SymTab/Autogen.cc

@@ -410 +410 @@
                                 }
 
-                                assert( ! func->get_functionType()->get_parameters().empty() );
-                                ObjectDecl * dstParam = dynamic_cast<ObjectDecl*>( func->get_functionType()->get_parameters().front() );
+                                assert( ! func->get_functionType()->parameters.empty() );
+                                ObjectDecl * dstParam = dynamic_cast<ObjectDecl*>( func->get_functionType()->parameters.front() );
                                 ObjectDecl * srcParam = nullptr;
-                                if ( func->get_functionType()->get_parameters().size() == 2 ) {
-                                        srcParam = dynamic_cast<ObjectDecl*>( func->get_functionType()->get_parameters().back() );
+                                if ( func->get_functionType()->parameters.size() == 2 ) {
+                                        srcParam = dynamic_cast<ObjectDecl*>( func->get_functionType()->parameters.back() );
                                 }
 
@@ -429 +429 @@
         void StructFuncGenerator::makeFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func ) {
                 FunctionType * ftype = func->type;
-                std::list<DeclarationWithType*> & params = ftype->parameters;
+                auto & params = ftype->parameters;
                 assert( params.size() >= 2 );  // should not call this function for default ctor, etc.
 
@@ -435 +435 @@
                 ObjectDecl * dstParam = dynamic_cast<ObjectDecl*>( params.front() );
                 assert( dstParam );
-                std::list<DeclarationWithType*>::iterator parameter = params.begin()+1;
+                auto parameter = params.begin()+1;
                 for ( ; member != end; ++member ) {
                         if ( DeclarationWithType * field = dynamic_cast<DeclarationWithType*>( *member ) ) {
@@ -656 +656 @@
         void makeTupleFunctionBody( FunctionDecl * function ) {
                 FunctionType * ftype = function->get_functionType();
-                assertf( ftype->get_parameters().size() == 1 || ftype->get_parameters().size() == 2, "too many parameters in generated tuple function" );
+                assertf( ftype->parameters.size() == 1 || ftype->parameters.size() == 2, "too many parameters in generated tuple function" );
 
                 UntypedExpr * untyped = new UntypedExpr( new NameExpr( function->get_name() ) );
 
                 /// xxx - &* is used to make this easier for later passes to handle
-                untyped->get_args().push_back( new AddressExpr( UntypedExpr::createDeref( new VariableExpr( ftype->get_parameters().front() ) ) ) );
-                if ( ftype->get_parameters().size() == 2 ) {
-                        untyped->get_args().push_back( new VariableExpr( ftype->get_parameters().back() ) );
-                }
-                function->get_statements()->get_kids().push_back( new ExprStmt( untyped ) );
-                function->get_statements()->get_kids().push_back( new ReturnStmt( UntypedExpr::createDeref( new VariableExpr( ftype->get_parameters().front() ) ) ) );
+                untyped->get_args().push_back( new AddressExpr( UntypedExpr::createDeref( new VariableExpr( ftype->parameters.front() ) ) ) );
+                if ( ftype->parameters.size() == 2 ) {
+                        untyped->get_args().push_back( new VariableExpr( ftype->parameters.back() ) );
+                }
+                function->statements->get_kids().push_back( new ExprStmt( untyped ) );
+                function->statements->get_kids().push_back( new ReturnStmt( UntypedExpr::createDeref( new VariableExpr( ftype->parameters.front() ) ) ) );
         }
 
@@ -691 +691 @@
                                         TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), Type::StorageClasses(), nullptr, TypeDecl::Dtype, true );
                                         TypeInstType * inst = new TypeInstType( Type::Qualifiers(), newDecl->get_name(), newDecl );
-                                        newDecl->get_assertions().push_back( new FunctionDecl( "?=?", Type::StorageClasses(), LinkageSpec::Cforall, genAssignType( inst ), nullptr,
+                                        newDecl->assertions.push_back( new FunctionDecl( "?=?", Type::StorageClasses(), LinkageSpec::Cforall, genAssignType( inst ), nullptr,
                                                                                                                                                    std::vector< Attribute * >(), Type::FuncSpecifiers( Type::Inline ) ) );
-                                        newDecl->get_assertions().push_back( new FunctionDecl( "?{}", Type::StorageClasses(), LinkageSpec::Cforall, genDefaultType( inst ), nullptr,
+                                        newDecl->assertions.push_back( new FunctionDecl( "?{}", Type::StorageClasses(), LinkageSpec::Cforall, genDefaultType( inst ), nullptr,
                                                                                                                                                    std::vector< Attribute * >(), Type::FuncSpecifiers( Type::Inline ) ) );
-                                        newDecl->get_assertions().push_back( new FunctionDecl( "?{}", Type::StorageClasses(), LinkageSpec::Cforall, genCopyType( inst ), nullptr,
+                                        newDecl->assertions.push_back( new FunctionDecl( "?{}", Type::StorageClasses(), LinkageSpec::Cforall, genCopyType( inst ), nullptr,
                                                                                                                                                    std::vector< Attribute * >(), Type::FuncSpecifiers( Type::Inline ) ) );
-                                        newDecl->get_assertions().push_back( new FunctionDecl( "^?{}", Type::StorageClasses(), LinkageSpec::Cforall, genDefaultType( inst ), nullptr,
+                                        newDecl->assertions.push_back( new FunctionDecl( "^?{}", Type::StorageClasses(), LinkageSpec::Cforall, genDefaultType( inst ), nullptr,
                                                                                                                                                    std::vector< Attribute * >(), Type::FuncSpecifiers( Type::Inline ) ) );
                                         typeParams.push_back( newDecl );