Fix mistakes in handling of == ?

- Return true from resolveFnCallSpecial if handled - Invert result for != Signed-off-by: Anna Rift <[email protected]>
chapel-lang · Nov 22, 2024 · 262abef · 262abef
1 parent 0d61e74
commit 262abef
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/frontend/lib/resolution/resolution-queries.cpp b/frontend/lib/resolution/resolution-queries.cpp
@@ -3808,15 +3808,23 @@ static bool resolveFnCallSpecial(Context* context,
     } else if (ci.numActuals() == 1 && ci.hasQuestionArg()) {
       // support type and param comparisons with '?'
       // TODO: will likely need adjustment once we are able to compare a
+      // partially-instantiated type's fields with '?'
       auto arg = ci.actual(0).type();
+      bool result = false;
+      bool haveResult = true;
       if (arg.isType()) {
-        exprTypeOut =
-            QualifiedType(QualifiedType::PARAM, BoolType::get(context),
-                          BoolParam::get(context, arg.type()->isAnyType()));
+        result = arg.type()->isAnyType();
       } else if (arg.isParam()) {
+        result = arg.param() == nullptr;
+      } else {
+        haveResult = false;
+      }
+      result = ci.name() == USTR("==") ? result : !result;
+      if (haveResult) {
         exprTypeOut =
             QualifiedType(QualifiedType::PARAM, BoolType::get(context),
-                          BoolParam::get(context, arg.param() == nullptr));
+                          BoolParam::get(context, result));
+        return true;
       }
     }
   }