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/input.cpp | |
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/input.cpp')
-rw-r--r-- | src/parser/input.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/parser/input.cpp b/src/parser/input.cpp index 2c4671b93..36e96516f 100644 --- a/src/parser/input.cpp +++ b/src/parser/input.cpp @@ -57,7 +57,7 @@ InputStream *Input::getInputStream() { Input* Input::newFileInput(InputLanguage lang, const std::string& filename, bool useMmap) - throw (InputStreamException) { + throw (InputStreamException, AssertionException) { AntlrInputStream *inputStream = AntlrInputStream::newFileInputStream(filename,useMmap); return AntlrInput::newInput(lang,*inputStream); @@ -66,7 +66,7 @@ Input* Input::newFileInput(InputLanguage lang, Input* Input::newStreamInput(InputLanguage lang, std::istream& input, const std::string& name) - throw (InputStreamException) { + throw (InputStreamException, AssertionException) { AntlrInputStream *inputStream = AntlrInputStream::newStreamInputStream(input,name); return AntlrInput::newInput(lang,*inputStream); @@ -75,7 +75,7 @@ Input* Input::newStreamInput(InputLanguage lang, Input* Input::newStringInput(InputLanguage lang, const std::string& str, const std::string& name) - throw (InputStreamException) { + throw (InputStreamException, AssertionException) { AntlrInputStream *inputStream = AntlrInputStream::newStringInputStream(str,name); return AntlrInput::newInput(lang,*inputStream); } |