diff options
| author | Aina Niemetz <aina.niemetz@gmail.com> | 2021-03-03 17:36:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 01:36:57 +0000 |
| commit | eca92626dafa1e22e59aec94f6e34788c51e777a (patch) | |
| tree | 421e86a3bd6c1f870646a6ee34a574d4b8151abf /src/util | |
| parent | 27d6a284f34ff787882a952572519233ec12b939 (diff) | |
New C++ API: Clean up usage of internal Result. (#6043)
This disables the temporarily available internals of Result.
It further changes the interface for getUnknownExplanation, which now
returns an enum value instead of a string.
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/result.cpp | 46 | ||||
| -rw-r--r-- | src/util/result.h | 3 |
2 files changed, 16 insertions, 33 deletions
diff --git a/src/util/result.cpp b/src/util/result.cpp index 09445fa3b..bb280b515 100644 --- a/src/util/result.cpp +++ b/src/util/result.cpp @@ -270,38 +270,20 @@ ostream& operator<<(ostream& out, enum Result::Entailment e) return out; } -ostream& operator<<(ostream& out, enum Result::UnknownExplanation e) { - switch (e) { - case Result::REQUIRES_FULL_CHECK: - out << "REQUIRES_FULL_CHECK"; - break; - case Result::INCOMPLETE: - out << "INCOMPLETE"; - break; - case Result::TIMEOUT: - out << "TIMEOUT"; - break; - case Result::RESOURCEOUT: - out << "RESOURCEOUT"; - break; - case Result::MEMOUT: - out << "MEMOUT"; - break; - case Result::INTERRUPTED: - out << "INTERRUPTED"; - break; - case Result::NO_STATUS: - out << "NO_STATUS"; - break; - case Result::UNSUPPORTED: - out << "UNSUPPORTED"; - break; - case Result::OTHER: - out << "OTHER"; - break; - case Result::UNKNOWN_REASON: - out << "UNKNOWN_REASON"; - break; +ostream& operator<<(ostream& out, enum Result::UnknownExplanation e) +{ + switch (e) + { + case Result::REQUIRES_FULL_CHECK: out << "REQUIRES_FULL_CHECK"; break; + case Result::INCOMPLETE: out << "INCOMPLETE"; break; + case Result::TIMEOUT: out << "TIMEOUT"; break; + case Result::RESOURCEOUT: out << "RESOURCEOUT"; break; + case Result::MEMOUT: out << "MEMOUT"; break; + case Result::INTERRUPTED: out << "INTERRUPTED"; break; + case Result::NO_STATUS: out << "NO_STATUS"; break; + case Result::UNSUPPORTED: out << "UNSUPPORTED"; break; + case Result::OTHER: out << "OTHER"; break; + case Result::UNKNOWN_REASON: out << "UNKNOWN_REASON"; break; default: Unhandled() << e; } return out; diff --git a/src/util/result.h b/src/util/result.h index d0b0896bc..8ded88e15 100644 --- a/src/util/result.h +++ b/src/util/result.h @@ -51,7 +51,8 @@ class CVC4_PUBLIC Result { TYPE_NONE }; - enum UnknownExplanation { + enum UnknownExplanation + { REQUIRES_FULL_CHECK, INCOMPLETE, TIMEOUT, |