Changeset 07d867b for src/ResolvExpr

Timestamp:

Aug 10, 2020, 7:45:18 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

22f94a4

Parents:

ba662b9

Message:

attempt to fix inferparams

File:

• src/ResolvExpr/SatisfyAssertions.cpp (modified) (5 diffs)

src/ResolvExpr/SatisfyAssertions.cpp

@@ -188 +188 @@
 
                                 matches.emplace_back( 
-                                        cdata, adjType, std::move( newEnv ), std::move( newNeed ), std::move( have ), 
+                                        cdata, adjType, std::move( newEnv ), std::move( have ), std::move( newNeed ),
                                         std::move( newOpen ), crntResnSlot );
                         }
@@ -231 +231 @@
                 const ast::Expr * postvisit( const ast::Expr * expr ) {
                         // Skip if no slots to find
-                        if ( expr->inferred.mode != ast::Expr::InferUnion::Slots ) return expr;
-
+                        if ( !expr->inferred.hasSlots() ) return expr;
+                        // if ( expr->inferred.mode != ast::Expr::InferUnion::Slots ) return expr;
+                        std::vector<UniqueId> missingSlots;
                         // find inferred parameters for resolution slots
-                        ast::InferredParams newInferred;
+                        ast::InferredParams * newInferred = new ast::InferredParams();
                         for ( UniqueId slot : expr->inferred.resnSlots() ) {
                                 // fail if no matching assertions found
@@ -240 +241 @@
                                 if ( it == inferred.end() ) {
                                         std::cerr << "missing assertion " << slot << std::endl;
+                                        missingSlots.push_back(slot);
                                         continue;
                                 }
@@ -247 +249 @@
                                         // recurse on inferParams of resolved expressions
                                         entry.second.expr = postvisit( entry.second.expr );
-                                        auto res = newInferred.emplace( entry );
+                                        auto res = newInferred->emplace( entry );
                                         assert( res.second && "all assertions newly placed" );
                                 }
@@ -253 +255 @@
 
                         ast::Expr * ret = mutate( expr );
-                        ret->inferred.set_inferParams( std::move( newInferred ) );
+                        ret->inferred.set_inferParams( newInferred );
+                        if (!missingSlots.empty()) ret->inferred.resnSlots() = missingSlots;
                         return ret;
                 }