Changes in src/SymTab/Validate.cc [45161b4d:61a4875]

File:

• src/SymTab/Validate.cc (modified) (24 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 : Wed Apr 13 16:39:30 2016
-// Update Count     : 251
+// Last Modified On : Wed Jan 27 22:03:12 2016
+// Update Count     : 225
 //
 
@@ -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();
@@ -99 +101 @@
                 virtual void visit( StructInstType *structInst );
                 virtual void visit( UnionInstType *unionInst );
-                virtual void visit( TraitInstType *contextInst );
+                virtual void visit( ContextInstType *contextInst );
                 virtual void visit( StructDecl *structDecl );
                 virtual void visit( UnionDecl *unionDecl );
@@ -135 +137 @@
                 virtual void visit( UnionDecl *structDecl );
                 virtual void visit( TypeDecl *typeDecl );
-                virtual void visit( TraitDecl *ctxDecl );
+                virtual void visit( ContextDecl *ctxDecl );
                 virtual void visit( FunctionDecl *functionDecl );
 
@@ -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 );
@@ -185 +192 @@
                 virtual Declaration *mutate( UnionDecl * unionDecl );
                 virtual Declaration *mutate( EnumDecl * enumDecl );
-                virtual Declaration *mutate( TraitDecl * contextDecl );
+                virtual Declaration *mutate( ContextDecl * contextDecl );
 
                 template<typename AggDecl>
                 AggDecl *handleAggregate( AggDecl * aggDecl );
 
-                template<typename AggDecl>
-                void addImplicitTypedef( AggDecl * aggDecl );
-                
                 typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
                 TypedefMap typedefNames;
@@ -198 +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 );
@@ -216 +211 @@
                 acceptAll( translationUnit, pass2 );
                 ReturnChecker::checkFunctionReturns( translationUnit );
-                mutateAll( translationUnit, compoundliteral );
                 AutogenerateRoutines::autogenerateRoutines( translationUnit );
                 acceptAll( translationUnit, pass3 );
@@ -298 +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 );
@@ -306 +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 ) {
@@ -394 +404 @@
         }
 
-        void Pass2::visit( TraitInstType *contextInst ) {
+        void Pass2::visit( ContextInstType *contextInst ) {
                 Parent::visit( contextInst );
-                TraitDecl *ctx = indexer->lookupTrait( contextInst->get_name() );
+                ContextDecl *ctx = indexer->lookupContext( contextInst->get_name() );
                 if ( ! ctx ) {
                         throw SemanticError( "use of undeclared context " + contextInst->get_name() );
@@ -402 +412 @@
                 for ( std::list< TypeDecl * >::const_iterator i = ctx->get_parameters().begin(); i != ctx->get_parameters().end(); ++i ) {
                         for ( std::list< DeclarationWithType * >::const_iterator assert = (*i )->get_assertions().begin(); assert != (*i )->get_assertions().end(); ++assert ) {
-                                if ( TraitInstType *otherCtx = dynamic_cast< TraitInstType * >(*assert ) ) {
+                                if ( ContextInstType *otherCtx = dynamic_cast< ContextInstType * >(*assert ) ) {
                                         cloneAll( otherCtx->get_members(), contextInst->get_members() );
                                 } else {
@@ -466 +476 @@
                         while ( ! toBeDone.empty() ) {
                                 for ( std::list< DeclarationWithType * >::iterator assertion = toBeDone.begin(); assertion != toBeDone.end(); ++assertion ) {
-                                        if ( TraitInstType *ctx = dynamic_cast< TraitInstType * >( (*assertion )->get_type() ) ) {
+                                        if ( ContextInstType *ctx = dynamic_cast< ContextInstType * >( (*assertion )->get_type() ) ) {
                                                 for ( std::list< Declaration * >::const_iterator i = ctx->get_members().begin(); i != ctx->get_members().end(); ++i ) {
                                                         DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( *i );
@@ -773 +783 @@
                 makeUnionFieldsAssignment( srcParam, dstParam, cloneWithParams( refType, unionParams ), back_inserter( assignDecl->get_statements()->get_kids() ) );
                 if ( isGeneric ) makeUnionFieldsAssignment( srcParam, returnVal, cloneWithParams( refType, unionParams ), back_inserter( assignDecl->get_statements()->get_kids() ) );
-                
+
                 if ( ! isGeneric ) assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
 
@@ -841 +851 @@
         }
 
-        void AutogenerateRoutines::visit( TraitDecl *) {
+        void AutogenerateRoutines::visit( ContextDecl *) {
                 // ensure that we don't add assignment ops for types defined as part of the context
         }
@@ -864 +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 );
@@ -872 +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 ) {
@@ -1017 +1043 @@
         }
 
-        // there may be typedefs nested within aggregates in order for everything to work properly, these should be removed
-        // as well
+        // there may be typedefs nested within aggregates
+        // in order for everything to work properly, these
+        // should be removed as well
         template<typename AggDecl>
         AggDecl *EliminateTypedef::handleAggregate( AggDecl * aggDecl ) {
@@ -1032 +1059 @@
                 return aggDecl;
         }
-        
-        template<typename AggDecl>
-        void EliminateTypedef::addImplicitTypedef( AggDecl * aggDecl ) {
-                if ( typedefNames.count( aggDecl->get_name() ) == 0 ) {
-                        Type *type;
-                        if ( StructDecl * newDeclStructDecl = dynamic_cast< StructDecl * >( aggDecl ) ) {
-                                type = new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() );
-                        } else if ( UnionDecl * newDeclUnionDecl = dynamic_cast< UnionDecl * >( aggDecl ) ) {
-                                type = new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() );
-                        } else if ( EnumDecl * newDeclEnumDecl = dynamic_cast< EnumDecl * >( aggDecl )  ) {
-                                type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() );
-                        } // if
-                        TypedefDecl * tyDecl = new TypedefDecl( aggDecl->get_name(), DeclarationNode::NoStorageClass, type );
-                        typedefNames[ aggDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
-                } // if
-        }
+
         Declaration *EliminateTypedef::mutate( StructDecl * structDecl ) {
-                addImplicitTypedef( structDecl );
                 Mutator::mutate( structDecl );
                 return handleAggregate( structDecl );
@@ -1055 +1066 @@
 
         Declaration *EliminateTypedef::mutate( UnionDecl * unionDecl ) {
-                addImplicitTypedef( unionDecl );
                 Mutator::mutate( unionDecl );
                 return handleAggregate( unionDecl );
@@ -1061 +1071 @@
 
         Declaration *EliminateTypedef::mutate( EnumDecl * enumDecl ) {
-                addImplicitTypedef( enumDecl );
                 Mutator::mutate( enumDecl );
                 return handleAggregate( enumDecl );
         }
 
-        Declaration *EliminateTypedef::mutate( TraitDecl * contextDecl ) {
+                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );
         }
 
-        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