Changeset 242d458

Timestamp:

Aug 5, 2016, 2:53:25 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, ctor, 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, with_gc

Children:

a465caf

Parents:

1b0020a (diff), 679864e1 (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 'typedecl' into resolve-typedecl

Conflicts:

src/ResolvExpr/Resolver.cc
src/SymTab/Validate.cc

Location:

src

Files:

• ResolvExpr/Resolver.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -446 +446 @@
                 } else if ( StructInstType * st = dynamic_cast< StructInstType * >( initContext ) ) {
                         resolveAggrInit( st->get_baseStruct(), iter, end );
-                } else if ( UnionInstType *st = dynamic_cast< UnionInstType * >( initContext ) ) {
+                } else if ( UnionInstType * st = dynamic_cast< UnionInstType * >( initContext ) ) {
                         resolveAggrInit( st->get_baseUnion(), iter, end );
+                } else if ( TypeInstType * tt = dynamic_cast< TypeInstType * >( initContext ) ) {
+                        Type * base = tt->get_baseType()->get_base();
+                        if ( base ) {
+                                // know the implementation type, so try using that as the initContext
+                                initContext = base;
+                                visit( listInit );
+                        } else {
+                                // missing implementation type -- might be an unknown type variable, so try proceeding with the current init context
+                                Visitor::visit( listInit );
+                        }
                 } else {
+                        assert( dynamic_cast< BasicType * >( initContext ) || dynamic_cast< PointerType * >( initContext ) );
                         // basic types are handled here
                         Visitor::visit( listInit );

src/SymTab/Validate.cc

@@ -162 +162 @@
 
                 typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
+                typedef std::map< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
+                TypeDeclMap typedeclNames;
                 int scopeLevel;
         };
@@ -521 +523 @@
                         delete typeInst;
                         return ret;
+                } else {
+                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
+                        assert( base != typedeclNames.end() );
+                        typeInst->set_baseType( base->second->clone() );
                 } // if
                 return typeInst;
@@ -565 +571 @@
                         typedefNames.erase( i ) ;
                 } // if
+
+                typedeclNames[ typeDecl->get_name() ] = typeDecl;
                 return typeDecl;
         }