Changeset 6a0b043 for src

Timestamp:

Nov 21, 2023, 11:34:47 AM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

4883712

Parents:

0da9475

Message:

Did some investigation of WithStmt?. It may not be possible to convert it to a Stmt without changing how SymbolTable? handles the with clauses.

Location:

src/AST

Files:

• Decl.hpp (modified) (1 diff)
• SymbolTable.cpp (modified) (8 diffs)
• SymbolTable.hpp (modified) (1 diff)

src/AST/Decl.hpp

@@ -361 +361 @@
 
 /// With statement `with (...) ...`
+/// This is a statement lexically, but a Decl is needed for the SymbolTable.
 class WithStmt final : public Decl {
 public:

src/AST/SymbolTable.cpp

@@ -76 +76 @@
                         ret = new MemberExpr{loc, id, referenceToRvalueConversion( base, cost )};
                         ret->env = subs;
-                }
-                else {
+                } else {
                         ret = new MemberExpr{ loc, id, referenceToRvalueConversion( baseExpr, cost ) };
                 }
-        }
-        else {
+        } else {
                 ret = new VariableExpr{ loc, id };
         }
@@ -193 +191 @@
                         }
                 }
-        }
-        else {
+        } else {
                 ++*num_lookup_with_key;
                 ++*stats().map_lookups;
@@ -294 +291 @@
 }
 
-bool SymbolTable::addedDeclConflicts( 
+bool SymbolTable::addedDeclConflicts(
                 const AggregateDecl * existing, const AggregateDecl * added ) const {
         if ( ! existing->body ) {
@@ -480 +477 @@
                         if (dynamic_cast<const PointerType *>(base)) return Mangle::Encoding::pointer;
                         return Mangle::mangle( base, Mangle::Type | Mangle::NoGenericParams );
-                }
-                else
-                        return Mangle::mangle( base );  
+                } else {
+                        return Mangle::mangle( base );
+                }
         }
 
@@ -556 +553 @@
                 if ( ! alreadyUserDefinedFunc ) for ( const auto& entry : deleted ) {
                         ++*stats().map_mutations;
-                        mangleTable = mangleTable->set( entry.first, IdData{ entry.second, function } );
+                        mangleTable = mangleTable->set( entry.first, entry.second.withDeleter( function ) );
                 }
         } else if ( dataIsUserDefinedFunc ) {
@@ -586 +583 @@
                 for ( const auto& entry : deleted ) {
                         ++*stats().map_mutations;
-                        mangleTable = mangleTable->set( entry.first, IdData{ entry.second, function } );
+                        mangleTable = mangleTable->set( entry.first, entry.second.withDeleter( function ) );
                 }
         } else if ( function->linkage != Linkage::Intrinsic ) {
@@ -690 +687 @@
         if (kind == NUMBER_OF_KINDS) { // not a special decl
                 addIdToTable(decl, decl->name, idTable, handleConflicts, baseExpr, deleter);
-        }
-        else {
+        } else {
                 std::string key;
                 if (auto func = dynamic_cast<const FunctionDecl *>(decl)) {
                         key = getOtypeKey(func->type);
-                }
-                else if (auto obj = dynamic_cast<const ObjectDecl *>(decl)) {
+                } else if (auto obj = dynamic_cast<const ObjectDecl *>(decl)) {
                         key = getOtypeKey(obj->type.strict_as<PointerType>()->base.strict_as<FunctionType>());
-                }
-                else {
+                } else {
                         assertf(false, "special decl with non-function type");
                 }
@@ -755 +749 @@
                         if ( existing != mangleTable->end()
                                         && existing->second.scope == scope
-                                        && existing->second.id ) {
-                                if ( addedIdConflicts( existing->second, decl, handleConflicts, deleter ) ) {
-                                        if ( handleConflicts.mode == OnConflict::Delete ) {
-                                                // set delete expression for conflicting identifier
-                                                lazyInitScope();
-                                                *stats().map_mutations += 2;
-                                                table = table->set(
-                                                        lookupKey,
-                                                        mangleTable->set(
-                                                                mangleName,
-                                                                IdData{ existing->second, handleConflicts.deleter } ) );
-                                        }
-                                        return;
+                                        && existing->second.id
+                                        && addedIdConflicts( existing->second, decl, handleConflicts, deleter ) ) {
+                                if ( handleConflicts.mode == OnConflict::Delete ) {
+                                        // set delete expression for conflicting identifier
+                                        lazyInitScope();
+                                        *stats().map_mutations += 2;
+                                        table = table->set(
+                                                lookupKey,
+                                                mangleTable->set(
+                                                        mangleName,
+                                                        existing->second.withDeleter( handleConflicts.deleter ) ) );
                                 }
+                                return;
                         }
                 }

src/AST/SymbolTable.hpp

@@ -48 +48 @@
                 : id( i ), baseExpr( base ), deleter( del ), scope( s ) {}
 
-                /// Modify an existing node with a new deleter
-                IdData( const IdData & o, const Decl * del )
-                : id( o.id ), baseExpr( o.baseExpr ), deleter( del ), scope( o.scope ) {}
+                /// Create a new IdData, updating the deleter value.
+                IdData withDeleter( const Decl * decl ) const {
+                        return IdData( id, baseExpr, decl, scope );
+                }
 
                 /// Constructs an expression referring to this identifier.