Changes in / [aeec6b7:97be800]

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• CodeGen/GenType.cc (modified) (3 diffs)
• Common/PassVisitor.h (modified) (4 diffs)
• Common/PassVisitor.impl.h (modified) (2 diffs)
• Concurrency/Keywords.cc (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (2 diffs)
• Parser/DeclarationNode.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (1 diff)
• Parser/TypeData.cc (modified) (10 diffs)
• Parser/TypeData.h (modified) (3 diffs)
• Parser/parser.yy (modified) (2 diffs)
• SymTab/Indexer.cc (modified) (12 diffs)
• SymTab/Indexer.h (modified) (1 diff)
• SymTab/Mangler.cc (modified) (3 diffs)
• SymTab/Validate.cc (modified) (33 diffs)
• SynTree/Declaration.h (modified) (1 diff)
• SynTree/Mutator.h (modified) (2 diffs)
• SynTree/ReferenceToType.cc (modified) (3 diffs)
• SynTree/SynTree.h (modified) (2 diffs)
• SynTree/Type.cc (modified) (1 diff)
• SynTree/Type.h (modified) (6 diffs)
• SynTree/Visitor.h (modified) (2 diffs)
• main.cc (modified) (1 diff)
• prelude/prelude.old.cf (modified) (1 diff)
• tests/.expect/nested-types-ERR1.txt (deleted)
• tests/.expect/nested-types-ERR2.txt (deleted)
• tests/.expect/nested-types.txt (deleted)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/nested-types.c (deleted)

src/CodeGen/CodeGenerator.cc

@@ -164 +164 @@
                 previsit( (BaseSyntaxNode *)node );
                 GuardAction( [this, node](){
-                        if ( printExprTypes && node->result ) {
+                        if ( printExprTypes ) {
                                 output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
                         }
@@ -224 +224 @@
 
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
-                if( ! aggDecl->parameters.empty() && ! genC ) {
+                if( ! aggDecl->get_parameters().empty() && ! genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         output << "forall(";
-                        genCommaList( aggDecl->parameters.begin(), aggDecl->parameters.end() );
+                        genCommaList( aggDecl->get_parameters().begin(), aggDecl->get_parameters().end() );
                         output << ")" << endl;
                         output << indent;
@@ -233 +233 @@
 
                 output << kind;
-                genAttributes( aggDecl->attributes );
-                output << aggDecl->name;
+                genAttributes( aggDecl->get_attributes() );
+                output << aggDecl->get_name();
 
                 if ( aggDecl->has_body() ) {
-                        std::list< Declaration * > & memb = aggDecl->members;
+                        std::list< Declaration * > & memb = aggDecl->get_members();
                         output << " {" << endl;
 

src/CodeGen/GenType.cc

@@ -48 +48 @@
                 void postvisit( ZeroType * zeroType );
                 void postvisit( OneType * oneType );
-                void postvisit( GlobalScopeType * globalType );
                 void postvisit( TraitInstType * inst );
                 void postvisit( TypeofType * typeof );
-                void postvisit( QualifiedType * qualType );
 
           private:
@@ -293 +291 @@
         }
 
-        void GenType::postvisit( GlobalScopeType * globalType ) {
-                assertf( ! genC, "Global scope type should not reach code generation." );
-                handleQualifiers( globalType );
-        }
-
         void GenType::postvisit( TraitInstType * inst ) {
                 assertf( ! genC, "Trait types should not reach code generation." );
@@ -314 +307 @@
         }
 
-        void GenType::postvisit( QualifiedType * qualType ) {
-                assertf( ! genC, "Qualified types should not reach code generation." );
-                std::ostringstream os;
-                os << genType( qualType->parent, "", pretty, genC, lineMarks ) << "." << genType( qualType->child, "", pretty, genC, lineMarks ) << typeString;
-                typeString = os.str();
-                handleQualifiers( qualType );
-        }
-
         void GenType::handleQualifiers( Type * type ) {
                 if ( type->get_const() ) {

src/Common/PassVisitor.h

@@ -133 +133 @@
         virtual void visit( ArrayType * arrayType ) override final;
         virtual void visit( ReferenceType * referenceType ) override final;
-        virtual void visit( QualifiedType * qualType ) override final;
         virtual void visit( FunctionType * functionType ) override final;
         virtual void visit( StructInstType * aggregateUseType ) override final;
@@ -146 +145 @@
         virtual void visit( ZeroType * zeroType ) override final;
         virtual void visit( OneType * oneType ) override final;
-        virtual void visit( GlobalScopeType * globalType ) override final;
 
         virtual void visit( Designation * designation ) override final;
@@ -235 +233 @@
         virtual Type * mutate( ArrayType * arrayType ) override final;
         virtual Type * mutate( ReferenceType * referenceType ) override final;
-        virtual Type * mutate( QualifiedType * qualType ) override final;
         virtual Type * mutate( FunctionType * functionType ) override final;
         virtual Type * mutate( StructInstType * aggregateUseType ) override final;
@@ -248 +245 @@
         virtual Type * mutate( ZeroType * zeroType ) override final;
         virtual Type * mutate( OneType * oneType ) override final;
-        virtual Type * mutate( GlobalScopeType * globalType ) override final;
 
         virtual Designation * mutate( Designation * designation ) override final;

src/Common/PassVisitor.impl.h

@@ -2262 +2262 @@
 
 //--------------------------------------------------------------------------
-// QualifiedType
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( QualifiedType * node ) {
-        VISIT_START( node );
-
-        maybeAccept_impl( node->forall, *this );
-        maybeAccept_impl( node->parent, *this );
-        maybeAccept_impl( node->child, *this );
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( QualifiedType * node ) {
-        MUTATE_START( node );
-
-        maybeMutate_impl( node->forall, *this );
-        maybeMutate_impl( node->parent, *this );
-        maybeMutate_impl( node->child, *this );
-
-        MUTATE_END( Type, node );
-}
-
-//--------------------------------------------------------------------------
 // FunctionType
 template< typename pass_type >
@@ -2578 +2554 @@
 
 //--------------------------------------------------------------------------
-// GlobalScopeType
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( GlobalScopeType * node ) {
-        VISIT_START( node );
-
-        maybeAccept_impl( node->forall, *this );
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( GlobalScopeType * node ) {
-        MUTATE_START( node );
-
-        maybeMutate_impl( node->forall, *this );
-
-        MUTATE_END( Type, node );
-}
-
-//--------------------------------------------------------------------------
 // Designation
 template< typename pass_type >

src/Concurrency/Keywords.cc

@@ -501 +501 @@
         void MutexKeyword::postvisit(StructDecl* decl) {
 
-                if( decl->name == "monitor_desc" && decl->body ) {
+                if( decl->name == "monitor_desc" ) {
                         assert( !monitor_decl );
                         monitor_decl = decl;
                 }
-                else if( decl->name == "monitor_guard_t" && decl->body ) {
+                else if( decl->name == "monitor_guard_t" ) {
                         assert( !guard_decl );
                         guard_decl = decl;
                 }
-                else if( decl->name == "monitor_dtor_guard_t" && decl->body ) {
+                else if( decl->name == "monitor_dtor_guard_t" ) {
                         assert( !dtor_guard_decl );
                         dtor_guard_decl = decl;

src/InitTweak/FixInit.cc

@@ -1163 +1163 @@
 
                         std::string fname = getFunctionName( appExpr );
-                        if ( fname == function->name ) {
+                        if ( fname == function->get_name() ) {
                                 // call to same kind of function
-                                Expression * firstParam = appExpr->args.front();
+                                Expression * firstParam = appExpr->get_args().front();
 
                                 if ( isThisExpression( firstParam, thisParam ) ) {
@@ -1174 +1174 @@
                                         // if first parameter is a member expression on the this parameter,
                                         // then remove the member from unhandled set.
-                                        if ( isThisExpression( memberExpr->aggregate, thisParam ) ) {
-                                                unhandled.erase( memberExpr->member );
+                                        if ( isThisExpression( memberExpr->get_aggregate(), thisParam ) ) {
+                                                unhandled.erase( memberExpr->get_member() );
                                         }
                                 }

src/Parser/DeclarationNode.cc

@@ -253 +253 @@
         return newnode;
 } // DeclarationNode::newFromTypedef
-
-DeclarationNode * DeclarationNode::newFromGlobalScope() {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::GlobalScope );
-        return newnode;
-}
-
-DeclarationNode * DeclarationNode::newQualifiedType( DeclarationNode * parent, DeclarationNode * child) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Qualified );
-        newnode->type->qualified.parent = parent->type;
-        newnode->type->qualified.child = child->type;
-        parent->type = nullptr;
-        child->type = nullptr;
-        delete parent;
-        delete child;
-        return newnode;
-}
 
 DeclarationNode * DeclarationNode::newAggregate( Aggregate kind, const string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
@@ -1003 +985 @@
                 try {
                         Declaration * decl = cur->build();
-                        assert( decl );
-                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
-                                dwt->location = cur->location;
-                                * out++ = dwt;
-                        } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
-                                // xxx - this might be where anonymous struct members are added - should be conditional on struct name
-                                StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->name );
-                                auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
-                                obj->location = cur->location;
-                                * out++ = obj;
-                                delete agg;
-                        } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
-                                UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->name );
-                                auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
-                                obj->location = cur->location;
-                                * out++ = obj;
+                        if ( decl ) {
+                                if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                        dwt->location = cur->location;
+                                        * out++ = dwt;
+                                } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
+                                        StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
+                                        auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                        obj->location = cur->location;
+                                        * out++ = obj;
+                                        delete agg;
+                                } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
+                                        UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
+                                        auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                        obj->location = cur->location;
+                                        * out++ = obj;
+                                } // if
                         } // if
                 } catch( SemanticErrorException &e ) {

src/Parser/ParseNode.h

@@ -231 +231 @@
         static DeclarationNode * newForall( DeclarationNode * );
         static DeclarationNode * newFromTypedef( const std::string * );
-        static DeclarationNode * newFromGlobalScope();
-        static DeclarationNode * newQualifiedType( DeclarationNode *, DeclarationNode * );
         static DeclarationNode * newFunction( const std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body );
         static DeclarationNode * newAggregate( Aggregate kind, const std::string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body );

src/Parser/TypeData.cc

@@ -37 +37 @@
           case Reference:
           case EnumConstant:
-          case GlobalScope:
                 // nothing else to initialize
                 break;
@@ -99 +98 @@
           case Builtin:
                 // builtin = new Builtin_t;
-                case Qualified:
-                qualified.parent = nullptr;
-                qualified.child = nullptr;
                 break;
         } // switch
@@ -116 +112 @@
           case Reference:
           case EnumConstant:
-          case GlobalScope:
                 // nothing to destroy
                 break;
@@ -170 +165 @@
                 // delete builtin;
                 break;
-          case Qualified:
-                delete qualified.parent;
-                delete qualified.child;
         } // switch
 } // TypeData::~TypeData
@@ -188 +180 @@
           case Pointer:
           case Reference:
-          case GlobalScope:
                 // nothing else to copy
                 break;
@@ -246 +237 @@
                 assert( builtintype == DeclarationNode::Zero || builtintype == DeclarationNode::One );
                 newtype->builtintype = builtintype;
-                break;
-                case Qualified:
-                newtype->qualified.parent = maybeClone( qualified.parent );
-                newtype->qualified.child = maybeClone( qualified.child );
                 break;
         } // switch
@@ -478 +465 @@
                 return new EnumInstType( buildQualifiers( td ), "" );
           case TypeData::SymbolicInst:
-                return buildSymbolicInst( td );
+                return buildSymbolicInst( td );;
           case TypeData::Tuple:
                 return buildTuple( td );
@@ -493 +480 @@
                         return new VarArgsType( buildQualifiers( td ) );
                 }
-          case TypeData::GlobalScope:
-                return new GlobalScopeType();
-                case TypeData::Qualified:
-                return new QualifiedType( buildQualifiers( td ), typebuild( td->qualified.parent ), typebuild( td->qualified.child ) );
           case TypeData::Symbolic:
           case TypeData::Enum:
@@ -502 +485 @@
                 assert( false );
         } // switch
-
         return nullptr;
 } // typebuild
@@ -911 +893 @@
         assert( td->kind == TypeData::Function );
         FunctionType * ft = new FunctionType( buildQualifiers( td ), ! td->function.params || td->function.params->hasEllipsis );
-        buildList( td->function.params, ft->parameters );
-        buildForall( td->forall, ft->forall );
+        buildList( td->function.params, ft->get_parameters() );
+        buildForall( td->forall, ft->get_forall() );
         if ( td->base ) {
                 switch ( td->base->kind ) {
                   case TypeData::Tuple:
-                        buildList( td->base->tuple, ft->returnVals );
+                        buildList( td->base->tuple, ft->get_returnVals() );
                         break;
                   default:

src/Parser/TypeData.h

@@ -27 +27 @@
 struct TypeData {
         enum Kind { Basic, Pointer, Array, Reference, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
-                                SymbolicInst, Tuple, Typeof, Builtin, GlobalScope, Qualified, Unknown };
+                                SymbolicInst, Tuple, Typeof, Builtin, Unknown };
 
         struct Aggregate_t {
@@ -75 +75 @@
         };
 
-        struct Qualified_t { // qualified type S.T
-                TypeData * parent;
-                TypeData * child;
-        };
-
         CodeLocation location;
 
@@ -93 +88 @@
         DeclarationNode * forall;
 
+        // Basic_t basic;
         Aggregate_t aggregate;
         AggInst_t aggInst;
         Array_t array;
         Enumeration_t enumeration;
+        // Variable_t variable;
         Function_t function;
         Symbolic_t symbolic;
-        Qualified_t qualified;
         DeclarationNode * tuple;
         ExpressionNode * typeexpr;

src/Parser/parser.yy

@@ -1821 +1821 @@
                 { $$ = DeclarationNode::newFromTypedef( $1 ); }
         | '.' TYPEDEFname
-                { $$ = DeclarationNode::newQualifiedType( DeclarationNode::newFromGlobalScope(), DeclarationNode::newFromTypedef( $2 ) ); }
+                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         | type_name '.' TYPEDEFname
-                { $$ = DeclarationNode::newQualifiedType( $1, DeclarationNode::newFromTypedef( $3 ) ); }
+                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         | typegen_name
         | '.' typegen_name
-                { $$ = DeclarationNode::newQualifiedType( DeclarationNode::newFromGlobalScope(), $2 ); }
+                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         | type_name '.' typegen_name
-                { $$ = DeclarationNode::newQualifiedType( $1, $3 ); }
+                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         ;
 
@@ -1929 +1929 @@
                 { distExt( $3 ); $$ = distAttr( $2, $3 ); }             // mark all fields in list
         | typedef_declaration ';'                                                       // CFA
+                { SemanticError( yylloc, "Typedef in aggregate is currently unimplemented." ); $$ = nullptr; }
         | cfa_field_declaring_list ';'                                          // CFA, new style field declaration
         | EXTENSION cfa_field_declaring_list ';'                        // GCC
                 { distExt( $2 ); $$ = $2; }                                             // mark all fields in list
         | cfa_typedef_declaration ';'                                           // CFA
+                { SemanticError( yylloc, "Typedef in aggregate is currently unimplemented." ); $$ = nullptr; }
         | static_assert                                                                         // C11
         ;

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;
@@ -363 +347 @@
                 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 );
@@ -372 +355 @@
                 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 );
@@ -381 +363 @@
                 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 );
@@ -390 +371 @@
                 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 );
