Changes in src/SymTab/Validate.cc [630a82a:4040425]

File:

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

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr  7 16:45:30 2016
-// Update Count     : 243
+// Last Modified On : Wed Mar  2 17:31:39 2016
+// Update Count     : 226
 //
 
@@ -40 +40 @@
 #include <list>
 #include <iterator>
-#include "Common/utility.h"
-#include "Common/UniqueName.h"
 #include "Validate.h"
 #include "SynTree/Visitor.h"
 #include "SynTree/Mutator.h"
 #include "SynTree/Type.h"
-#include "SynTree/Expression.h"
 #include "SynTree/Statement.h"
 #include "SynTree/TypeSubstitution.h"
@@ -52 +49 @@
 #include "FixFunction.h"
 // #include "ImplementationType.h"
-#include "GenPoly/DeclMutator.h"
+#include "Common/utility.h"
+#include "Common/UniqueName.h"
 #include "AddVisit.h"
 #include "MakeLibCfa.h"
@@ -72 +70 @@
 
                 virtual void visit( CompoundStmt *compoundStmt );
+                virtual void visit( IfStmt *ifStmt );
+                virtual void visit( WhileStmt *whileStmt );
+                virtual void visit( ForStmt *forStmt );
                 virtual void visit( SwitchStmt *switchStmt );
                 virtual void visit( ChooseStmt *chooseStmt );
-                // virtual void visit( CaseStmt *caseStmt );
+                virtual void visit( CaseStmt *caseStmt );
+                virtual void visit( CatchStmt *catchStmt );
           private:
                 HoistStruct();
@@ -142 +144 @@
 
                 virtual void visit( CompoundStmt *compoundStmt );
+                virtual void visit( IfStmt *ifStmt );
+                virtual void visit( WhileStmt *whileStmt );
+                virtual void visit( ForStmt *forStmt );
                 virtual void visit( SwitchStmt *switchStmt );
                 virtual void visit( ChooseStmt *chooseStmt );
-                // virtual void visit( CaseStmt *caseStmt );
+                virtual void visit( CaseStmt *caseStmt );
+                virtual void visit( CatchStmt *catchStmt );
 
                 AutogenerateRoutines() : functionNesting( 0 ) {}
@@ -160 +166 @@
                 /// and return something if the return type is non-void.
                 static void checkFunctionReturns( std::list< Declaration * > & translationUnit );
+
           private:
                 virtual void visit( FunctionDecl * functionDecl );
@@ -195 +202 @@
         };
 
-        class CompoundLiteral : public GenPoly::DeclMutator {
-                DeclarationNode::StorageClass storageclass = DeclarationNode::NoStorageClass;
-
-                virtual DeclarationWithType * mutate( ObjectDecl *objectDecl );
-                virtual Expression *mutate( CompoundLiteralExpr *compLitExpr );
-        };
-
         void validate( std::list< Declaration * > &translationUnit, bool doDebug ) {
                 Pass1 pass1;
                 Pass2 pass2( doDebug, 0 );
                 Pass3 pass3( 0 );
-                CompoundLiteral compoundliteral;
-
                 EliminateTypedef::eliminateTypedef( translationUnit );
                 HoistStruct::hoistStruct( translationUnit );
@@ -213 +211 @@
                 acceptAll( translationUnit, pass2 );
                 ReturnChecker::checkFunctionReturns( translationUnit );
-                mutateAll( translationUnit, compoundliteral );
                 AutogenerateRoutines::autogenerateRoutines( translationUnit );
                 acceptAll( translationUnit, pass3 );
@@ -295 +292 @@
         }
 
+        void HoistStruct::visit( IfStmt *ifStmt ) {
+                addVisit( ifStmt, *this );
+        }
+
+        void HoistStruct::visit( WhileStmt *whileStmt ) {
+                addVisit( whileStmt, *this );
+        }
+
+        void HoistStruct::visit( ForStmt *forStmt ) {
+                addVisit( forStmt, *this );
+        }
+
         void HoistStruct::visit( SwitchStmt *switchStmt ) {
                 addVisit( switchStmt, *this );
@@ -303 +312 @@
         }
 
-        // void HoistStruct::visit( CaseStmt *caseStmt ) {
-        //      addVisit( caseStmt, *this );
-        // }
+        void HoistStruct::visit( CaseStmt *caseStmt ) {
+                addVisit( caseStmt, *this );
+        }
+
+        void HoistStruct::visit( CatchStmt *cathStmt ) {
+                addVisit( cathStmt, *this );
+        }
 
         void Pass1::visit( EnumDecl *enumDecl ) {
@@ -861 +874 @@
         }
 
+        void AutogenerateRoutines::visit( IfStmt *ifStmt ) {
+                visitStatement( ifStmt );
+        }
+
+        void AutogenerateRoutines::visit( WhileStmt *whileStmt ) {
+                visitStatement( whileStmt );
+        }
+
+        void AutogenerateRoutines::visit( ForStmt *forStmt ) {
+                visitStatement( forStmt );
+        }
+
         void AutogenerateRoutines::visit( SwitchStmt *switchStmt ) {
                 visitStatement( switchStmt );
@@ -869 +894 @@
         }
 
-        // void AutogenerateRoutines::visit( CaseStmt *caseStmt ) {
-        //      visitStatement( caseStmt );
-        // }
+        void AutogenerateRoutines::visit( CaseStmt *caseStmt ) {
+                visitStatement( caseStmt );
+        }
+
+        void AutogenerateRoutines::visit( CatchStmt *cathStmt ) {
+                visitStatement( cathStmt );
+        }
 
         void ReturnChecker::checkFunctionReturns( std::list< Declaration * > & translationUnit ) {
@@ -1051 +1080 @@
         }
 
-        DeclarationWithType * CompoundLiteral::mutate( ObjectDecl *objectDecl ) {
-                storageclass = objectDecl->get_storageClass();
-                DeclarationWithType * temp = Mutator::mutate( objectDecl );
-                storageclass = DeclarationNode::NoStorageClass;
-                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(), storageclass, LinkageSpec::C, 0, compLitExpr->get_type(), compLitExpr->get_initializer() );
-                compLitExpr->set_type( 0 );
-                compLitExpr->set_initializer( 0 );
-                delete compLitExpr;
-                DeclarationWithType * newtempvar = mutate( tempvar );
-                addDeclaration( newtempvar );                                   // add modified temporary to current block
-                return new VariableExpr( newtempvar );
-        }
 } // namespace SymTab