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 /src/parser/bounded_token_buffer.cpp | |
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 'src/parser/bounded_token_buffer.cpp')
-rw-r--r-- | src/parser/bounded_token_buffer.cpp | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/src/parser/bounded_token_buffer.cpp b/src/parser/bounded_token_buffer.cpp index d63d3afe0..7edbf7b7f 100644 --- a/src/parser/bounded_token_buffer.cpp +++ b/src/parser/bounded_token_buffer.cpp @@ -56,7 +56,7 @@ #include <antlr3tokenstream.h> #include "parser/bounded_token_buffer.h" -#include "util/Assert.h" +#include <cassert> namespace CVC4 { namespace parser { @@ -142,7 +142,7 @@ BoundedTokenBufferSourceNew(ANTLR3_UINT32 k, pANTLR3_TOKEN_SOURCE source) pANTLR3_COMMON_TOKEN_STREAM stream; - AlwaysAssert( k > 0 ); + assert( k > 0 ); /* Memory for the interface structure */ @@ -235,7 +235,7 @@ static pANTLR3_COMMON_TOKEN tokLT(pANTLR3_TOKEN_STREAM ts, ANTLR3_INT32 k) { buffer = (pBOUNDED_TOKEN_BUFFER) cts->super; /* k must be in the range [-buffer->k..buffer->k] */ - AlwaysAssert( k <= (ANTLR3_INT32)buffer->k + assert( k <= (ANTLR3_INT32)buffer->k && -k <= (ANTLR3_INT32)buffer->k ); if(k == 0) { @@ -244,7 +244,7 @@ static pANTLR3_COMMON_TOKEN tokLT(pANTLR3_TOKEN_STREAM ts, ANTLR3_INT32 k) { /* Initialize the buffer on our first call. */ if( EXPECT_FALSE(buffer->empty == ANTLR3_TRUE) ) { - AlwaysAssert( buffer->tokenBuffer != NULL ); + assert( buffer->tokenBuffer != NULL ); buffer->tokenBuffer[ 0 ] = nextToken(buffer); buffer->maxIndex = 0; buffer->currentIndex = 0; @@ -257,7 +257,7 @@ static pANTLR3_COMMON_TOKEN tokLT(pANTLR3_TOKEN_STREAM ts, ANTLR3_INT32 k) { kIndex = buffer->currentIndex + k - 1; } else { /* Can't look behind more tokens than we've consumed. */ - AlwaysAssert( -k <= (ANTLR3_INT32)buffer->currentIndex ); + assert( -k <= (ANTLR3_INT32)buffer->currentIndex ); /* look-behind token k is at offset -k */ kIndex = buffer->currentIndex + k; } @@ -289,7 +289,8 @@ dbgTokLT (pANTLR3_TOKEN_STREAM ts, ANTLR3_INT32 k) static pANTLR3_COMMON_TOKEN get (pANTLR3_TOKEN_STREAM ts, ANTLR3_UINT32 i) { - Unreachable(); + assert(false);// unimplemented + return NULL; } static pANTLR3_TOKEN_SOURCE @@ -308,19 +309,22 @@ setTokenSource ( pANTLR3_TOKEN_STREAM ts, static pANTLR3_STRING toString (pANTLR3_TOKEN_STREAM ts) { - Unimplemented("toString(ts)"); + assert(false);// unimplemented + return NULL; } static pANTLR3_STRING toStringSS(pANTLR3_TOKEN_STREAM ts, ANTLR3_UINT32 start, ANTLR3_UINT32 stop) { - Unimplemented("toStringSS(ts, %u, %u)", start, stop); + assert(false);// unimplemented + return NULL; } static pANTLR3_STRING toStringTT (pANTLR3_TOKEN_STREAM ts, pANTLR3_COMMON_TOKEN start, pANTLR3_COMMON_TOKEN stop) { - Unimplemented("toStringTT(ts, %u, %u)", start, stop); + assert(false);// unimplemented + return NULL; } /** Move the input pointer to the next incoming token. The stream @@ -379,7 +383,8 @@ _LA (pANTLR3_INT_STREAM is, ANTLR3_INT32 i) static ANTLR3_UINT32 dbgLA (pANTLR3_INT_STREAM is, ANTLR3_INT32 i) { - Unreachable(); + assert(false); + return 0; } static ANTLR3_MARKER @@ -394,7 +399,8 @@ mark (pANTLR3_INT_STREAM is) static ANTLR3_MARKER dbgMark (pANTLR3_INT_STREAM is) { - Unreachable(); + assert(false); + return 0; } static void @@ -406,7 +412,8 @@ release (pANTLR3_INT_STREAM is, ANTLR3_MARKER mark) static ANTLR3_UINT32 size (pANTLR3_INT_STREAM is) { - Unreachable(); + assert(false); + return 0; } static ANTLR3_MARKER @@ -426,12 +433,12 @@ tindex (pANTLR3_INT_STREAM is) static void dbgRewindLast (pANTLR3_INT_STREAM is) { - Unreachable(); + assert(false); } static void rewindLast (pANTLR3_INT_STREAM is) { - Unreachable(); + assert(false); } static void rewindStream (pANTLR3_INT_STREAM is, ANTLR3_MARKER marker) @@ -441,7 +448,7 @@ rewindStream (pANTLR3_INT_STREAM is, ANTLR3_MARKER marker) static void dbgRewindStream (pANTLR3_INT_STREAM is, ANTLR3_MARKER marker) { - Unreachable(); + assert(false); } static void @@ -458,7 +465,7 @@ seek (pANTLR3_INT_STREAM is, ANTLR3_MARKER index) static void dbgSeek (pANTLR3_INT_STREAM is, ANTLR3_MARKER index) { - Unreachable(); + assert(false); } static pANTLR3_COMMON_TOKEN nextToken(pBOUNDED_TOKEN_BUFFER buffer) { |