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/antlr_input.h | |
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/antlr_input.h')
-rw-r--r-- | src/parser/antlr_input.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/parser/antlr_input.h b/src/parser/antlr_input.h index 2d468a7d6..613390ca1 100644 --- a/src/parser/antlr_input.h +++ b/src/parser/antlr_input.h @@ -27,12 +27,12 @@ #include <stdexcept> #include <string> #include <vector> +#include <cassert> #include "parser/bounded_token_buffer.h" #include "parser/parser_exception.h" #include "parser/input.h" -#include "util/Assert.h" #include "util/bitvector.h" #include "util/integer.h" #include "util/rational.h" @@ -73,13 +73,13 @@ public: */ static AntlrInputStream* newFileInputStream(const std::string& name, bool useMmap = false) - throw (InputStreamException, AssertionException); + throw (InputStreamException); /** Create an input from an istream. */ static AntlrInputStream* newStreamInputStream(std::istream& input, const std::string& name, bool lineBuffered = false) - throw (InputStreamException, AssertionException); + throw (InputStreamException); /** Create a string input. * @@ -88,7 +88,7 @@ public: */ static AntlrInputStream* newStringInputStream(const std::string& input, const std::string& name) - throw (InputStreamException, AssertionException); + throw (InputStreamException); };/* class AntlrInputStream */ class Parser; @@ -212,7 +212,7 @@ protected: * Throws a <code>ParserException</code> with the given message. */ void parseError(const std::string& msg) - throw (ParserException, AssertionException); + throw (ParserException); /** Set the ANTLR3 lexer for this input. */ void setAntlr3Lexer(pANTLR3_LEXER pLexer); @@ -255,7 +255,7 @@ inline std::string AntlrInput::tokenTextSubstr(pANTLR3_COMMON_TOKEN token, ANTLR3_MARKER start = token->getStartIndex(token); // Its the last character of the token (not the one just after) ANTLR3_MARKER end = token->getStopIndex(token); - Assert( start < end ); + assert( start < end ); if( index > (size_t) end - start ) { std::stringstream ss; ss << "Out-of-bounds substring index: " << index; |