Changes in src/SymTab/Validate.cc [522363e:8b11840]

File:

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

src/SymTab/Validate.cc

@@ -56 +56 @@
 #include "FixFunction.h"               // for FixFunction
 #include "Indexer.h"                   // for Indexer
+#include "InitTweak/GenInit.h"         // for fixReturnStatements
 #include "InitTweak/InitTweak.h"       // for isCtorDtorAssign
 #include "Parser/LinkageSpec.h"        // for C
@@ -150 +151 @@
         /// Replaces array and function types in forall lists by appropriate pointer type and assigns each Object and Function declaration a unique ID.
         struct ForallPointerDecay final {
-                void previsit( ObjectDecl *object );
-                void previsit( FunctionDecl *func );
+                void previsit( ObjectDecl * object );
+                void previsit( FunctionDecl * func );
         };
 
@@ -268 +269 @@
                 acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
                 acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist
+                acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines
                 VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
                 Concurrency::applyKeywords( translationUnit );
@@ -275 +277 @@
                 ReturnChecker::checkFunctionReturns( translationUnit );
                 mutateAll( translationUnit, compoundliteral );
-                acceptAll( translationUnit, fpd );
                 ArrayLength::computeLength( translationUnit );
                 acceptAll( translationUnit, finder );
@@ -579 +580 @@
 
         /// Fix up assertions - flattens assertion lists, removing all trait instances
-        void forallFixer( Type * func ) {
-                for ( TypeDecl * type : func->get_forall() ) {
+        void forallFixer( std::list< TypeDecl * > & forall, BaseSyntaxNode * node ) {
+                for ( TypeDecl * type : forall ) {
                         std::list< DeclarationWithType * > asserts;
                         asserts.splice( asserts.end(), type->assertions );
@@ -599 +600 @@
                                 assertion = assertion->acceptMutator( fixer );
                                 if ( fixer.get_isVoid() ) {
-                                        throw SemanticError( "invalid type void in assertion of function ", func );
+                                        throw SemanticError( "invalid type void in assertion of function ", node );
                                 } // if
                         } // for
@@ -607 +608 @@
 
         void ForallPointerDecay::previsit( ObjectDecl *object ) {
-                forallFixer( object->get_type() );
-                if ( PointerType *pointer = dynamic_cast< PointerType * >( object->get_type() ) ) {
-                        forallFixer( pointer->get_base() );
+                forallFixer( object->type->forall, object );
+                if ( PointerType *pointer = dynamic_cast< PointerType * >( object->type ) ) {
+                        forallFixer( pointer->base->forall, object );
                 } // if
                 object->fixUniqueId();
@@ -615 +616 @@
 
         void ForallPointerDecay::previsit( FunctionDecl *func ) {
-                forallFixer( func->get_type() );
+                forallFixer( func->type->forall, func );
                 func->fixUniqueId();
         }