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, 4 insertions, 2 deletions

diff --git a/src/parser/cvc/cvc_input.cpp b/src/parser/cvc/cvc_input.cpp
index 2b99f9a87..6b38abaab 100644
--- a/src/parser/cvc/cvc_input.cpp
+++ b/src/parser/cvc/cvc_input.cpp
@@ -58,11 +58,13 @@ CvcInput::~CvcInput() {
   d_pCvcParser->free(d_pCvcParser);
 }
 
-Command* CvcInput::parseCommand() throw (ParserException) {
+Command* CvcInput::parseCommand()
+  throw (ParserException, AssertionException) {
   return d_pCvcParser->parseCommand(d_pCvcParser);
 }
 
-Expr CvcInput::parseExpr() throw (ParserException) {
+Expr CvcInput::parseExpr()
+  throw (ParserException, AssertionException) {
   return d_pCvcParser->parseExpr(d_pCvcParser);
 }