Changes in / [242d458:1b0020a]

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;
         };
@@ -523 +521 @@
                         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;
@@ -571 +565 @@
                         typedefNames.erase( i ) ;
                 } // if
-
-                typedeclNames[ typeDecl->get_name() ] = typeDecl;
                 return typeDecl;
         }