merge from CC work: pieces of the parser need to be declared to throw AssertionException, and language enum should have stream insertion op

1 files changed, 5 insertions, 4 deletions

diff --git a/src/parser/antlr_input.cpp b/src/parser/antlr_input.cpp
index 740d7fae5..b919c3bd5 100644
--- a/src/parser/antlr_input.cpp
+++ b/src/parser/antlr_input.cpp
@@ -63,7 +63,7 @@ pANTLR3_INPUT_STREAM AntlrInputStream::getAntlr3InputStream() const {
 AntlrInputStream* 
 AntlrInputStream::newFileInputStream(const std::string& name, 
                                      bool useMmap)
-  throw (InputStreamException) {
+  throw (InputStreamException, AssertionException) {
   pANTLR3_INPUT_STREAM input = NULL;
   if( useMmap ) {
     input = MemoryMappedInputBufferNew(name);
@@ -79,7 +79,7 @@ AntlrInputStream::newFileInputStream(const std::string& name,
 AntlrInputStream* 
 AntlrInputStream::newStreamInputStream(std::istream& input, 
                                        const std::string& name)
-  throw (InputStreamException) {
+  throw (InputStreamException, AssertionException) {
 
   // Since these are all NULL on entry, realloc will be called
   char *basep = NULL, *boundp = NULL, *cp = NULL;
@@ -126,7 +126,7 @@ AntlrInputStream::newStreamInputStream(std::istream& input,
 AntlrInputStream* 
 AntlrInputStream::newStringInputStream(const std::string& input, 
                                        const std::string& name)
-  throw (InputStreamException) {
+  throw (InputStreamException, AssertionException) {
   char* inputStr = strdup(input.c_str());
   char* nameStr = strdup(name.c_str());
   AlwaysAssert( inputStr!=NULL && nameStr!=NULL );
@@ -159,6 +159,7 @@ AntlrInput* AntlrInput::newInput(InputLanguage lang, AntlrInputStream& inputStre
   default:
     Unhandled(lang);
   }
+
   return input;
 }
 
@@ -225,7 +226,7 @@ void AntlrInput::lexerError(pANTLR3_BASE_RECOGNIZER recognizer) {
 }
 
 void AntlrInput::parseError(const std::string& message)
-    throw (ParserException) {
+  throw (ParserException, AssertionException) {
   Debug("parser") << "Throwing exception: "
       << getInputStream()->getName() << ":"
       << d_lexer->getLine(d_lexer) << "."