Changeset 70a06f6 for src/SymTab/Validate.cc

Timestamp:

Apr 14, 2016, 4:13:10 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

356189a

Parents:

db4ecc5 (diff), 37f0da8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/AddVisit.h
src/SymTab/Validate.cc
src/SynTree/Expression.cc
src/SynTree/Expression.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/iostream.c

File:

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

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 04 17:13:29 2016
+// Last Modified On : Thu Apr 14 15:37:23 2016
 // Update Count     : 297
 //
@@ -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"
@@ -71 +73 @@
 
                 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();
@@ -132 +130 @@
                 /// and return something if the return type is non-void.
                 static void checkFunctionReturns( std::list< Declaration * > & translationUnit );
-
           private:
                 virtual void visit( FunctionDecl * functionDecl );
@@ -163 +160 @@
                 AggDecl *handleAggregate( AggDecl * aggDecl );
 
+                template<typename AggDecl>
+                void addImplicitTypedef( AggDecl * aggDecl );
+
                 typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
                 TypedefMap typedefNames;
@@ -175 +175 @@
                 static void verify( std::list< Declaration * > &translationUnit );
 
-                // VerifyCtorDtor() {}
-
                 virtual void visit( FunctionDecl *funcDecl );
-        private:
+};
+
+        class CompoundLiteral : public GenPoly::DeclMutator {
+                DeclarationNode::StorageClass storageclass = DeclarationNode::NoStorageClass;
+
+                virtual DeclarationWithType * mutate( ObjectDecl *objectDecl );
+                virtual Expression *mutate( CompoundLiteralExpr *compLitExpr );
         };
 
@@ -185 +189 @@
                 Pass2 pass2( doDebug, 0 );
                 Pass3 pass3( 0 );
+                CompoundLiteral compoundliteral;
+
                 EliminateTypedef::eliminateTypedef( translationUnit );
                 HoistStruct::hoistStruct( translationUnit );
@@ -190 +196 @@
                 acceptAll( translationUnit, pass2 );
                 ReturnChecker::checkFunctionReturns( translationUnit );
+                mutateAll( translationUnit, compoundliteral );
                 autogenerateRoutines( translationUnit );
                 acceptAll( translationUnit, pass3 );
@@ -258 +265 @@
         }
 
-        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 );
@@ -278 +273 @@
         }
 
-        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 ) {
@@ -620 +611 @@
         }
 
-        // 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 ) {
@@ -637 +627 @@
         }
 
+        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 );
@@ -643 +649 @@
 
         Declaration *EliminateTypedef::mutate( UnionDecl * unionDecl ) {
+                addImplicitTypedef( unionDecl );
                 Mutator::mutate( unionDecl );
                 return handleAggregate( unionDecl );
@@ -648 +655 @@
 
         Declaration *EliminateTypedef::mutate( EnumDecl * enumDecl ) {
+                addImplicitTypedef( enumDecl );
                 Mutator::mutate( enumDecl );
                 return handleAggregate( enumDecl );
         }
 
-                Declaration *EliminateTypedef::mutate( TraitDecl * contextDecl ) {
+        Declaration *EliminateTypedef::mutate( TraitDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );
@@ -689 +697 @@
                 // added, so not in this pass!
         }
+
+        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