Changeset 777ed2b for src/SymTab

Timestamp:

Jul 11, 2018, 11:55:59 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0fc52b6

Parents:

fc20514 (diff), 7de22b28 (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:

fix conflicts

Location:

src/SymTab

Files:

• Indexer.cc (modified) (12 diffs)
• Indexer.h (modified) (1 diff)
• Mangler.cc (modified) (3 diffs)
• Validate.cc (modified) (33 diffs)

src/SymTab/Indexer.cc

@@ -272 +272 @@
         }
 
+        NamedTypeDecl *Indexer::globalLookupType( const std::string &id ) const {
+                return lookupTypeAtScope( id, 0 );
+        }
+
+        StructDecl *Indexer::globalLookupStruct( const std::string &id ) const {
+                return lookupStructAtScope( id, 0 );
+        }
+
+        UnionDecl *Indexer::globalLookupUnion( const std::string &id ) const {
+                return lookupUnionAtScope( id, 0 );
+        }
+
+        EnumDecl *Indexer::globalLookupEnum( const std::string &id ) const {
+                return lookupEnumAtScope( id, 0 );
+        }
+
         EnumDecl *Indexer::lookupEnum( const std::string &id ) const {
                 if ( ! tables ) return 0;
@@ -347 +363 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTypeAtScope( id, scope );
 
                 TypeTable::const_iterator ret = tables->typeTable.find( id );
@@ -355 +372 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupStructAtScope( id, scope );
 
                 StructTable::const_iterator ret = tables->structTable.find( id );
@@ -363 +381 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupEnumAtScope( id, scope );
 
                 EnumTable::const_iterator ret = tables->enumTable.find( id );
@@ -371 +390 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupUnionAtScope( id, scope );
 
                 UnionTable::const_iterator ret = tables->unionTable.find( id );
@@ -379 +399 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTraitAtScope( id, scope );
 
                 TraitTable::const_iterator ret = tables->traitTable.find( id );
@@ -486 +507 @@
 
         bool addedTypeConflicts( NamedTypeDecl *existing, NamedTypeDecl *added ) {
-                if ( existing->get_base() == 0 ) {
+                if ( existing->base == nullptr ) {
                         return false;
-                } else if ( added->get_base() == 0 ) {
+                } else if ( added->base == nullptr ) {
                         return true;
                 } else {
-                        SemanticError( added, "redeclaration of " );
-                }
+                        assert( existing->base && added->base );
+                        // typedef redeclarations are errors only if types are different
+                        if ( ! ResolvExpr::typesCompatible( existing->base, added->base, Indexer() ) ) {
+                                SemanticError( added->location, "redeclaration of " + added->name );
+                        }
+                }
+                // does not need to be added to the table if both existing and added have a base that are the same
+                return true;
         }
 
@@ -499 +526 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 TypeTable::iterator existing = tables->typeTable.find( id );
                 if ( existing == tables->typeTable.end() ) {
@@ -532 +559 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 StructTable::iterator existing = tables->structTable.find( id );
                 if ( existing == tables->structTable.end() ) {
@@ -551 +578 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 EnumTable::iterator existing = tables->enumTable.find( id );
                 if ( existing == tables->enumTable.end() ) {
@@ -575 +602 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 UnionTable::iterator existing = tables->unionTable.find( id );
                 if ( existing == tables->unionTable.end() ) {
@@ -594 +621 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 TraitTable::iterator existing = tables->traitTable.find( id );
                 if ( existing == tables->traitTable.end() ) {

src/SymTab/Indexer.h

@@ -70 +70 @@
                 /// Gets the top-most trait declaration with the given ID
                 TraitDecl *lookupTrait( const std::string &id ) const;
+
+                /// Gets the type declaration with the given ID at global scope
+                NamedTypeDecl *globalLookupType( const std::string &id ) const;
+                /// Gets the struct declaration with the given ID at global scope
+                StructDecl *globalLookupStruct( const std::string &id ) const;
+                /// Gets the union declaration with the given ID at global scope
+                UnionDecl *globalLookupUnion( const std::string &id ) const;
+                /// Gets the enum declaration with the given ID at global scope
+                EnumDecl *globalLookupEnum( const std::string &id ) const;
 
                 void print( std::ostream &os, int indent = 0 ) const;

src/SymTab/Mangler.cc

@@ -60 +60 @@
                                 void postvisit( ZeroType * zeroType );
                                 void postvisit( OneType * oneType );
+                                void postvisit( QualifiedType * qualType );
 
                                 std::string get_mangleName() { return mangleName.str(); }
@@ -171 +172 @@
                                         "w",    // SignedInt128
                                         "Uw",   // UnsignedInt128
-                                        "x",   // Float80
-                                        "y",   // Float128
+                                        "x",    // Float80
+                                        "y",    // Float128
                                 };
                                 static_assert(
@@ -312 +313 @@
                         void Mangler::postvisit( OneType * ) {
                                 mangleName << "O";
+                        }
+
+                        void Mangler::postvisit( QualifiedType * qualType ) {
+                                maybeAccept( qualType->parent, *visitor );
+                                mangleName << "__";
+                                maybeAccept( qualType->child, *visitor );
                         }
 

src/SymTab/Validate.cc

@@ -77 +77 @@
 class SwitchStmt;
 
-#define debugPrint( x ) if ( doDebug ) { std::cout << x; }
+#define debugPrint( x ) if ( doDebug ) x
 
 namespace SymTab {
+        /// hoists declarations that are difficult to hoist while parsing
+        struct HoistTypeDecls final : public WithDeclsToAdd {
+                void previsit( SizeofExpr * );
+                void previsit( AlignofExpr * );
+                void previsit( UntypedOffsetofExpr * );
+                void handleType( Type * );
+        };
+
+        struct FixQualifiedTypes final : public WithIndexer {
+                Type * postmutate( QualifiedType * );
+        };
+
         struct HoistStruct final : public WithDeclsToAdd, public WithGuards {
                 /// Flattens nested struct types
                 static void hoistStruct( std::list< Declaration * > &translationUnit );
 
-                void previsit( EnumInstType * enumInstType );
-                void previsit( StructInstType * structInstType );
-                void previsit( UnionInstType * unionInstType );
                 void previsit( StructDecl * aggregateDecl );
                 void previsit( UnionDecl * aggregateDecl );
                 void previsit( StaticAssertDecl * assertDecl );
+                void previsit( StructInstType * type );
+                void previsit( UnionInstType * type );
+                void previsit( EnumInstType * type );
 
           private:
@@ -112 +124 @@
 
         /// Associates forward declarations of aggregates with their definitions
-        struct LinkReferenceToTypes final : public WithIndexer, public WithGuards {
+        struct LinkReferenceToTypes final : public WithIndexer, public WithGuards, public WithVisitorRef<LinkReferenceToTypes>, public WithShortCircuiting {
                 LinkReferenceToTypes( const Indexer *indexer );
                 void postvisit( TypeInstType *typeInst );
@@ -120 +132 @@
                 void postvisit( UnionInstType *unionInst );
                 void postvisit( TraitInstType *traitInst );
+                void previsit( QualifiedType * qualType );
+                void postvisit( QualifiedType * qualType );
 
                 void postvisit( EnumDecl *enumDecl );
@@ -165 +179 @@
         };
 
-        struct EliminateTypedef final : public WithVisitorRef<EliminateTypedef>, public WithGuards {
-                EliminateTypedef() : scopeLevel( 0 ) {}
+        struct ReplaceTypedef final : public WithVisitorRef<ReplaceTypedef>, public WithGuards, public WithShortCircuiting, public WithDeclsToAdd {
+                ReplaceTypedef() : scopeLevel( 0 ) {}
                 /// Replaces typedefs by forward declarations
-                static void eliminateTypedef( std::list< Declaration * > &translationUnit );
-
+                static void replaceTypedef( std::list< Declaration * > &translationUnit );
+
+                void premutate( QualifiedType * );
+                Type * postmutate( QualifiedType * qualType );
                 Type * postmutate( TypeInstType * aggregateUseType );
                 Declaration * postmutate( TypedefDecl * typeDecl );
@@ -180 +196 @@
 
                 void premutate( CompoundStmt * compoundStmt );
-                CompoundStmt * postmutate( CompoundStmt * compoundStmt );
 
                 void premutate( StructDecl * structDecl );
-                Declaration * postmutate( StructDecl * structDecl );
                 void premutate( UnionDecl * unionDecl );
-                Declaration * postmutate( UnionDecl * unionDecl );
                 void premutate( EnumDecl * enumDecl );
-                Declaration * postmutate( EnumDecl * enumDecl );
-                Declaration * postmutate( TraitDecl * contextDecl );
+                void premutate( TraitDecl * );
 
                 void premutate( FunctionType * ftype );
@@ -194 +206 @@
           private:
                 template<typename AggDecl>
-                AggDecl *handleAggregate( AggDecl * aggDecl );
-
-                template<typename AggDecl>
                 void addImplicitTypedef( AggDecl * aggDecl );
+                template< typename AggDecl >
+                void handleAggregate( AggDecl * aggr );
 
                 typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
                 typedef ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
-                typedef std::map< std::string, TypeDecl * > TypeDeclMap;
+                typedef ScopedMap< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
                 TypeDeclMap typedeclNames;
                 int scopeLevel;
                 bool inFunctionType = false;
+        };
+
+        struct EliminateTypedef {
+                /// removes TypedefDecls from the AST
+                static void eliminateTypedef( std::list< Declaration * > &translationUnit );
+
+                template<typename AggDecl>
+                void handleAggregate( AggDecl *aggregateDecl );
+
+                void previsit( StructDecl * aggregateDecl );
+                void previsit( UnionDecl * aggregateDecl );
+                void previsit( CompoundStmt * compoundStmt );
         };
 
@@ -263 +286 @@
                 PassVisitor<FindSpecialDeclarations> finder;
                 PassVisitor<LabelAddressFixer> labelAddrFixer;
-
-                EliminateTypedef::eliminateTypedef( translationUnit );
-                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
+                PassVisitor<HoistTypeDecls> hoistDecls;
+                PassVisitor<FixQualifiedTypes> fixQual;
+
+                acceptAll( translationUnit, hoistDecls );
+                ReplaceTypedef::replaceTypedef( translationUnit );
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
                 acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes because it is an indexer and needs correct types for mangling
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes, because aggregate members are accessed
+                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
+                EliminateTypedef::eliminateTypedef( translationUnit ); //
                 acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
                 VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
@@ -294 +322 @@
         }
 
+
+        void HoistTypeDecls::handleType( Type * type ) {
+                // some type declarations are buried in expressions and not easy to hoist during parsing; hoist them here
+                AggregateDecl * aggr = nullptr;
+                if ( StructInstType * inst = dynamic_cast< StructInstType * >( type ) ) {
+                        aggr = inst->baseStruct;
+                } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( type ) ) {
+                        aggr = inst->baseUnion;
+                } else if ( EnumInstType * inst = dynamic_cast< EnumInstType * >( type ) ) {
+                        aggr = inst->baseEnum;
+                }
+                if ( aggr && aggr->body ) {
+                        declsToAddBefore.push_front( aggr );
+                }
+        }
+
+        void HoistTypeDecls::previsit( SizeofExpr * expr ) {
+                handleType( expr->type );
+        }
+
+        void HoistTypeDecls::previsit( AlignofExpr * expr ) {
+                handleType( expr->type );
+        }
+
+        void HoistTypeDecls::previsit( UntypedOffsetofExpr * expr ) {
+                handleType( expr->type );
+        }
+
+
+        Type * FixQualifiedTypes::postmutate( QualifiedType * qualType ) {
+                Type * parent = qualType->parent;
+                Type * child = qualType->child;
+                if ( dynamic_cast< GlobalScopeType * >( qualType->parent ) ) {
+                        // .T => lookup T at global scope
+                        if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( child ) ) {
+                                auto td = indexer.globalLookupType( inst->name );
+                                if ( ! td ) {
+                                        SemanticError( qualType->location, toString("Use of undefined global type ", inst->name) );
+                                }
+                                auto base = td->base;
+                                assert( base );
+                                return base->clone();
+                        } else {
+                                // .T => T is not a type name
+                                assertf( false, "unhandled global qualified child type: %s", toCString(child) );
+                        }
+                } else {
+                        // S.T => S must be an aggregate type, find the declaration for T in S.
+                        AggregateDecl * aggr = nullptr;
+                        if ( StructInstType * inst = dynamic_cast< StructInstType * >( parent ) ) {
+                                aggr = inst->baseStruct;
+                        } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * > ( parent ) ) {
+                                aggr = inst->baseUnion;
+                        } else {
+                                SemanticError( qualType->location, toString("Qualified type requires an aggregate on the left, but has: ", parent) );
+                        }
+                        assert( aggr ); // TODO: need to handle forward declarations
+                        for ( Declaration * member : aggr->members ) {
+                                if ( StructInstType * inst = dynamic_cast< StructInstType * >( child ) ) {
+                                        if ( StructDecl * aggr = dynamic_cast< StructDecl * >( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        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 ) ) {
+                                        // struct typedefs are being replaced by forward decls too early; move it to hoist struct
+                                        if ( NamedTypeDecl * aggr = dynamic_cast< NamedTypeDecl * > ( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        assert( aggr->base );
+                                                        return aggr->base->clone();
+                                                }
+                                        }
+                                } else {
+                                        // S.T - S is not an aggregate => error
+                                        assertf( false, "unhandled qualified child type: %s", toCString(qualType) );
+                                }
+                        }
+                        // failed to find a satisfying definition of type
+                        SemanticError( qualType->location, toString("Undefined type in qualified type: ", qualType) );
+                }
+
+                // ... may want to link canonical SUE definition to each forward decl so that it becomes easier to lookup?
+        }
+
+
         void HoistStruct::hoistStruct( std::list< Declaration * > &translationUnit ) {
                 PassVisitor<HoistStruct> hoister;
@@ -303 +428 @@
         }
 
+        namespace {
+                void qualifiedName( AggregateDecl * aggr, std::ostringstream & ss ) {
+                        if ( aggr->parent ) qualifiedName( aggr->parent, ss );
+                        ss << "__" << aggr->name;
+                }
+
+                // mangle nested type names using entire parent chain
+                std::string qualifiedName( AggregateDecl * aggr ) {
+                        std::ostringstream ss;
+                        qualifiedName( aggr, ss );
+                        return ss.str();
+                }
+        }
+
         template< typename AggDecl >
         void HoistStruct::handleAggregate( AggDecl *aggregateDecl ) {
                 if ( parentAggr ) {
+                        aggregateDecl->parent = parentAggr;
+                        aggregateDecl->name = qualifiedName( aggregateDecl );
                         // Add elements in stack order corresponding to nesting structure.
                         declsToAddBefore.push_front( aggregateDecl );
@@ -316 +457 @@
         }
 
-        void HoistStruct::previsit( EnumInstType * inst ) {
-                if ( inst->baseEnum && inst->baseEnum->body ) {
-                        declsToAddBefore.push_front( inst->baseEnum );
-                }
-        }
-
-        void HoistStruct::previsit( StructInstType * inst ) {
-                if ( inst->baseStruct && inst->baseStruct->body ) {
-                        declsToAddBefore.push_front( inst->baseStruct );
-                }
-        }
-
-        void HoistStruct::previsit( UnionInstType * inst ) {
-                if ( inst->baseUnion && inst->baseUnion->body ) {
-                        declsToAddBefore.push_front( inst->baseUnion );
-                }
-        }
-
         void HoistStruct::previsit( StaticAssertDecl * assertDecl ) {
                 if ( parentAggr ) {
@@ -348 +471 @@
         }
 
+        void HoistStruct::previsit( StructInstType * type ) {
+                // need to reset type name after expanding to qualified name
+                assert( type->baseStruct );
+                type->name = type->baseStruct->name;
+        }
+
+        void HoistStruct::previsit( UnionInstType * type ) {
+                assert( type->baseUnion );
+                type->name = type->baseUnion->name;
+        }
+
+        void HoistStruct::previsit( EnumInstType * type ) {
+                assert( type->baseEnum );
+                type->name = type->baseEnum->name;
+        }
+
+
+        bool isTypedef( Declaration *decl ) {
+                return dynamic_cast< TypedefDecl * >( decl );
+        }
+
+        void EliminateTypedef::eliminateTypedef( std::list< Declaration * > &translationUnit ) {
+                PassVisitor<EliminateTypedef> eliminator;
+                acceptAll( translationUnit, eliminator );
+                filter( translationUnit, isTypedef, true );
+        }
+
+        template< typename AggDecl >
+        void EliminateTypedef::handleAggregate( AggDecl *aggregateDecl ) {
+                filter( aggregateDecl->members, isTypedef, true );
+        }
+
+        void EliminateTypedef::previsit( StructDecl * aggregateDecl ) {
+                handleAggregate( aggregateDecl );
+        }
+
+        void EliminateTypedef::previsit( UnionDecl * aggregateDecl ) {
+                handleAggregate( aggregateDecl );
+        }
+
+        void EliminateTypedef::previsit( CompoundStmt * compoundStmt ) {
+                // remove and delete decl stmts
+                filter( compoundStmt->kids, [](Statement * stmt) {
+                        if ( DeclStmt *declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
+                                if ( dynamic_cast< TypedefDecl * >( declStmt->decl ) ) {
+                                        return true;
+                                } // if
+                        } // if
+                        return false;
+                }, true);
+        }
+
         void EnumAndPointerDecay::previsit( EnumDecl *enumDecl ) {
                 // Set the type of each member of the enumeration to be EnumConstant
-                for ( std::list< Declaration * >::iterator i = enumDecl->get_members().begin(); i != enumDecl->get_members().end(); ++i ) {
+                for ( std::list< Declaration * >::iterator i = enumDecl->members.begin(); i != enumDecl->members.end(); ++i ) {
                         ObjectDecl * obj = dynamic_cast< ObjectDecl * >( *i );
                         assert( obj );
-                        obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->get_name() ) );
+                        obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->name ) );
                 } // for
         }
@@ -395 +570 @@
 
         void LinkReferenceToTypes::postvisit( EnumInstType *enumInst ) {
-                EnumDecl *st = local_indexer->lookupEnum( enumInst->get_name() );
+                EnumDecl *st = local_indexer->lookupEnum( enumInst->name );
                 // it's not a semantic error if the enum is not found, just an implicit forward declaration
                 if ( st ) {
-                        //assert( ! enumInst->get_baseEnum() || enumInst->get_baseEnum()->get_members().empty() || ! st->get_members().empty() );
-                        enumInst->set_baseEnum( st );
-                } // if
-                if ( ! st || st->get_members().empty() ) {
+                        enumInst->baseEnum = st;
+                } // if
+                if ( ! st || ! st->body ) {
                         // use of forward declaration
-                        forwardEnums[ enumInst->get_name() ].push_back( enumInst );
+                        forwardEnums[ enumInst->name ].push_back( enumInst );
                 } // if
         }
@@ -416 +590 @@
 
         void LinkReferenceToTypes::postvisit( StructInstType *structInst ) {
-                StructDecl *st = local_indexer->lookupStruct( structInst->get_name() );
+                StructDecl *st = local_indexer->lookupStruct( structInst->name );
                 // it's not a semantic error if the struct is not found, just an implicit forward declaration
                 if ( st ) {
-                        //assert( ! structInst->get_baseStruct() || structInst->get_baseStruct()->get_members().empty() || ! st->get_members().empty() );
-                        structInst->set_baseStruct( st );
-                } // if
-                if ( ! st || st->get_members().empty() ) {
+                        structInst->baseStruct = st;
+                } // if
+                if ( ! st || ! st->body ) {
                         // use of forward declaration
-                        forwardStructs[ structInst->get_name() ].push_back( structInst );
+                        forwardStructs[ structInst->name ].push_back( structInst );
                 } // if
                 checkGenericParameters( structInst );
@@ -430 +603 @@
 
         void LinkReferenceToTypes::postvisit( UnionInstType *unionInst ) {
-                UnionDecl *un = local_indexer->lookupUnion( unionInst->get_name() );
+                UnionDecl *un = local_indexer->lookupUnion( unionInst->name );
                 // it's not a semantic error if the union is not found, just an implicit forward declaration
                 if ( un ) {
-                        unionInst->set_baseUnion( un );
-                } // if
-                if ( ! un || un->get_members().empty() ) {
+                        unionInst->baseUnion = un;
+                } // if
+                if ( ! un || ! un->body ) {
                         // use of forward declaration
-                        forwardUnions[ unionInst->get_name() ].push_back( unionInst );
+                        forwardUnions[ unionInst->name ].push_back( unionInst );
                 } // if
                 checkGenericParameters( unionInst );
+        }
+
+        void LinkReferenceToTypes::previsit( QualifiedType * ) {
+                visit_children = false;
+        }
+
+        void LinkReferenceToTypes::postvisit( QualifiedType * qualType ) {
+                // linking only makes sense for the 'oldest ancestor' of the qualified type
+                qualType->parent->accept( *visitor );
         }
 
@@ -450 +632 @@
                         DeclarationWithType * dwt2 = dynamic_cast<DeclarationWithType *>( d2 );
                         if ( dwt1 && dwt2 ) {
-                                if ( dwt1->get_name() == dwt2->get_name() && ResolvExpr::typesCompatible( dwt1->get_type(), dwt2->get_type(), SymTab::Indexer() ) ) {
+                                if ( dwt1->name == dwt2->name && ResolvExpr::typesCompatible( dwt1->get_type(), dwt2->get_type(), SymTab::Indexer() ) ) {
                                         // std::cerr << "=========== equal:" << std::endl;
                                         // std::cerr << "d1: " << d1 << std::endl;
@@ -475 +657 @@
         template< typename Iterator >
         void expandAssertions( TraitInstType * inst, Iterator out ) {
-                assertf( inst->baseTrait, "Trait instance not linked to base trait: %s", toString( inst ).c_str() );
+                assertf( inst->baseTrait, "Trait instance not linked to base trait: %s", toCString( inst ) );
                 std::list< DeclarationWithType * > asserts;
                 for ( Declaration * decl : inst->baseTrait->members ) {
@@ -512 +694 @@
                         SemanticError( traitInst->location, "use of undeclared trait " + traitInst->name );
                 } // if
-                if ( traitDecl->get_parameters().size() != traitInst->get_parameters().size() ) {
+                if ( traitDecl->parameters.size() != traitInst->parameters.size() ) {
                         SemanticError( traitInst, "incorrect number of trait parameters: " );
                 } // if
@@ -518 +700 @@
 
                 // need to carry over the 'sized' status of each decl in the instance
-                for ( auto p : group_iterate( traitDecl->get_parameters(), traitInst->get_parameters() ) ) {
+                for ( auto p : group_iterate( traitDecl->parameters, traitInst->parameters ) ) {
                         TypeExpr * expr = dynamic_cast< TypeExpr * >( std::get<1>(p) );
                         if ( ! expr ) {
@@ -525 +707 @@
                         if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( expr->get_type() ) ) {
                                 TypeDecl * formalDecl = std::get<0>(p);
-                                TypeDecl * instDecl = inst->get_baseType();
+                                TypeDecl * instDecl = inst->baseType;
                                 if ( formalDecl->get_sized() ) instDecl->set_sized( true );
                         }
@@ -534 +716 @@
         void LinkReferenceToTypes::postvisit( EnumDecl *enumDecl ) {
                 // visit enum members first so that the types of self-referencing members are updated properly
-                if ( ! enumDecl->get_members().empty() ) {
-                        ForwardEnumsType::iterator fwds = forwardEnums.find( enumDecl->get_name() );
+                if ( enumDecl->body ) {
+                        ForwardEnumsType::iterator fwds = forwardEnums.find( enumDecl->name );
                         if ( fwds != forwardEnums.end() ) {
                                 for ( std::list< EnumInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
-                                        (*inst )->set_baseEnum( enumDecl );
+                                        (*inst)->baseEnum = enumDecl;
                                 } // for
                                 forwardEnums.erase( fwds );
@@ -574 +756 @@
                 // visit struct members first so that the types of self-referencing members are updated properly
                 // xxx - need to ensure that type parameters match up between forward declarations and definition (most importantly, number of type parameters and their defaults)
-                if ( ! structDecl->get_members().empty() ) {
-                        ForwardStructsType::iterator fwds = forwardStructs.find( structDecl->get_name() );
+                if ( structDecl->body ) {
+                        ForwardStructsType::iterator fwds = forwardStructs.find( structDecl->name );
                         if ( fwds != forwardStructs.end() ) {
                                 for ( std::list< StructInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
-                                        (*inst )->set_baseStruct( structDecl );
+                                        (*inst)->baseStruct = structDecl;
                                 } // for
                                 forwardStructs.erase( fwds );
@@ -586 +768 @@
 
         void LinkReferenceToTypes::postvisit( UnionDecl *unionDecl ) {
-                if ( ! unionDecl->get_members().empty() ) {
-                        ForwardUnionsType::iterator fwds = forwardUnions.find( unionDecl->get_name() );
+                if ( unionDecl->body ) {
+                        ForwardUnionsType::iterator fwds = forwardUnions.find( unionDecl->name );
                         if ( fwds != forwardUnions.end() ) {
                                 for ( std::list< UnionInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
-                                        (*inst )->set_baseUnion( unionDecl );
+                                        (*inst)->baseUnion = unionDecl;
                                 } // for
                                 forwardUnions.erase( fwds );
@@ -600 +782 @@
                 // ensure generic parameter instances are renamed like the base type
                 if ( inGeneric && typeInst->baseType ) typeInst->name = typeInst->baseType->name;
-                if ( NamedTypeDecl *namedTypeDecl = local_indexer->lookupType( typeInst->get_name() ) ) {
+                if ( NamedTypeDecl *namedTypeDecl = local_indexer->lookupType( typeInst->name ) ) {
                         if ( TypeDecl *typeDecl = dynamic_cast< TypeDecl * >( namedTypeDecl ) ) {
                                 typeInst->set_isFtype( typeDecl->get_kind() == TypeDecl::Ftype );
@@ -679 +861 @@
 
 
-        bool isTypedef( Declaration *decl ) {
-                return dynamic_cast< TypedefDecl * >( decl );
-        }
-
-        void EliminateTypedef::eliminateTypedef( std::list< Declaration * > &translationUnit ) {
-                PassVisitor<EliminateTypedef> eliminator;
+        void ReplaceTypedef::replaceTypedef( std::list< Declaration * > &translationUnit ) {
+                PassVisitor<ReplaceTypedef> eliminator;
                 mutateAll( translationUnit, eliminator );
                 if ( eliminator.pass.typedefNames.count( "size_t" ) ) {
                         // grab and remember declaration of size_t
-                        SizeType = eliminator.pass.typedefNames["size_t"].first->get_base()->clone();
+                        SizeType = eliminator.pass.typedefNames["size_t"].first->base->clone();
                 } else {
                         // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
@@ -694 +872 @@
                         SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
                 }
-                filter( translationUnit, isTypedef, true );
-        }
-
-        Type * EliminateTypedef::postmutate( TypeInstType * typeInst ) {
+        }
+
+        void ReplaceTypedef::premutate( QualifiedType * ) {
+                visit_children = false;
+        }
+
+        Type * ReplaceTypedef::postmutate( QualifiedType * qualType ) {
+                // replacing typedefs only makes sense for the 'oldest ancestor' of the qualified type
+                qualType->parent = qualType->parent->acceptMutator( *visitor );
+                return qualType;
+        }
+
+        Type * ReplaceTypedef::postmutate( TypeInstType * typeInst ) {
                 // 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() );
+                TypedefMap::const_iterator def = typedefNames.find( typeInst->name );
                 if ( def != typedefNames.end() ) {
                         Type *ret = def->second.first->base->clone();
+                        ret->location = typeInst->location;
                         ret->get_qualifiers() |= typeInst->get_qualifiers();
                         // attributes are not carried over from typedef to function parameters/return values
@@ -717 +905 @@
                                         SemanticError( typeInst->location, "Cannot apply type parameters to base type of " + typeInst->name );
                                 }
-                                rtt->get_parameters().clear();
+                                rtt->parameters.clear();
                                 cloneAll( typeInst->parameters, rtt->parameters );
                                 mutateAll( rtt->parameters, *visitor );  // recursively fix typedefs on parameters
@@ -724 +912 @@
                         return ret;
                 } else {
-                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
-                        assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->name.c_str() );
+                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->name );
+                        if ( base == typedeclNames.end() ) {
+                                SemanticError( typeInst->location, toString("Use of undefined type ", typeInst->name) );
+                        }
                         typeInst->set_baseType( base->second );
-                } // if
-                return typeInst;
+                        return typeInst;
+                } // if
+                assert( false );
         }
 
@@ -745 +936 @@
         }
 
-        Declaration *EliminateTypedef::postmutate( TypedefDecl * tyDecl ) {
-                if ( typedefNames.count( tyDecl->get_name() ) == 1 && typedefNames[ tyDecl->get_name() ].second == scopeLevel ) {
+        Declaration * ReplaceTypedef::postmutate( TypedefDecl * tyDecl ) {
+                if ( typedefNames.count( tyDecl->name ) == 1 && typedefNames[ tyDecl->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();
+                        Type * t1 = tyDecl->base;
+                        Type * t2 = typedefNames[ tyDecl->name ].first->base;
                         if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer() ) ) {
                                 SemanticError( tyDecl->location, "Cannot redefine typedef: " + tyDecl->name );
@@ -763 +954 @@
                         }
                 } else {
-                        typedefNames[ tyDecl->get_name() ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
+                        typedefNames[ tyDecl->name ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
                 } // if
 
@@ -775 +966 @@
                 // Note, qualifiers on the typedef are superfluous for the forward declaration.
 
-                Type *designatorType = tyDecl->get_base()->stripDeclarator();
+                Type *designatorType = tyDecl->base->stripDeclarator();
                 if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( designatorType ) ) {
-                        return new StructDecl( aggDecl->get_name(), DeclarationNode::Struct, noAttributes, tyDecl->get_linkage() );
+                        declsToAddBefore.push_back( new StructDecl( aggDecl->name, DeclarationNode::Struct, noAttributes, tyDecl->linkage ) );
                 } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( designatorType ) ) {
-                        return new UnionDecl( aggDecl->get_name(), noAttributes, tyDecl->get_linkage() );
+                        declsToAddBefore.push_back( new UnionDecl( aggDecl->name, noAttributes, tyDecl->linkage ) );
                 } else if ( EnumInstType *enumDecl = dynamic_cast< EnumInstType * >( designatorType ) ) {
-                        return new EnumDecl( enumDecl->get_name(), noAttributes, tyDecl->get_linkage() );
-                } else {
-                        return tyDecl->clone();
-                } // if
-        }
-
-        void EliminateTypedef::premutate( TypeDecl * typeDecl ) {
-                TypedefMap::iterator i = typedefNames.find( typeDecl->get_name() );
+                        declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage ) );
+                } // if
+                return tyDecl->clone();
+        }
+
+        void ReplaceTypedef::premutate( TypeDecl * typeDecl ) {
+                TypedefMap::iterator i = typedefNames.find( typeDecl->name );
                 if ( i != typedefNames.end() ) {
                         typedefNames.erase( i ) ;
                 } // if
 
-                typedeclNames[ typeDecl->get_name() ] = typeDecl;
-        }
-
-        void EliminateTypedef::premutate( FunctionDecl * ) {
+                typedeclNames.insert( typeDecl->name, typeDecl );
+        }
+
+        void ReplaceTypedef::premutate( FunctionDecl * ) {
                 GuardScope( typedefNames );
-        }
-
-        void EliminateTypedef::premutate( ObjectDecl * ) {
+                GuardScope( typedeclNames );
+        }
+
+        void ReplaceTypedef::premutate( ObjectDecl * ) {
                 GuardScope( typedefNames );
-        }
-
-        DeclarationWithType *EliminateTypedef::postmutate( ObjectDecl * objDecl ) {
-                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->get_type() ) ) { // function type?
+                GuardScope( typedeclNames );
+        }
+
+        DeclarationWithType * ReplaceTypedef::postmutate( ObjectDecl * objDecl ) {
+                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->type ) ) { // function type?
                         // replace the current object declaration with a function declaration
-                        FunctionDecl * newDecl = new FunctionDecl( objDecl->get_name(), objDecl->get_storageClasses(), objDecl->get_linkage(), funtype, 0, objDecl->get_attributes(), objDecl->get_funcSpec() );
-                        objDecl->get_attributes().clear();
+                        FunctionDecl * newDecl = new FunctionDecl( objDecl->name, objDecl->get_storageClasses(), objDecl->linkage, funtype, 0, objDecl->attributes, objDecl->get_funcSpec() );
+                        objDecl->attributes.clear();
                         objDecl->set_type( nullptr );
                         delete objDecl;
@@ -816 +1008 @@
         }
 
-        void EliminateTypedef::premutate( CastExpr * ) {
+        void ReplaceTypedef::premutate( CastExpr * ) {
                 GuardScope( typedefNames );
-        }
-
-        void EliminateTypedef::premutate( CompoundStmt * ) {
+                GuardScope( typedeclNames );
+        }
+
+        void ReplaceTypedef::premutate( CompoundStmt * ) {
                 GuardScope( typedefNames );
+                GuardScope( typedeclNames );
                 scopeLevel += 1;
                 GuardAction( [this](){ scopeLevel -= 1; } );
         }
 
-        CompoundStmt *EliminateTypedef::postmutate( CompoundStmt * compoundStmt ) {
-                // remove and delete decl stmts
-                filter( compoundStmt->kids, [](Statement * stmt) {
-                        if ( DeclStmt *declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
-                                if ( dynamic_cast< TypedefDecl * >( declStmt->get_decl() ) ) {
-                                        return true;
-                                } // if
-                        } // if
-                        return false;
-                }, true);
-                return compoundStmt;
-        }
-
-        // there may be typedefs nested within aggregates. in order for everything to work properly, these should be removed
-        // as well
         template<typename AggDecl>
-        AggDecl *EliminateTypedef::handleAggregate( AggDecl * aggDecl ) {
-                filter( aggDecl->members, isTypedef, true );
-                return aggDecl;
-        }
-
-        template<typename AggDecl>
-        void EliminateTypedef::addImplicitTypedef( AggDecl * aggDecl ) {
+        void ReplaceTypedef::addImplicitTypedef( AggDecl * aggDecl ) {
                 if ( typedefNames.count( aggDecl->get_name() ) == 0 ) {
                         Type *type = nullptr;
@@ -860 +1033 @@
                         TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type, aggDecl->get_linkage() ) );
                         typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel );
-                } // if
-        }
-
-        void EliminateTypedef::premutate( StructDecl * structDecl ) {
+                        // add the implicit typedef to the AST
+                        declsToAddBefore.push_back( new TypedefDecl( aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type->clone(), aggDecl->get_linkage() ) );
+                } // if
+        }
+
+        template< typename AggDecl >
+        void ReplaceTypedef::handleAggregate( AggDecl * aggr ) {
+                SemanticErrorException errors;
+
+                ValueGuard< std::list<Declaration * > > oldBeforeDecls( declsToAddBefore );
+                ValueGuard< std::list<Declaration * > > oldAfterDecls ( declsToAddAfter  );
+                declsToAddBefore.clear();
+                declsToAddAfter.clear();
+
+                GuardScope( typedefNames );
+                GuardScope( typedeclNames );
+                mutateAll( aggr->parameters, *visitor );
+
+                // unroll mutateAll for aggr->members so that implicit typedefs for nested types are added to the aggregate body.
+                for ( std::list< Declaration * >::iterator i = aggr->members.begin(); i != aggr->members.end(); ++i ) {
+                        if ( !declsToAddAfter.empty() ) { aggr->members.splice( i, declsToAddAfter ); }
+
+                        try {
+                                *i = maybeMutate( *i, *visitor );
+                        } catch ( SemanticErrorException &e ) {
+                                errors.append( e );
+                        }
+
+                        if ( !declsToAddBefore.empty() ) { aggr->members.splice( i, declsToAddBefore ); }
+                }
+
+                if ( !declsToAddAfter.empty() ) { aggr->members.splice( aggr->members.end(), declsToAddAfter ); }
+                if ( !errors.isEmpty() ) { throw errors; }
+        }
+
+        void ReplaceTypedef::premutate( StructDecl * structDecl ) {
+                visit_children = false;
                 addImplicitTypedef( structDecl );
-        }
-
-
-        Declaration *EliminateTypedef::postmutate( StructDecl * structDecl ) {
-                return handleAggregate( structDecl );
-        }
-
-        void EliminateTypedef::premutate( UnionDecl * unionDecl ) {
+                handleAggregate( structDecl );
+        }
+
+        void ReplaceTypedef::premutate( UnionDecl * unionDecl ) {
+                visit_children = false;
                 addImplicitTypedef( unionDecl );
-        }
-
-        Declaration *EliminateTypedef::postmutate( UnionDecl * unionDecl ) {
-                return handleAggregate( unionDecl );
-        }
-
-        void EliminateTypedef::premutate( EnumDecl * enumDecl ) {
+                handleAggregate( unionDecl );
+        }
+
+        void ReplaceTypedef::premutate( EnumDecl * enumDecl ) {
                 addImplicitTypedef( enumDecl );
         }
 
-        Declaration *EliminateTypedef::postmutate( EnumDecl * enumDecl ) {
-                return handleAggregate( enumDecl );
-        }
-
-        Declaration *EliminateTypedef::postmutate( TraitDecl * traitDecl ) {
-                return handleAggregate( traitDecl );
-        }
-
-        void EliminateTypedef::premutate( FunctionType * ) {
+        void ReplaceTypedef::premutate( FunctionType * ) {
                 GuardValue( inFunctionType );
                 inFunctionType = true;
+        }
+
+        void ReplaceTypedef::premutate( TraitDecl * ) {
+                GuardScope( typedefNames );
+                GuardScope( typedeclNames);
         }
 
@@ -1024 +1221 @@
 
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
-                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
                         if ( at->get_dimension() ) return;
-                        if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->get_init() ) ) {
-                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->get_initializers().size() ) ) );
+                        if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
+                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->initializers.size() ) ) );
                         }
                 }