more build system fix-ups

diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp
index e919a53e8036393b82fe9f4333bb73cf3ef07305..0a4b180ecf26e1ad0a0dbca615bcaf37c0b24ad5 100644 (file)
--- a/src/parser/parser.cpp
+++ b/src/parser/parser.cpp
@@ -41,7 +41,7 @@ bool Parser::done() const {
   return d_done;
 }
 
-Command* Parser::parseNextCommand() throw (ParserException) {
+Command* Parser::parseNextCommand() throw(ParserException, AssertionException) {
   Command* cmd = 0;
   if(!done()) {
     try {
@@ -58,7 +58,7 @@ Command* Parser::parseNextCommand() throw (ParserException) {
   return cmd;
 }
 
-Expr Parser::parseNextExpression() throw (ParserException) {
+Expr Parser::parseNextExpression() throw(ParserException, AssertionException) {
   Expr result;
   if(!done()) {
     try {
@@ -76,7 +76,9 @@ Expr Parser::parseNextExpression() throw (ParserException) {
 Parser::~Parser() {
   delete d_antlrParser;
   delete d_antlrLexer;
-  if (d_deleteInput) delete d_input;
+  if(d_deleteInput) {
+    delete d_input;
+  }
 }
 
 Parser::Parser(istream* input, AntlrParser* antlrParser, CharScanner* antlrLexer, bool deleteInput) :

diff --git a/src/parser/parser.h b/src/parser/parser.h
index d6180b9a3e6a4c8a8b40ff0a4c485f2a6680548e..b099a8142c35c24b214e97ae878949cef7299448 100644 (file)
--- a/src/parser/parser.h
+++ b/src/parser/parser.h
@@ -19,7 +19,8 @@
 #include <string>
 #include <iostream>
 #include "cvc4_config.h"
-#include "parser_exception.h"
+#include "parser/parser_exception.h"
+#include "util/Assert.h"
 #include "antlr_parser.h"
 
 namespace antlr {
@@ -65,14 +66,14 @@ public:
    * Parse the next command of the input. If EOF is encountered a EmptyCommand
    * is returned and done flag is set.
    */
-  Command* parseNextCommand() throw (ParserException);
+  Command* parseNextCommand() throw(ParserException, AssertionException);
 
   /**
    * Parse the next expression of the stream. If EOF is encountered a null
    * expression is returned and done flag is set.
    * @return the parsed expression
    */
-  Expr parseNextExpression() throw (ParserException);
+  Expr parseNextExpression() throw(ParserException, AssertionException);
 
   /**
    * Check if we are done -- either the end of input has been reached, or some