Changeset def751f for src/AST/SymbolTable.cpp

Timestamp:

Jul 25, 2022, 3:17:25 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

b0d9ff7

Parents:

4e2befe3 (diff), ffec1bf (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:

Merge branch 'master' into qualifiedEnum

File:

• src/AST/SymbolTable.cpp (modified) (2 diffs)

src/AST/SymbolTable.cpp

@@ -65 +65 @@
 
 Expr * SymbolTable::IdData::combine( const CodeLocation & loc, ResolvExpr::Cost & cost ) const {
-        Expr * ret = ( baseExpr ) ?
-                (Expr *)new MemberExpr{ loc, id, referenceToRvalueConversion( baseExpr, cost ) } :
-                (Expr *)new VariableExpr{ loc, id };
+        Expr * ret;
+        if ( baseExpr ) {
+                if (baseExpr->env) {
+                        Expr * base = shallowCopy(baseExpr);
+                        const TypeSubstitution * subs = baseExpr->env;
+                        base->env = nullptr;
+                        ret = new MemberExpr{loc, id, referenceToRvalueConversion( base, cost )};
+                        ret->env = subs;
+                }
+                else {
+                        ret = new MemberExpr{ loc, id, referenceToRvalueConversion( baseExpr, cost ) };
+                }
+        }
+        else {
+                ret = new VariableExpr{ loc, id };
+        }
         if ( deleter ) { ret = new DeletedExpr{ loc, ret, deleter }; }
         return ret;
@@ -772 +785 @@
                                                 && ! 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 );