Changeset fd061ed3 for src/SymTab

Timestamp:

Feb 28, 2017, 1:49:12 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

14f6bb39

Parents:

31868da (diff), cc7f4b1 (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

File:

• src/SymTab/Validate.cc (modified) (4 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 Feb  2 17:47:54 2017
-// Update Count     : 312
+// Last Modified On : Thu Feb 23 21:33:55 2017
+// Update Count     : 318
 //
 
@@ -629 +629 @@
                 } else {
                         TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
-                        assertf( base != typedeclNames.end(), "Can't find name %s", typeInst->get_name().c_str() );
+                        assertf( base != typedeclNames.end(), "Can't find typedecl name %s", typeInst->get_name().c_str() );
                         typeInst->set_baseType( base->second );
                 } // if
@@ -660 +660 @@
                 // Note, qualifiers on the typedef are superfluous for the forward declaration.
                 if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( tyDecl->get_base() ) ) {
-                        return new StructDecl( aggDecl->get_name() );
+                        return aggDecl->get_baseStruct() ? Mutator::mutate( aggDecl->get_baseStruct() ) : new StructDecl( aggDecl->get_name() );
                 } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( tyDecl->get_base() ) ) {
-                        return new UnionDecl( aggDecl->get_name() );
+                        return aggDecl->get_baseUnion() ? Mutator::mutate( aggDecl->get_baseUnion() ) : new UnionDecl( aggDecl->get_name() );
                 } else if ( EnumInstType *enumDecl = dynamic_cast< EnumInstType * >( tyDecl->get_base() ) ) {
                         return new EnumDecl( enumDecl->get_name() );
@@ -732 +732 @@
         }
 
-        // there may be typedefs nested within aggregates in order for everything to work properly, these should be removed
+        // there may be typedefs nested within aggregates. in order for everything to work properly, these should be removed
         // as well
         template<typename AggDecl>