Changes in src/SymTab/Validate.cc [d24d4e1:06edda0]

File:

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

src/SymTab/Validate.cc

@@ -106 +106 @@
 
         /// Fix return types so that every function returns exactly one value
-        struct ReturnTypeFixer {
+        class ReturnTypeFixer {
+          public:
                 static void fix( std::list< Declaration * > &translationUnit );
 
@@ -114 +115 @@
 
         /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers.
-        struct EnumAndPointerDecay {
+        class EnumAndPointerDecay {
+        public:
                 void previsit( EnumDecl *aggregateDecl );
                 void previsit( FunctionType *func );
@@ -157 +159 @@
         };
 
-        struct ReturnChecker : public WithGuards {
+        class ReturnChecker : public WithScopes {
+          public:
                 /// Checks that return statements return nothing if their return type is void
                 /// and return something if the return type is non-void.
                 static void checkFunctionReturns( std::list< Declaration * > & translationUnit );
-
+          private:
                 void previsit( FunctionDecl * functionDecl );
                 void previsit( ReturnStmt * returnStmt );
@@ -202 +205 @@
         };
 
-        struct VerifyCtorDtorAssign {
+        class VerifyCtorDtorAssign {
+        public:
                 /// ensure that constructors, destructors, and assignment have at least one
                 /// parameter, the first of which must be a pointer, and that ctor/dtors have no
@@ -212 +216 @@
 
         /// ensure that generic types have the correct number of type arguments
-        struct ValidateGenericParameters {
+        class ValidateGenericParameters {
+        public:
                 void previsit( StructInstType * inst );
                 void previsit( UnionInstType * inst );
         };
 
-        struct ArrayLength {
+        class ArrayLength {
+        public:
                 /// for array types without an explicit length, compute the length and store it so that it
                 /// is known to the rest of the phases. For example,
@@ -230 +236 @@
         };
 
-        struct CompoundLiteral final : public WithDeclsToAdd, public WithVisitorRef<CompoundLiteral> {
+        class CompoundLiteral final : public GenPoly::DeclMutator {
                 Type::StorageClasses storageClasses;
 
-                void premutate( ObjectDecl *objectDecl );
-                Expression * postmutate( CompoundLiteralExpr *compLitExpr );
+                using GenPoly::DeclMutator::mutate;
+                DeclarationWithType * mutate( ObjectDecl *objectDecl ) final;
+                Expression *mutate( CompoundLiteralExpr *compLitExpr ) final;
         };
 
@@ -241 +248 @@
                 LinkReferenceToTypes lrt( doDebug, 0 );
                 ForallPointerDecay fpd( 0 );
-                PassVisitor<CompoundLiteral> compoundliteral;
+                CompoundLiteral compoundliteral;
                 PassVisitor<ValidateGenericParameters> genericParams;
 
@@ -256 +263 @@
                 Concurrency::implementThreadStarter( translationUnit );
                 ReturnChecker::checkFunctionReturns( translationUnit );
-                mutateAll( translationUnit, compoundliteral );
+                compoundliteral.mutateDeclarationList( translationUnit );
                 acceptAll( translationUnit, fpd );
                 ArrayLength::computeLength( translationUnit );
@@ -876 +883 @@
         }
 
-        void CompoundLiteral::premutate( ObjectDecl *objectDecl ) {
+        DeclarationWithType * CompoundLiteral::mutate( ObjectDecl *objectDecl ) {
                 storageClasses = objectDecl->get_storageClasses();
-        }
-
-        Expression *CompoundLiteral::postmutate( CompoundLiteralExpr *compLitExpr ) {
+                DeclarationWithType * temp = Mutator::mutate( objectDecl );
+                return temp;
+        }
+
+        Expression *CompoundLiteral::mutate( CompoundLiteralExpr *compLitExpr ) {
                 // transform [storage_class] ... (struct S){ 3, ... };
                 // into [storage_class] struct S temp =  { 3, ... };
                 static UniqueName indexName( "_compLit" );
 
-                ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, nullptr, compLitExpr->get_result(), compLitExpr->get_initializer() );
-                compLitExpr->set_result( nullptr );
-                compLitExpr->set_initializer( nullptr );
+                ObjectDecl *tempvar = new ObjectDecl( indexName.newName(), storageClasses, LinkageSpec::C, 0, compLitExpr->get_result(), compLitExpr->get_initializer() );
+                compLitExpr->set_result( 0 );
+                compLitExpr->set_initializer( 0 );
                 delete compLitExpr;
-                declsToAddBefore.push_back( tempvar );                                  // add modified temporary to current block
-                return new VariableExpr( tempvar );
+                DeclarationWithType * newtempvar = mutate( tempvar );
+                addDeclaration( newtempvar );                                   // add modified temporary to current block
+                return new VariableExpr( newtempvar );
         }