diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-09-28 17:29:01 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-09-28 17:29:01 +0000 |
commit | 65f720aac2d497c6e829d9c76638073a10060e7d (patch) | |
tree | 357035797e31f96a37dce30cb97ddb0aaf8f3bb7 /test/unit/util | |
parent | c0c351a89871e0a6881668fa1a8d87349ab8af8e (diff) |
Public interface review items:
* Internal uses of CheckArgument changed to AssertArgument/AlwaysAssertArgument()
* Make util/Assert.h cvc4_private instead of public, so AssertionException and friends are now internal-only
* CheckArgument() throws non-AssertionException
* things outside the core library (parsers, driver) use regular C-style assert,
or a public exception type.
* auto-generated documentation for Smt options and internal options
Also, a small fix to SMT-LIBv1 QF_ABV and QF_AUFBV definitions, which were nonstandard.
Diffstat (limited to 'test/unit/util')
-rw-r--r-- | test/unit/util/assert_white.h | 4 | ||||
-rw-r--r-- | test/unit/util/boolean_simplification_black.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/util/assert_white.h b/test/unit/util/assert_white.h index 6d88f89bd..54c77b165 100644 --- a/test/unit/util/assert_white.h +++ b/test/unit/util/assert_white.h @@ -32,7 +32,7 @@ public: void testAssert() { #ifdef CVC4_ASSERTIONS TS_ASSERT_THROWS( Assert(false), AssertionException ); - TS_ASSERT_THROWS( AssertArgument(false, "x"), IllegalArgumentException ); + TS_ASSERT_THROWS( AssertArgument(false, "x"), AssertArgumentException ); #else /* CVC4_ASSERTIONS */ TS_ASSERT_THROWS_NOTHING( Assert(false) ); TS_ASSERT_THROWS_NOTHING( AssertArgument(false, "x") ); @@ -46,7 +46,7 @@ public: TS_ASSERT_THROWS( IllegalArgument("x"), IllegalArgumentException ); TS_ASSERT_THROWS( CheckArgument(false, "x"), IllegalArgumentException ); TS_ASSERT_THROWS( AlwaysAssertArgument(false, "x"), - IllegalArgumentException ); + AssertArgumentException ); TS_ASSERT_THROWS_NOTHING( AssertArgument(true, "x") ); TS_ASSERT_THROWS_NOTHING( AssertArgument(true, "x") ); } diff --git a/test/unit/util/boolean_simplification_black.h b/test/unit/util/boolean_simplification_black.h index 8f2d0d97f..e333e7205 100644 --- a/test/unit/util/boolean_simplification_black.h +++ b/test/unit/util/boolean_simplification_black.h @@ -135,7 +135,7 @@ public: #ifdef CVC4_ASSERTIONS in = Node(); - TS_ASSERT_THROWS( BooleanSimplification::negate(in), IllegalArgumentException ); + TS_ASSERT_THROWS( BooleanSimplification::negate(in), AssertArgumentException ); #endif /* CVC4_ASSERTIONS */ } @@ -170,7 +170,7 @@ public: #ifdef CVC4_ASSERTIONS in = d_nm->mkNode(kind::AND, a, b); - TS_ASSERT_THROWS( BooleanSimplification::simplifyClause(in), IllegalArgumentException ); + TS_ASSERT_THROWS( BooleanSimplification::simplifyClause(in), AssertArgumentException ); #endif /* CVC4_ASSERTIONS */ } @@ -195,7 +195,7 @@ public: #ifdef CVC4_ASSERTIONS in = d_nm->mkNode(kind::OR, a, b); - TS_ASSERT_THROWS( BooleanSimplification::simplifyHornClause(in), IllegalArgumentException ); + TS_ASSERT_THROWS( BooleanSimplification::simplifyHornClause(in), AssertArgumentException ); #endif /* CVC4_ASSERTIONS */ } @@ -216,7 +216,7 @@ public: #ifdef CVC4_ASSERTIONS in = d_nm->mkNode(kind::OR, a, b); - TS_ASSERT_THROWS( BooleanSimplification::simplifyConflict(in), IllegalArgumentException ); + TS_ASSERT_THROWS( BooleanSimplification::simplifyConflict(in), AssertArgumentException ); #endif /* CVC4_ASSERTIONS */ } |