@@ -399 +379 @@
                 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 );
@@ -507 +486 @@
 
         bool addedTypeConflicts( NamedTypeDecl *existing, NamedTypeDecl *added ) {
-                if ( existing->base == nullptr ) {
+                if ( existing->get_base() == 0 ) {
                         return false;
-                } else if ( added->base == nullptr ) {
+                } else if ( added->get_base() == 0 ) {
                         return true;
                 } else {
-                        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;
+                        SemanticError( added, "redeclaration of " );
+                }
         }
 
@@ -526 +499 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_name();
                 TypeTable::iterator existing = tables->typeTable.find( id );
                 if ( existing == tables->typeTable.end() ) {
@@ -559 +532 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_name();
                 StructTable::iterator existing = tables->structTable.find( id );
                 if ( existing == tables->structTable.end() ) {
@@ -578 +551 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_name();
                 EnumTable::iterator existing = tables->enumTable.find( id );
                 if ( existing == tables->enumTable.end() ) {
@@ -602 +575 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_name();
                 UnionTable::iterator existing = tables->unionTable.find( id );
                 if ( existing == tables->unionTable.end() ) {
@@ -621 +594 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_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(); }
@@ -172 +171 @@
                                         "w",    // SignedInt128
                                         "Uw",   // UnsignedInt128
-                                        "x",    // Float80
-                                        "y",    // Float128
+                                        "x",   // Float80
+                                        "y",   // Float128
                                 };
                                 static_assert(
@@ -313 +312 @@
                         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 ) x
+#define debugPrint( x ) if ( doDebug ) { std::cout << 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:
@@ -124 +112 @@
 
         /// Associates forward declarations of aggregates with their definitions
-        struct LinkReferenceToTypes final : public WithIndexer, public WithGuards, public WithVisitorRef<LinkReferenceToTypes>, public WithShortCircuiting {
+        struct LinkReferenceToTypes final : public WithIndexer, public WithGuards {
                 LinkReferenceToTypes( const Indexer *indexer );
                 void postvisit( TypeInstType *typeInst );
@@ -132 +120 @@
                 void postvisit( UnionInstType *unionInst );
                 void postvisit( TraitInstType *traitInst );
-                void previsit( QualifiedType * qualType );
-                void postvisit( QualifiedType * qualType );
 
                 void postvisit( EnumDecl *enumDecl );
@@ -179 +165 @@
         };
 
-        struct ReplaceTypedef final : public WithVisitorRef<ReplaceTypedef>, public WithGuards, public WithShortCircuiting, public WithDeclsToAdd {
-                ReplaceTypedef() : scopeLevel( 0 ) {}
+        struct EliminateTypedef final : public WithVisitorRef<EliminateTypedef>, public WithGuards {
+                EliminateTypedef() : scopeLevel( 0 ) {}
                 /// Replaces typedefs by forward declarations
-                static void replaceTypedef( std::list< Declaration * > &translationUnit );
-
-                void premutate( QualifiedType * );
-                Type * postmutate( QualifiedType * qualType );
+                static void eliminateTypedef( std::list< Declaration * > &translationUnit );
+
                 Type * postmutate( TypeInstType * aggregateUseType );
                 Declaration * postmutate( TypedefDecl * typeDecl );
@@ -196 +180 @@
 
                 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 );
-                void premutate( TraitDecl * );
+                Declaration * postmutate( EnumDecl * enumDecl );
+                Declaration * postmutate( TraitDecl * contextDecl );
 
                 void premutate( FunctionType * ftype );
@@ -206 +194 @@
           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 ScopedMap< std::string, TypeDecl * > TypeDeclMap;
+                typedef std::map< 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 );
         };
 
@@ -286 +263 @@
                 PassVisitor<FindSpecialDeclarations> finder;
                 PassVisitor<LabelAddressFixer> labelAddrFixer;
-                PassVisitor<HoistTypeDecls> hoistDecls;
-                PassVisitor<FixQualifiedTypes> fixQual;
-
-                acceptAll( translationUnit, hoistDecls );
-                ReplaceTypedef::replaceTypedef( translationUnit );
+
+                EliminateTypedef::eliminateTypedef( translationUnit );
+                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
                 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
@@ -322 +294 @@
         }
 
-
-        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;
@@ -428 +303 @@
         }
 
-        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 );
@@ -457 +316 @@
         }
 
