diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-07-06 15:52:10 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-07-06 15:52:10 +0000 |
commit | d6b40829e8d92a7a298d0c0023d944131a8285cf (patch) | |
tree | 64fb36a7623cb2416d7129a3249d5875ce4f68ec /src/parser/antlr_input.h | |
parent | b9f36ae0027e52da925416630ccad5d4b84779e9 (diff) |
merge from CC work: pieces of the parser need to be declared to throw AssertionException, and language enum should have stream insertion op
Diffstat (limited to 'src/parser/antlr_input.h')
-rw-r--r-- | src/parser/antlr_input.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/parser/antlr_input.h b/src/parser/antlr_input.h index 0d5fda89a..940835a7e 100644 --- a/src/parser/antlr_input.h +++ b/src/parser/antlr_input.h @@ -74,12 +74,12 @@ public: */ static AntlrInputStream* newFileInputStream(const std::string& name, bool useMmap = false) - throw (InputStreamException); + throw (InputStreamException, AssertionException); /** Create an input from an istream. */ static AntlrInputStream* newStreamInputStream(std::istream& input, const std::string& name) - throw (InputStreamException); + throw (InputStreamException, AssertionException); /** Create a string input. * @@ -88,7 +88,7 @@ public: */ static AntlrInputStream* newStringInputStream(const std::string& input, const std::string& name) - throw (InputStreamException); + throw (InputStreamException, AssertionException); }; class Parser; @@ -192,7 +192,8 @@ protected: /** * Throws a <code>ParserException</code> with the given message. */ - void parseError(const std::string& msg) throw (ParserException); + void parseError(const std::string& msg) + throw (ParserException, AssertionException); /** Set the ANTLR3 lexer for this input. */ void setAntlr3Lexer(pANTLR3_LEXER pLexer); |