Changeset cff1143 for src/SymTab

Timestamp:

Jul 9, 2015, 3:07:32 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, string, with_gc

Children:

0215a76f, dfee306

Parents:

82dd287 (diff), e5609dd (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SymTab

Files:

• TypeEquality.cc (added)
• TypeEquality.h (added)
• Validate.cc (modified) (14 diffs)
• module.mk (modified) (2 diffs)

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 07 10:41:23 2015
-// Update Count     : 136
+// Last Modified On : Wed Jul 08 12:49:36 2015
+// Update Count     : 166
 //
 
@@ -48 +48 @@
 #include "Indexer.h"
 #include "FixFunction.h"
-#include "ImplementationType.h"
+// #include "ImplementationType.h"
 #include "utility.h"
 #include "UniqueName.h"
 #include "AddVisit.h"
 #include "MakeLibCfa.h"
-
+#include "TypeEquality.h"
 
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
@@ -162 +162 @@
         class EliminateTypedef : public Mutator {
           public:
+          EliminateTypedef() : scopeLevel( 0 ) {}
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -171 +172 @@
                 virtual Type *mutate( TypeInstType *aggregateUseType );
                 virtual Expression *mutate( CastExpr *castExpr );
-  
-                std::map< std::string, TypedefDecl * > typedefNames;
+
+                typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
+                TypedefMap typedefNames;
+                int scopeLevel;
         };
 
@@ -589 +592 @@
                 assignDecl2->fixUniqueId();
 
+                // these should be built in the same way that the prelude
+                // functions are, so build a list containing the prototypes
+                // and allow MakeLibCfa to autogenerate the bodies.
                 std::list< Declaration * > assigns;
                 assigns.push_back( assignDecl );
@@ -595 +601 @@
                 LibCfa::makeLibCfa( assigns );
 
-                // need to remove the prototypes, since these can appear nested in a routine
+                // need to remove the prototypes, since this may be nested in a routine
                 for (int start = 0, end = assigns.size()/2; start < end; start++) {
                         delete assigns.front();
@@ -602 +608 @@
 
                 declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
-
-                // return assignDecl;
         }
 
@@ -802 +806 @@
 
         Type *EliminateTypedef::mutate( TypeInstType *typeInst ) {
-                std::map< std::string, TypedefDecl * >::const_iterator def = typedefNames.find( typeInst->get_name() );
+                // instances of typedef types will come here. If it is an instance 
+                // of a typdef type, link the instance to its actual type.
+                TypedefMap::const_iterator def = typedefNames.find( typeInst->get_name() );
                 if ( def != typedefNames.end() ) {
-                        Type *ret = def->second->get_base()->clone();
+                        Type *ret = def->second.first->get_base()->clone();
                         ret->get_qualifiers() += typeInst->get_qualifiers();
                         delete typeInst;
@@ -814 +820 @@
         Declaration *EliminateTypedef::mutate( TypedefDecl *tyDecl ) {
                 Declaration *ret = Mutator::mutate( tyDecl );
-                typedefNames[ tyDecl->get_name() ] = tyDecl;
+                if ( typedefNames.count( tyDecl->get_name() ) == 1 && typedefNames[ tyDecl->get_name() ].second == scopeLevel ) {
+                        // typedef to the same name from the same scope 
+                        // must be from the same type
+
+                        Type * t1 = tyDecl->get_base();
+                        Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base();
+                        if ( ! typeEquals( t1, t2, true ) ) {
+                                throw SemanticError( "cannot redefine typedef: " + tyDecl->get_name() );
+                        } 
+                } else {
+                        typedefNames[ tyDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
+                } // if
+
                 // When a typedef is a forward declaration:
                 //    typedef struct screen SCREEN;
@@ -833 +851 @@
 
         TypeDecl *EliminateTypedef::mutate( TypeDecl *typeDecl ) {
-                std::map< std::string, TypedefDecl * >::iterator i = typedefNames.find( typeDecl->get_name() );
+                TypedefMap::iterator i = typedefNames.find( typeDecl->get_name() );
                 if ( i != typedefNames.end() ) {
                         typedefNames.erase( i ) ;
@@ -841 +859 @@
 
         DeclarationWithType *EliminateTypedef::mutate( FunctionDecl *funcDecl ) {
-                std::map< std::string, TypedefDecl * > oldNames = typedefNames;
+                TypedefMap oldNames = typedefNames;
                 DeclarationWithType *ret = Mutator::mutate( funcDecl );
                 typedefNames = oldNames;
@@ -848 +866 @@
 
         ObjectDecl *EliminateTypedef::mutate( ObjectDecl *objDecl ) {
-                std::map< std::string, TypedefDecl * > oldNames = typedefNames;
+                TypedefMap oldNames = typedefNames;
                 ObjectDecl *ret = Mutator::mutate( objDecl );
                 typedefNames = oldNames;
@@ -855 +873 @@
 
         Expression *EliminateTypedef::mutate( CastExpr *castExpr ) {
-                std::map< std::string, TypedefDecl * > oldNames = typedefNames;
+                TypedefMap oldNames = typedefNames;
                 Expression *ret = Mutator::mutate( castExpr );
                 typedefNames = oldNames;
@@ -862 +880 @@
 
         CompoundStmt *EliminateTypedef::mutate( CompoundStmt *compoundStmt ) {
-                std::map< std::string, TypedefDecl * > oldNames = typedefNames;
+                TypedefMap oldNames = typedefNames;
+                scopeLevel += 1;
                 CompoundStmt *ret = Mutator::mutate( compoundStmt );
+                scopeLevel -= 1;
                 std::list< Statement * >::iterator i = compoundStmt->get_kids().begin();
                 while ( i != compoundStmt->get_kids().end() ) {

src/SymTab/module.mk

@@ -10 +10 @@
 ## Author           : Richard C. Bilson
 ## Created On       : Mon Jun  1 17:49:17 2015
-## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jun  1 17:53:50 2015
-## Update Count     : 1
+## Last Modified By : Rob Schluntz
+## Last Modified On : Tue Jul 07 16:22:23 2015
+## Update Count     : 2
 ###############################################################################
 
@@ -20 +20 @@
        SymTab/Validate.cc \
        SymTab/FixFunction.cc \
-       SymTab/ImplementationType.cc
-
+       SymTab/ImplementationType.cc \
+       SymTab/TypeEquality.cc