Changes in src/SymTab/Validate.cc [7e08acf:ac3362c]

File:

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

src/SymTab/Validate.cc

@@ -62 +62 @@
 #include "ResolvExpr/typeops.h"        // for typesCompatible
 #include "ResolvExpr/Resolver.h"       // for findSingleExpression
-#include "ResolvExpr/ResolveTypeof.h"  // for resolveTypeof
 #include "SymTab/Autogen.h"            // for SizeType
 #include "SynTree/Attribute.h"         // for noAttributes, Attribute
@@ -248 +247 @@
                 void previsit( StructInstType * inst );
                 void previsit( UnionInstType * inst );
-        };
-
-        struct FixObjectType : public WithIndexer {
-                /// resolves typeof type in object, function, and type declarations
-                static void fix( std::list< Declaration * > & translationUnit );
-
-                void previsit( ObjectDecl * );
-                void previsit( FunctionDecl * );
-                void previsit( TypeDecl * );
         };
 
@@ -322 +312 @@
                 Concurrency::implementThreadStarter( translationUnit );
                 mutateAll( translationUnit, compoundliteral );
-                ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
-                FixObjectType::fix( translationUnit );
                 ArrayLength::computeLength( translationUnit );
                 acceptAll( translationUnit, finder ); // xxx - remove this pass soon
@@ -403 +391 @@
                         assert( aggr ); // TODO: need to handle forward declarations
                         for ( Declaration * member : aggr->members ) {
-                                if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
+                                if ( StructInstType * inst = dynamic_cast< StructInstType * >( child ) ) {
+                                        if ( StructDecl * aggr = dynamic_cast< StructDecl * >( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        // TODO: is this case, and other non-TypeInstType cases, necessary?
+                                                        return new StructInstType( qualType->get_qualifiers(), aggr );
+                                                }
+                                        }
+                                } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( child ) ) {
+                                        if ( UnionDecl * aggr = dynamic_cast< UnionDecl * > ( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        return new UnionInstType( qualType->get_qualifiers(), aggr );
+                                                }
+                                        }
+                                } else if ( EnumInstType * inst = dynamic_cast< EnumInstType * >( child ) ) {
+                                        if ( EnumDecl * aggr = dynamic_cast< EnumDecl * > ( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        return new EnumInstType( qualType->get_qualifiers(), aggr );
+                                                }
+                                        }
+                                } else if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
                                         // name on the right is a typedef
                                         if ( NamedTypeDecl * aggr = dynamic_cast< NamedTypeDecl * > ( member ) ) {
@@ -410 +417 @@
                                                         Type * ret = aggr->base->clone();
                                                         ret->get_qualifiers() = qualType->get_qualifiers();
-                                                        TypeSubstitution sub = parent->genericSubstitution();
-                                                        sub.apply(ret);
                                                         return ret;
                                                 }
@@ -1233 +1238 @@
         }
 
-        void FixObjectType::fix( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<FixObjectType> fixer;
-                acceptAll( translationUnit, fixer );
-        }
-
-        void FixObjectType::previsit( ObjectDecl * objDecl ) {
-                Type *new_type = ResolvExpr::resolveTypeof( objDecl->get_type(), indexer );
-                new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
-                objDecl->set_type( new_type );
-        }
-
-        void FixObjectType::previsit( FunctionDecl * funcDecl ) {
-                Type *new_type = ResolvExpr::resolveTypeof( funcDecl->type, indexer );
-                new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
-                funcDecl->set_type( new_type );
-        }
-
-        void FixObjectType::previsit( TypeDecl *typeDecl ) {
-                if ( typeDecl->get_base() ) {
-                        Type *new_type = ResolvExpr::resolveTypeof( typeDecl->get_base(), indexer );
-                        new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
-                        typeDecl->set_base( new_type );
-                } // if
-        }
-
         void ArrayLength::computeLength( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<ArrayLength> len;