================
@@ -99,32 +145,51 @@ def _get_actual_result(
)
)
sub_expect_results[sub_expect] = DebuggerExpectMatch(
- self.expect, sub_expected, value
+ self.expect, sub_expected, value, self.match_context
)
- if all(
- result.match_result == MatchResult.TRUE
- for result in sub_expect_results.values()
- ):
- match_result = MatchResult.TRUE
- elif all(
- result.match_result == MatchResult.FALSE
- for result in sub_expect_results.values()
- ):
- match_result = MatchResult.FALSE
- else:
- match_result = MatchResult.PARTIAL
+ match_result = MatchResult.from_bools(
+ any(
+ result.match_result == MatchResult.TRUE
+ for result in sub_expect_results.values()
+ ),
+ any(
+ result.match_result == MatchResult.FALSE
+ for result in sub_expect_results.values()
+ ),
+ )
return sub_expect_results, match_result
actual_result = (
self.expect.get_variable_result(self.actual)
if self.actual is not None
else None
)
- match_result = (
- MatchResult.TRUE
- if (self.expected is not None and str(self.expected) ==
actual_result)
- else MatchResult.FALSE
- )
+ if self.expected is None or actual_result is None:
+ return actual_result, MatchResult.FALSE
+ if isinstance(self.expected, Address):
----------------
jmorse wrote:
Refactor into an address-specific method perhaps? This'll allow readers to
separate out "normal behaviour for an expectation being examined" from "special
shennnigans for Addresses" more easily.
https://github.com/llvm/llvm-project/pull/202801
_______________________________________________
llvm-branch-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
