Changeset f1b1e4c for src/SymTab/Validate.cc

Timestamp:

Jun 1, 2016, 11:54:23 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

be945ac

Parents:

70f89d00

Message:

can construct global const objects, except with intrinsic constructors

File:

• src/SymTab/Validate.cc (modified) (3 diffs)

src/SymTab/Validate.cc

@@ -291 +291 @@
 
         namespace {
-                template< typename DWTIterator >
-                void fixFunctionList( DWTIterator begin, DWTIterator end, FunctionType *func ) {
+                template< typename DWTIterator, typename DWTList >
+                void fixFunctionList( DWTIterator begin, DWTIterator end, FunctionType *func, DWTList & dwts ) {
                         // the only case in which "void" is valid is where it is the only one in the list; then it should be removed
                         // entirely other fix ups are handled by the FixFunction class
@@ -298 +298 @@
                         FixFunction fixer;
                         DWTIterator i = begin;
-                        *i = (*i )->acceptMutator( fixer );
+                        *i = (*i)->acceptMutator( fixer );
                         if ( fixer.get_isVoid() ) {
                                 DWTIterator j = i;
                                 ++i;
-                                func->get_parameters().erase( j );
+                                dwts.erase( j );
                                 if ( i != end ) {
                                         throw SemanticError( "invalid type void in function type ", func );
@@ -321 +321 @@
         void Pass1::visit( FunctionType *func ) {
                 // Fix up parameters and return types
-                fixFunctionList( func->get_parameters().begin(), func->get_parameters().end(), func );
-                fixFunctionList( func->get_returnVals().begin(), func->get_returnVals().end(), func );
+                fixFunctionList( func->get_parameters().begin(), func->get_parameters().end(), func, func->get_parameters() );
+                fixFunctionList( func->get_returnVals().begin(), func->get_returnVals().end(), func, func->get_returnVals() );
                 Visitor::visit( func );
         }