Moving parser error checking into AntlrParser

1 files changed, 3 insertions, 13 deletions

diff --git a/src/parser/cvc/cvc_parser.g b/src/parser/cvc/cvc_parser.g
index 926430a5c..e953244df 100644
--- a/src/parser/cvc/cvc_parser.g
+++ b/src/parser/cvc/cvc_parser.g
@@ -153,15 +153,8 @@ identifier[DeclarationCheck check = CHECK_NONE,
            SymbolType type = SYM_VARIABLE] 
 returns [std::string id]
   : x:IDENTIFIER
-    { id = x->getText(); }
-    { checkDeclaration(id, check, type) }?
-    exception catch [antlr::SemanticException& ex] {
-      switch (check) {
-        case CHECK_DECLARED: parseError("Symbol " + id + " not declared");
-        case CHECK_UNDECLARED: parseError("Symbol " + id + " already declared");
-        default: throw ex;
-      }
-    }
+    { id = x->getText(); 
+      AlwaysAssert( checkDeclaration(id, check, type) ); }
   ;
 
 /**
@@ -388,9 +381,6 @@ functionSymbol[DeclarationCheck check = CHECK_NONE] returns [CVC4::Expr f]
   std::string name;
 }  
   : name = identifier[check,SYM_FUNCTION]
-    { AlwaysAssert( isFunction(name) );  
+    { AlwaysAssert( checkFunction(name) );  
       f = getFunction(name); }
-    exception catch [CVC4::AssertionException& ex] {
-      parseError("Expected function symbol, found: " + name);
-    }
   ;