Changeset d859a30

Timestamp:

Apr 14, 2023, 5:57:09 PM (13 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

c831073

Parents:

fb4dc28

Message:

Some SymbolTable? clean-up I did while trying a change I didn't go through with.

Location:

src/AST

Files:

• SymbolTable.cpp (modified) (4 diffs)
• SymbolTable.hpp (modified) (1 diff)

src/AST/SymbolTable.cpp

@@ -260 +260 @@
 void SymbolTable::addId( const DeclWithType * decl, const Expr * baseExpr ) {
         // default handling of conflicts is to raise an error
-        addId( decl, OnConflict::error(), baseExpr, decl->isDeleted ? decl : nullptr );
+        addIdCommon( decl, OnConflict::error(), baseExpr, decl->isDeleted ? decl : nullptr );
 }
 
 void SymbolTable::addDeletedId( const DeclWithType * decl, const Decl * deleter ) {
         // default handling of conflicts is to raise an error
-        addId( decl, OnConflict::error(), nullptr, deleter );
+        addIdCommon( decl, OnConflict::error(), nullptr, deleter );
 }
 
@@ -677 +677 @@
 }
 
-void SymbolTable::addId(
-                const DeclWithType * decl, SymbolTable::OnConflict handleConflicts, const Expr * baseExpr,
-                const Decl * deleter ) {
+void SymbolTable::addIdCommon(
+                const DeclWithType * decl, SymbolTable::OnConflict handleConflicts,
+                const Expr * baseExpr, const Decl * deleter ) {
         SpecialFunctionKind kind = getSpecialFunctionKind(decl->name);
         if (kind == NUMBER_OF_KINDS) { // not a special decl
-                addId(decl, decl->name, idTable, handleConflicts, baseExpr, deleter);
+                addIdToTable(decl, decl->name, idTable, handleConflicts, baseExpr, deleter);
         }
         else {
@@ -695 +695 @@
                         assertf(false, "special decl with non-function type");
                 }
-                addId(decl, key, specialFunctionTable[kind], handleConflicts, baseExpr, deleter);
-        }
-}
-
-void SymbolTable::addId(
-                const DeclWithType * decl, const std::string & lookupKey, IdTable::Ptr & table, SymbolTable::OnConflict handleConflicts, const Expr * baseExpr,
-                const Decl * deleter ) {
+                addIdToTable(decl, key, specialFunctionTable[kind], handleConflicts, baseExpr, deleter);
+        }
+}
+
+void SymbolTable::addIdToTable(
+                const DeclWithType * decl, const std::string & lookupKey,
+                IdTable::Ptr & table, SymbolTable::OnConflict handleConflicts,
+                const Expr * baseExpr, const Decl * deleter ) {
         ++*stats().add_calls;
         const std::string &name = decl->name;
@@ -778 +779 @@
 void SymbolTable::addMembers(
                 const AggregateDecl * aggr, const Expr * expr, SymbolTable::OnConflict handleConflicts ) {
-        for ( const Decl * decl : aggr->members ) {
-                if ( auto dwt = dynamic_cast< const DeclWithType * >( decl ) ) {
-                        addId( dwt, handleConflicts, expr );
-                        if ( dwt->name == "" ) {
-                                const Type * t = dwt->get_type()->stripReferences();
-                                if ( auto rty = dynamic_cast<const BaseInstType *>( t ) ) {
-                                        if ( ! dynamic_cast<const StructInstType *>(rty)
-                                                && ! dynamic_cast<const UnionInstType *>(rty) ) continue;
-                                        ResolvExpr::Cost cost = ResolvExpr::Cost::zero;
-                                        ast::ptr<ast::TypeSubstitution> tmp = expr->env;
-                                        expr = mutate_field(expr, &Expr::env, nullptr);
-                                        const Expr * base = ResolvExpr::referenceToRvalueConversion( expr, cost );
-                                        base = mutate_field(base, &Expr::env, tmp);
-
-                                        addMembers(
-                                                rty->aggr(), new MemberExpr{ base->location, dwt, base }, handleConflicts );
-                                }
-                        }
+        for ( const ptr<Decl> & decl : aggr->members ) {
+                auto dwt = decl.as<DeclWithType>();
+                if ( nullptr == dwt ) continue;
+                addIdCommon( dwt, handleConflicts, expr );
+                // Inline through unnamed struct/union members.
+                if ( "" != dwt->name ) continue;
+                const Type * t = dwt->get_type()->stripReferences();
+                if ( auto rty = dynamic_cast<const BaseInstType *>( t ) ) {
+                        if ( ! dynamic_cast<const StructInstType *>(rty)
+                                && ! dynamic_cast<const UnionInstType *>(rty) ) continue;
+                        ResolvExpr::Cost cost = ResolvExpr::Cost::zero;
+                        ast::ptr<ast::TypeSubstitution> tmp = expr->env;
+                        expr = mutate_field(expr, &Expr::env, nullptr);
+                        const Expr * base = ResolvExpr::referenceToRvalueConversion( expr, cost );
+                        base = mutate_field(base, &Expr::env, tmp);
+
+                        addMembers(
+                                rty->aggr(), new MemberExpr{ base->location, dwt, base }, handleConflicts );
                 }
         }

src/AST/SymbolTable.hpp

@@ -192 +192 @@
 
         /// common code for addId, addDeletedId, etc.
-        void addId(
-                const DeclWithType * decl, OnConflict handleConflicts, const Expr * baseExpr = nullptr,
-                const Decl * deleter = nullptr );
+        void addIdCommon(
+                const DeclWithType * decl, OnConflict handleConflicts,
+                const Expr * baseExpr = nullptr, const Decl * deleter = nullptr );
 
         /// common code for addId when special decls are placed into separate tables
-        void addId(
-                const DeclWithType * decl, const std::string & lookupKey, IdTable::Ptr & idTable, OnConflict handleConflicts, 
+        void addIdToTable(
+                const DeclWithType * decl, const std::string & lookupKey,
+                IdTable::Ptr & idTable, OnConflict handleConflicts,
                 const Expr * baseExpr = nullptr, const Decl * deleter = nullptr);
-        
+
         /// adds all of the members of the Aggregate (addWith helper)
         void addMembers( const AggregateDecl * aggr, const Expr * expr, OnConflict handleConflicts );