+        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 ) {
@@ -471 +348 @@
         }
 
-        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->members.begin(); i != enumDecl->members.end(); ++i ) {
+                for ( std::list< Declaration * >::iterator i = enumDecl->get_members().begin(); i != enumDecl->get_members().end(); ++i ) {
                         ObjectDecl * obj = dynamic_cast< ObjectDecl * >( *i );
                         assert( obj );
-                        obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->name ) );
+                        obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->get_name() ) );
                 } // for
         }
@@ -570 +395 @@
 
         void LinkReferenceToTypes::postvisit( EnumInstType *enumInst ) {
-                EnumDecl *st = local_indexer->lookupEnum( enumInst->name );
+                EnumDecl *st = local_indexer->lookupEnum( enumInst->get_name() );
                 // it's not a semantic error if the enum is not found, just an implicit forward declaration
                 if ( st ) {
-                        enumInst->baseEnum = st;
-                } // if
-                if ( ! st || ! st->body ) {
+                        //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() ) {
                         // use of forward declaration
-                        forwardEnums[ enumInst->name ].push_back( enumInst );
+                        forwardEnums[ enumInst->get_name() ].push_back( enumInst );
                 } // if
         }
@@ -590 +416 @@
 
         void LinkReferenceToTypes::postvisit( StructInstType *structInst ) {
-                StructDecl *st = local_indexer->lookupStruct( structInst->name );
+                StructDecl *st = local_indexer->lookupStruct( structInst->get_name() );
                 // it's not a semantic error if the struct is not found, just an implicit forward declaration
                 if ( st ) {
-                        structInst->baseStruct = st;
-                } // if
-                if ( ! st || ! st->body ) {
+                        //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() ) {
                         // use of forward declaration
-                        forwardStructs[ structInst->name ].push_back( structInst );
+                        forwardStructs[ structInst->get_name() ].push_back( structInst );
                 } // if
                 checkGenericParameters( structInst );
@@ -603 +430 @@
 
         void LinkReferenceToTypes::postvisit( UnionInstType *unionInst ) {
-                UnionDecl *un = local_indexer->lookupUnion( unionInst->name );
+                UnionDecl *un = local_indexer->lookupUnion( unionInst->get_name() );
                 // it's not a semantic error if the union is not found, just an implicit forward declaration
                 if ( un ) {
-                        unionInst->baseUnion = un;
-                } // if
-                if ( ! un || ! un->body ) {
+                        unionInst->set_baseUnion( un );
+                } // if
+                if ( ! un || un->get_members().empty() ) {
                         // use of forward declaration
-                        forwardUnions[ unionInst->name ].push_back( unionInst );
+                        forwardUnions[ unionInst->get_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 );
         }
 
@@ -632 +450 @@
                         DeclarationWithType * dwt2 = dynamic_cast<DeclarationWithType *>( d2 );
                         if ( dwt1 && dwt2 ) {
-                                if ( dwt1->name == dwt2->name && ResolvExpr::typesCompatible( dwt1->get_type(), dwt2->get_type(), SymTab::Indexer() ) ) {
+                                if ( dwt1->get_name() == dwt2->get_name() && ResolvExpr::typesCompatible( dwt1->get_type(), dwt2->get_type(), SymTab::Indexer() ) ) {
                                         // std::cerr << "=========== equal:" << std::endl;
                                         // std::cerr << "d1: " << d1 << std::endl;
@@ -657 +475 @@
         template< typename Iterator >
         void expandAssertions( TraitInstType * inst, Iterator out ) {
-                assertf( inst->baseTrait, "Trait instance not linked to base trait: %s", toCString( inst ) );
+                assertf( inst->baseTrait, "Trait instance not linked to base trait: %s", toString( inst ).c_str() );
                 std::list< DeclarationWithType * > asserts;
                 for ( Declaration * decl : inst->baseTrait->members ) {
@@ -694 +512 @@
                         SemanticError( traitInst->location, "use of undeclared trait " + traitInst->name );
                 } // if
-                if ( traitDecl->parameters.size() != traitInst->parameters.size() ) {
+                if ( traitDecl->get_parameters().size() != traitInst->get_parameters().size() ) {
                         SemanticError( traitInst, "incorrect number of trait parameters: " );
                 } // if
@@ -700 +518 @@
 
                 // need to carry over the 'sized' status of each decl in the instance
-                for ( auto p : group_iterate( traitDecl->parameters, traitInst->parameters ) ) {
+                for ( auto p : group_iterate( traitDecl->get_parameters(), traitInst->get_parameters() ) ) {
                         TypeExpr * expr = dynamic_cast< TypeExpr * >( std::get<1>(p) );
                         if ( ! expr ) {
@@ -707 +525 @@
                         if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( expr->get_type() ) ) {
                                 TypeDecl * formalDecl = std::get<0>(p);
-                                TypeDecl * instDecl = inst->baseType;
+                                TypeDecl * instDecl = inst->get_baseType();
                                 if ( formalDecl->get_sized() ) instDecl->set_sized( true );
                         }
@@ -716 +534 @@
         void LinkReferenceToTypes::postvisit( EnumDecl *enumDecl ) {
                 // visit enum members first so that the types of self-referencing members are updated properly
-                if ( enumDecl->body ) {
-                        ForwardEnumsType::iterator fwds = forwardEnums.find( enumDecl->name );
+                if ( ! enumDecl->get_members().empty() ) {
+                        ForwardEnumsType::iterator fwds = forwardEnums.find( enumDecl->get_name() );
                         if ( fwds != forwardEnums.end() ) {
                                 for ( std::list< EnumInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
-                                        (*inst)->baseEnum = enumDecl;
+                                        (*inst )->set_baseEnum( enumDecl );
                                 } // for
                                 forwardEnums.erase( fwds );
@@ -756 +574 @@
                 // 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->body ) {
-                        ForwardStructsType::iterator fwds = forwardStructs.find( structDecl->name );
+                if ( ! structDecl->get_members().empty() ) {
+                        ForwardStructsType::iterator fwds = forwardStructs.find( structDecl->get_name() );
                         if ( fwds != forwardStructs.end() ) {
                                 for ( std::list< StructInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
-                                        (*inst)->baseStruct = structDecl;
+                                        (*inst )->set_baseStruct( structDecl );
                                 } // for
                                 forwardStructs.erase( fwds );
@@ -768 +586 @@
 
         void LinkReferenceToTypes::postvisit( UnionDecl *unionDecl ) {
-                if ( unionDecl->body ) {
-                        ForwardUnionsType::iterator fwds = forwardUnions.find( unionDecl->name );
+                if ( ! unionDecl->get_members().empty() ) {
+                        ForwardUnionsType::iterator fwds = forwardUnions.find( unionDecl->get_name() );
                         if ( fwds != forwardUnions.end() ) {
                                 for ( std::list< UnionInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
-                                        (*inst)->baseUnion = unionDecl;
+                                        (*inst )->set_baseUnion( unionDecl );
                                 } // for
                                 forwardUnions.erase( fwds );
@@ -782 +600 @@
                 // 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->name ) ) {
+                if ( NamedTypeDecl *namedTypeDecl = local_indexer->lookupType( typeInst->get_name() ) ) {
                         if ( TypeDecl *typeDecl = dynamic_cast< TypeDecl * >( namedTypeDecl ) ) {
                                 typeInst->set_isFtype( typeDecl->get_kind() == TypeDecl::Ftype );
@@ -861 +679 @@
 
 
-        void ReplaceTypedef::replaceTypedef( std::list< Declaration * > &translationUnit ) {
-                PassVisitor<ReplaceTypedef> eliminator;
+        bool isTypedef( Declaration *decl ) {
+                return dynamic_cast< TypedefDecl * >( decl );
+        }
+
+        void EliminateTypedef::eliminateTypedef( std::list< Declaration * > &translationUnit ) {
+                PassVisitor<EliminateTypedef> 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->base->clone();
+                        SizeType = eliminator.pass.typedefNames["size_t"].first->get_base()->clone();
                 } else {
                         // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
@@ -872 +694 @@
                         SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
                 }
-        }
-
-        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 ) {
+                filter( translationUnit, isTypedef, true );
+        }
+
+        Type * EliminateTypedef::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->name );
+                TypedefMap::const_iterator def = typedefNames.find( typeInst->get_name() );
                 if ( def != typedefNames.end() ) {
                         Type *ret = def->second.first->base->clone();
@@ -904 +717 @@
                                         SemanticError( typeInst->location, "Cannot apply type parameters to base type of " + typeInst->name );
                                 }
-                                rtt->parameters.clear();
+                                rtt->get_parameters().clear();
                                 cloneAll( typeInst->parameters, rtt->parameters );
                                 mutateAll( rtt->parameters, *visitor );  // recursively fix typedefs on parameters
@@ -911 +724 @@
                         return ret;
                 } else {
-                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->name );
-                        if ( base == typedeclNames.end() ) {
-                                SemanticError( typeInst->location, toString("Use of undefined type ", typeInst->name) );
-                        }
+                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
+                        assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->name.c_str() );
                         typeInst->set_baseType( base->second );
-                        return typeInst;
-                } // if
-                assert( false );
+                } // if
+                return typeInst;
         }
 
@@ -935 +745 @@
         }
 
-        Declaration * ReplaceTypedef::postmutate( TypedefDecl * tyDecl ) {
-                if ( typedefNames.count( tyDecl->name ) == 1 && typedefNames[ tyDecl->name ].second == scopeLevel ) {
+        Declaration *EliminateTypedef::postmutate( TypedefDecl * tyDecl ) {
+                if ( typedefNames.count( tyDecl->get_name() ) == 1 && typedefNames[ tyDecl->get_name() ].second == scopeLevel ) {
                         // typedef to the same name from the same scope
                         // must be from the same type
 
-                        Type * t1 = tyDecl->base;
-                        Type * t2 = typedefNames[ tyDecl->name ].first->base;
+                        Type * t1 = tyDecl->get_base();
+                        Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base();
                         if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer() ) ) {
                                 SemanticError( tyDecl->location, "Cannot redefine typedef: " + tyDecl->name );
@@ -953 +763 @@
                         }
                 } else {
-                        typedefNames[ tyDecl->name ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
+                        typedefNames[ tyDecl->get_name() ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
                 } // if
 
@@ -965 +775 @@
                 // Note, qualifiers on the typedef are superfluous for the forward declaration.
 
-                Type *designatorType = tyDecl->base->stripDeclarator();
+                Type *designatorType = tyDecl->get_base()->stripDeclarator();
                 if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( designatorType ) ) {
-                        declsToAddBefore.push_back( new StructDecl( aggDecl->name, DeclarationNode::Struct, noAttributes, tyDecl->linkage ) );
+                        return new StructDecl( aggDecl->get_name(), DeclarationNode::Struct, noAttributes, tyDecl->get_linkage() );
                 } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( designatorType ) ) {
-                        declsToAddBefore.push_back( new UnionDecl( aggDecl->name, noAttributes, tyDecl->linkage ) );
+                        return new UnionDecl( aggDecl->get_name(), noAttributes, tyDecl->get_linkage() );
                 } else if ( EnumInstType *enumDecl = dynamic_cast< EnumInstType * >( designatorType ) ) {
-                        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 );
+                        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() );
                 if ( i != typedefNames.end() ) {
                         typedefNames.erase( i ) ;
                 } // if
 
-                typedeclNames.insert( typeDecl->name, typeDecl );
-        }
-
-        void ReplaceTypedef::premutate( FunctionDecl * ) {
+                typedeclNames[ typeDecl->get_name() ] = typeDecl;
+        }
+
+        void EliminateTypedef::premutate( FunctionDecl * ) {
                 GuardScope( typedefNames );
-                GuardScope( typedeclNames );
-        }
-
-        void ReplaceTypedef::premutate( ObjectDecl * ) {
+        }
+
+        void EliminateTypedef::premutate( ObjectDecl * ) {
                 GuardScope( typedefNames );
-                GuardScope( typedeclNames );
-        }
-
-        DeclarationWithType * ReplaceTypedef::postmutate( ObjectDecl * objDecl ) {
-                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->type ) ) { // function type?
+        }
+
+        DeclarationWithType *EliminateTypedef::postmutate( ObjectDecl * objDecl ) {
+                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->get_type() ) ) { // function type?
                         // replace the current object declaration with a function declaration
-                        FunctionDecl * newDecl = new FunctionDecl( objDecl->name, objDecl->get_storageClasses(), objDecl->linkage, funtype, 0, objDecl->attributes, objDecl->get_funcSpec() );
-                        objDecl->attributes.clear();
+                        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();
                         objDecl->set_type( nullptr );
                         delete objDecl;
@@ -1007 +816 @@
         }
 
-        void ReplaceTypedef::premutate( CastExpr * ) {
+        void EliminateTypedef::premutate( CastExpr * ) {
                 GuardScope( typedefNames );
-                GuardScope( typedeclNames );
-        }
-
-        void ReplaceTypedef::premutate( CompoundStmt * ) {
+        }
+
+        void EliminateTypedef::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>
-        void ReplaceTypedef::addImplicitTypedef( AggDecl * aggDecl ) {
+        AggDecl *EliminateTypedef::handleAggregate( AggDecl * aggDecl ) {
+                filter( aggDecl->members, isTypedef, true );
+                return aggDecl;
+        }
+
+        template<typename AggDecl>
+        void EliminateTypedef::addImplicitTypedef( AggDecl * aggDecl ) {
                 if ( typedefNames.count( aggDecl->get_name() ) == 0 ) {
                         Type *type = nullptr;
@@ -1032 +860 @@
                         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 );
-                        // 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;
+                } // if
+        }
+
+        void EliminateTypedef::premutate( StructDecl * structDecl ) {
                 addImplicitTypedef( structDecl );
-                handleAggregate( structDecl );
-        }
-
-        void ReplaceTypedef::premutate( UnionDecl * unionDecl ) {
-                visit_children = false;
+        }
+
+
+        Declaration *EliminateTypedef::postmutate( StructDecl * structDecl ) {
+                return handleAggregate( structDecl );
+        }
+
+        void EliminateTypedef::premutate( UnionDecl * unionDecl ) {
                 addImplicitTypedef( unionDecl );
-                handleAggregate( unionDecl );
-        }
-
-        void ReplaceTypedef::premutate( EnumDecl * enumDecl ) {
+        }
+
+        Declaration *EliminateTypedef::postmutate( UnionDecl * unionDecl ) {
+                return handleAggregate( unionDecl );
+        }
+
+        void EliminateTypedef::premutate( EnumDecl * enumDecl ) {
                 addImplicitTypedef( enumDecl );
         }
 
-        void ReplaceTypedef::premutate( FunctionType * ) {
+        Declaration *EliminateTypedef::postmutate( EnumDecl * enumDecl ) {
+                return handleAggregate( enumDecl );
+        }
+
+        Declaration *EliminateTypedef::postmutate( TraitDecl * traitDecl ) {
+                return handleAggregate( traitDecl );
+        }
+
+        void EliminateTypedef::premutate( FunctionType * ) {
                 GuardValue( inFunctionType );
                 inFunctionType = true;
-        }
-
-        void ReplaceTypedef::premutate( TraitDecl * ) {
-                GuardScope( typedefNames );
-                GuardScope( typedeclNames);
         }
 
@@ -1220 +1024 @@
 
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
-                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
                         if ( at->get_dimension() ) return;
-                        if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
-                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->initializers.size() ) ) );
+                        if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->get_init() ) ) {
+                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->get_initializers().size() ) ) );
                         }
                 }

src/SynTree/Declaration.h

@@ -266 +266 @@
         bool body;
         std::list< Attribute * > attributes;
-        AggregateDecl * parent = nullptr;
 
         AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall );

src/SynTree/Mutator.h

@@ -101 +101 @@
         virtual Type * mutate( ArrayType * arrayType ) = 0;
         virtual Type * mutate( ReferenceType * refType ) = 0;
-        virtual Type * mutate( QualifiedType * qualType ) = 0;
         virtual Type * mutate( FunctionType * functionType ) = 0;
         virtual Type * mutate( StructInstType * aggregateUseType ) = 0;
@@ -114 +113 @@
         virtual Type * mutate( ZeroType * zeroType ) = 0;
         virtual Type * mutate( OneType * oneType ) = 0;
-        virtual Type * mutate( GlobalScopeType * globalType ) = 0;
 
         virtual Designation * mutate( Designation * designation ) = 0 ;

src/SynTree/ReferenceToType.cc

@@ -76 +76 @@
 bool StructInstType::isComplete() const { return baseStruct ? baseStruct->has_body() : false; }
 
-AggregateDecl * StructInstType::getAggr() const { return baseStruct; }
+AggregateDecl * StructInstType::getAggr() { return baseStruct; }
 
 TypeSubstitution StructInstType::genericSubstitution() const {
@@ -119 +119 @@
 bool UnionInstType::isComplete() const { return baseUnion ? baseUnion->has_body() : false; }
 
-AggregateDecl * UnionInstType::getAggr() const { return baseUnion; }
+AggregateDecl * UnionInstType::getAggr() { return baseUnion; }
 
 TypeSubstitution UnionInstType::genericSubstitution() const {
@@ -152 +152 @@
 bool EnumInstType::isComplete() const { return baseEnum ? baseEnum->has_body() : false; }
 
-AggregateDecl * EnumInstType::getAggr() const { return baseEnum; }
-
 void EnumInstType::print( std::ostream &os, Indenter indent ) const {
         using std::endl;

src/SynTree/SynTree.h

@@ -110 +110 @@
 class ArrayType;
 class ReferenceType;
-class QualifiedType;
 class FunctionType;
 class ReferenceToType;
@@ -124 +123 @@
 class ZeroType;
 class OneType;
-class GlobalScopeType;
 
 class Designation;

src/SynTree/Type.cc

@@ -105 +105 @@
 }
 
-
-QualifiedType::QualifiedType( const Type::Qualifiers & tq, Type * parent, Type * child ) : Type( tq, {} ), parent( parent ), child( child ) {
-}
-
-QualifiedType::QualifiedType( const QualifiedType & other ) : Type( other ), parent( maybeClone( other.parent ) ), child( maybeClone( other.child ) ) {
-}
-
-QualifiedType::~QualifiedType() {
-        delete parent;
-        delete child;
-}
-
-void QualifiedType::print( std::ostream & os, Indenter indent ) const {
-        os << "Qualified Type: " << endl;
-        os << indent+1;
-        parent->print( os, indent+1 );
-        os << endl << indent+1;
-        child->print( os, indent+1 );
-        os << endl;
-        Type::print( os, indent+1 );
-}
-
-GlobalScopeType::GlobalScopeType() : Type( Type::Qualifiers(), {} ) {}
-
-void GlobalScopeType::print( std::ostream & os, Indenter ) const {
-        os << "Global Scope Type" << endl;
-}
-
-
 // Empty Variable declarations:
 const Type::FuncSpecifiers noFuncSpecifiers;

src/SynTree/Type.h

@@ -178 +178 @@
         virtual bool isComplete() const { return true; }
 
-        virtual AggregateDecl * getAggr() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
+        virtual AggregateDecl * getAggr() { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
 
         virtual TypeSubstitution genericSubstitution() const;
@@ -315 +315 @@
 };
 
-class QualifiedType : public Type {
-public:
-        Type * parent;
-        Type * child;
-
-        QualifiedType( const Type::Qualifiers & tq, Type * parent, Type * child );
-        QualifiedType( const QualifiedType & tq );
-        virtual ~QualifiedType();
-
-        virtual QualifiedType *clone() const override { return new QualifiedType( *this ); }
-        virtual void accept( Visitor & v ) override { v.visit( this ); }
-        virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
-};
-
 class ReferenceType : public Type {
 public:
@@ -431 +416 @@
         virtual bool isComplete() const override;
 
-        virtual AggregateDecl * getAggr() const override;
+        virtual AggregateDecl * getAggr() override;
 
         virtual TypeSubstitution genericSubstitution() const override;
@@ -468 +453 @@
         virtual bool isComplete() const override;
 
-        virtual AggregateDecl * getAggr() const override;
+        virtual AggregateDecl * getAggr() override;
 
         virtual TypeSubstitution genericSubstitution() const override;
@@ -500 +485 @@
 
         virtual bool isComplete() const override;
-
-        virtual AggregateDecl * getAggr() const;
 
         virtual EnumInstType *clone() const override { return new EnumInstType( *this ); }
@@ -682 +665 @@
 };
 
-class GlobalScopeType : public Type {
-  public:
-        GlobalScopeType();
-
-        virtual GlobalScopeType *clone() const override { return new GlobalScopeType( *this ); }
-        virtual void accept( Visitor & v ) override { v.visit( this ); }
-        virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
-};
-
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Visitor.h

@@ -103 +103 @@
         virtual void visit( ArrayType * arrayType ) = 0;
         virtual void visit( ReferenceType * refType ) = 0;
-        virtual void visit( QualifiedType * qualType ) = 0;
         virtual void visit( FunctionType * functionType ) = 0;
         virtual void visit( StructInstType * aggregateUseType ) = 0;
@@ -116 +115 @@
         virtual void visit( ZeroType * zeroType ) = 0;
         virtual void visit( OneType * oneType ) = 0;
-        virtual void visit( GlobalScopeType * globalType ) = 0;
 
         virtual void visit( Designation * designation ) = 0;

src/main.cc

@@ -247 +247 @@
                 } // if
 
-                // Temporary: fill locations after parsing so that every node has a location, for early error messages.
-                // Eventually we should pass the locations from the parser to every node, but this quick and dirty solution
-                // works okay for now.
-                CodeTools::fillLocations( translationUnit );
-
                 // add the assignment statement after the initialization of a type parameter
                 PASS( "validate", SymTab::validate( translationUnit, symtabp ) );

src/prelude/prelude.old.cf

@@ -728 +728 @@
 forall( dtype DT ) void ?{}(       volatile  DT *          &,                   DT * );
 forall( dtype DT ) void ?{}(       volatile  DT *          &,       volatile    DT * );
+
 forall( dtype DT ) void ?{}( const volatile  DT *          &,                   DT * );
 forall( dtype DT ) void ?{}( const volatile  DT *          &, const             DT * );

src/tests/Makefile.am

@@ -110 +110 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
-
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@

src/tests/Makefile.in

@@ -787 +787 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
-
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@