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

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 Jan 27 22:03:12 2016
-// Update Count     : 225
+// Last Modified On : Wed Apr 13 16:39:30 2016
+// Update Count     : 251
 //
 
@@ -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"
@@ -49 +52 @@
 #include "FixFunction.h"
 // #include "ImplementationType.h"
-#include "Common/utility.h"
-#include "Common/UniqueName.h"
+#include "GenPoly/DeclMutator.h"
 #include "AddVisit.h"
 #include "MakeLibCfa.h"
@@ -70 +72 @@
 
                 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( CatchStmt *catchStmt );
+                // virtual void visit( CaseStmt *caseStmt );
           private:
                 HoistStruct();
@@ -101 +99 @@
                 virtual void visit( StructInstType *structInst );
                 virtual void visit( UnionInstType *unionInst );
-                virtual void visit( ContextInstType *contextInst );
+                virtual void visit( TraitInstType *contextInst );
                 virtual void visit( StructDecl *structDecl );
                 virtual void visit( UnionDecl *unionDecl );
@@ -137 +135 @@
                 virtual void visit( UnionDecl *structDecl );
                 virtual void visit( TypeDecl *typeDecl );
-                virtual void visit( ContextDecl *ctxDecl );
+                virtual void visit( TraitDecl *ctxDecl );
                 virtual void visit( FunctionDecl *functionDecl );
 
@@ -144 +142 @@
 
                 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( CatchStmt *catchStmt );
+                // virtual void visit( CaseStmt *caseStmt );
 
                 AutogenerateRoutines() : functionNesting( 0 ) {}
@@ -166 +160 @@
                 /// and return something if the return type is non-void.
                 static void checkFunctionReturns( std::list< Declaration * > & translationUnit );
-
           private:
                 virtual void visit( FunctionDecl * functionDecl );
@@ -192 +185 @@
                 virtual Declaration *mutate( UnionDecl * unionDecl );
                 virtual Declaration *mutate( EnumDecl * enumDecl );
-                virtual Declaration *mutate( ContextDecl * contextDecl );
+                virtual Declaration *mutate( TraitDecl * 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;
@@ -202 +198 @@
         };
 
+        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 );
@@ -211 +216 @@
                 acceptAll( translationUnit, pass2 );
                 ReturnChecker::checkFunctionReturns( translationUnit );
+                mutateAll( translationUnit, compoundliteral );
                 AutogenerateRoutines::autogenerateRoutines( translationUnit );
                 acceptAll( translationUnit, pass3 );
@@ -292 +298 @@
         }
 
-        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 );
@@ -312 +306 @@
         }
 
-        void HoistStruct::visit( CaseStmt *caseStmt ) {
-                addVisit( caseStmt, *this );
-        }
-
-        void HoistStruct::visit( CatchStmt *cathStmt ) {
-                addVisit( cathStmt, *this );
-        }
+        // void HoistStruct::visit( CaseStmt *caseStmt ) {
+        //      addVisit( caseStmt, *this );
+        // }
 
         void Pass1::visit( EnumDecl *enumDecl ) {
@@ -404 +394 @@
         }
 
-        void Pass2::visit( ContextInstType *contextInst ) {
+        void Pass2::visit( TraitInstType *contextInst ) {
                 Parent::visit( contextInst );
-                ContextDecl *ctx = indexer->lookupContext( contextInst->get_name() );
+                TraitDecl *ctx = indexer->lookupTrait( contextInst->get_name() );
                 if ( ! ctx ) {
                         throw SemanticError( "use of undeclared context " + contextInst->get_name() );
@@ -412 +402 @@
                 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 ( ContextInstType *otherCtx = dynamic_cast< ContextInstType * >(*assert ) ) {
+                                if ( TraitInstType *otherCtx = dynamic_cast< TraitInstType * >(*assert ) ) {
                                         cloneAll( otherCtx->get_members(), contextInst->get_members() );
                                 } else {
@@ -476 +466 @@
                         while ( ! toBeDone.empty() ) {
                                 for ( std::list< DeclarationWithType * >::iterator assertion = toBeDone.begin(); assertion != toBeDone.end(); ++assertion ) {
-                                        if ( ContextInstType *ctx = dynamic_cast< ContextInstType * >( (*assertion )->get_type() ) ) {
+                                        if ( TraitInstType *ctx = dynamic_cast< TraitInstType * >( (*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 );
@@ -783 +773 @@
                 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 ) ) );
 
@@ -851 +841 @@
         }
 
-        void AutogenerateRoutines::visit( ContextDecl *) {
+        void AutogenerateRoutines::visit( TraitDecl *) {
                 // ensure that we don't add assignment ops for types defined as part of the context
         }
@@ -874 +864 @@
         }
 
-        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 );
@@ -894 +872 @@
         }
 
-        void AutogenerateRoutines::visit( CaseStmt *caseStmt ) {
-                visitStatement( caseStmt );
-        }
-
-        void AutogenerateRoutines::visit( CatchStmt *cathStmt ) {
-                visitStatement( cathStmt );
-        }
+        // void AutogenerateRoutines::visit( CaseStmt *caseStmt ) {
+        //      visitStatement( caseStmt );
+        // }
 
         void ReturnChecker::checkFunctionReturns( std::list< Declaration * > & translationUnit ) {
@@ -1043 +1017 @@
         }
 
-        // 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 ) {
@@ -1059 +1032 @@
                 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 );
@@ -1066 +1055 @@
 
         Declaration *EliminateTypedef::mutate( UnionDecl * unionDecl ) {
+                addImplicitTypedef( unionDecl );
                 Mutator::mutate( unionDecl );
                 return handleAggregate( unionDecl );
@@ -1071 +1061 @@
 
         Declaration *EliminateTypedef::mutate( EnumDecl * enumDecl ) {
+                addImplicitTypedef( enumDecl );
                 Mutator::mutate( enumDecl );
                 return handleAggregate( enumDecl );
         }
 
-                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+        Declaration *EliminateTypedef::mutate( TraitDecl * 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