Changeset def751f for src/ResolvExpr

Timestamp:

Jul 25, 2022, 3:17:25 PM (2 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

Location:

src/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (1 diff)
• Resolver.cc (modified) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -1263 +1263 @@
                                         newExpr, copy( tenv ), ast::OpenVarSet{}, ast::AssertionSet{}, Cost::zero,
                                         cost );
+
+                                if (newCand->expr->env) {
+                                        newCand->env.add(*newCand->expr->env);
+                                        auto mutExpr = newCand->expr.get_and_mutate();
+                                        mutExpr->env  = nullptr;
+                                        newCand->expr = mutExpr;
+                                }
+
                                 PRINT(
                                         std::cerr << "decl is ";

src/ResolvExpr/Resolver.cc

@@ -1555 +1555 @@
                 if ( type->dimension ) {
                         ast::ptr< ast::Type > sizeType = context.global.sizeType;
+                        ast::ptr< ast::Expr > dimension = findSingleExpression( type->dimension, sizeType, context );
+                        assertf(dimension->env->empty(), "array dimension expr has nonempty env");
+                        dimension.get_and_mutate()->env = nullptr;
                         ast::mutate_field(
                                 type, &PtrType::dimension,
-                                findSingleExpression( type->dimension, sizeType, context ) );
+                                dimension);
                 }
                 return type;
@@ -2008 +2011 @@
                                 tmp->accept( *visitor );
                         }
+                        else if (expr->env && expr->env->empty()) {
+                                expr = ast::mutate_field(expr.get(), &ast::Expr::env, nullptr);
+                        }
                 }
         }