Changeset 0c840fc

Timestamp:

May 2, 2023, 3:45:08 AM (12 months ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

34b4268

Parents:

46da46b

Message:

WIP some bugs show up resolving array tuple indexing

File:

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

src/ResolvExpr/SatisfyAssertions.cpp

@@ -143 +143 @@
         };
 
-
+        enum AssertionResult {Fail, Skip, Success} ;
 
         /// Binds a single assertion, updating satisfaction state
@@ -164 +164 @@
 
         /// Satisfy a single assertion
-        bool satisfyAssertion( ast::AssertionList::value_type & assn, SatState & sat, bool skipUnbound = false) {
+        AssertionResult satisfyAssertion( ast::AssertionList::value_type & assn, SatState & sat, bool skipUnbound = false) {
                 // skip unused assertions
                 static unsigned int cnt = 0;
-                if ( ! assn.second.isUsed ) return true;
+                if ( ! assn.second.isUsed ) return AssertionResult::Success;
 
                 if (assn.first->var->name[1] == '|') std::cerr << ++cnt << std::endl;
@@ -186 +186 @@
                         if (thisArgType.as<ast::PointerType>()) otypeKey = Mangle::Encoding::pointer;
                         else if (!isUnboundType(thisArgType)) otypeKey = Mangle::mangle(thisArgType, Mangle::Type | Mangle::NoGenericParams);
-                        else if (skipUnbound) return false;
+                        else if (skipUnbound) return AssertionResult::Skip;
 
                         candidates = sat.symtab.specialLookupId(kind, otypeKey);
@@ -251 +251 @@
                 // break if no satisfying match
                 if ( matches.empty() ) matches = std::move(inexactMatches);
-                if ( matches.empty() ) return false;
+                if ( matches.empty() ) return AssertionResult::Fail;
 
                 // defer if too many satisfying matches
                 if ( matches.size() > 1 ) {
                         sat.deferred.emplace_back( assn.first, assn.second, std::move( matches ) );
-                        return true;
+                        return AssertionResult::Success;
                 }
 
@@ -267 +267 @@
 
                 bindAssertion( assn.first, assn.second, sat.cand, match, sat.inferred );
-                return true;
+                return AssertionResult::Success;
         }
 
@@ -456 +456 @@
                                 for ( auto & assn : sat.need ) {
                                         // fail early if any assertion is not satisfiable
-                                        if ( ! satisfyAssertion( assn, sat, !next.empty() ) ) {
-                                                next.emplace_back(assn);
-                                                // goto nextSat;
-                                        }
-                                }
-                                // success
-                                if (next.empty()) break;
-                                // fail if nothing resolves
-                                else if (next.size() == sat.need.size()) {
-                                        // if (allowConversion) {
+                                        auto result = satisfyAssertion( assn, sat, !next.empty() );
+                                        if ( result == AssertionResult::Fail ) {
                                                 Indenter tabs{ 3 };
                                                 std::ostringstream ss;
@@ -471 +463 @@
                                                 print( ss, *sat.cand, ++tabs );
                                                 ss << (tabs-1) << "Could not satisfy assertion:\n";
-                                                ast::print( ss, next[0].first, tabs );
+                                                ast::print( ss, assn.first, tabs );
 
                                                 errors.emplace_back( ss.str() );
                                                 goto nextSat;
-                                        // }
-
-                                        // else {
-                                        //      allowConversion = true;
-                                        //      continue;
-                                        // }
-                                }
+                                        }
+                                        else if ( result == AssertionResult::Skip ) {
+                                                next.emplace_back(assn);
+                                                // goto nextSat;
+                                        }
+                                }
+                                // success
+                                if (next.empty()) break;
+
                                 sat.need = std::move(next);
                         }