ELSEIF support and parser debugging with '-d parser'

1 files changed, 14 insertions, 5 deletions

diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp
index a38868d3b..2f9ac6724 100644
--- a/src/parser/parser.cpp
+++ b/src/parser/parser.cpp
@@ -19,6 +19,7 @@
 
 #include "parser.h"
 #include "util/command.h"
+#include "util/output.h"
 #include "util/Assert.h"
 #include "parser_exception.h"
 #include "parser/antlr_parser.h"
@@ -41,21 +42,26 @@ bool Parser::done() const {
   return d_done;
 }
 
-Command* Parser::parseNextCommand() throw(ParserException, AssertionException) {
+Command* Parser::parseNextCommand() throw (ParserException, AssertionException) {
+  Debug("parser") << "parseNextCommand()" << std::endl;
   Command* cmd = NULL;
   if(!done()) {
     try {
       cmd = d_antlrParser->parseCommand();
-      if (cmd == NULL) setDone();
+      if(cmd == NULL) {
+        setDone();
+      }
     } catch(antlr::ANTLRException& e) {
       setDone();
       throw ParserException(e.toString());
     }
   }
+  Debug("parser") << "parseNextCommand() => " << cmd << std::endl;
   return cmd;
 }
 
-Expr Parser::parseNextExpression() throw(ParserException, AssertionException) {
+Expr Parser::parseNextExpression() throw (ParserException, AssertionException) {
+  Debug("parser") << "parseNextExpression()" << std::endl;
   Expr result;
   if(!done()) {
     try {
@@ -67,6 +73,7 @@ Expr Parser::parseNextExpression() throw(ParserException, AssertionException) {
       throw ParserException(e.toString());
     }
   }
+  Debug("parser") << "parseNextExpression() => " << result << std::endl;
   return result;
 }
 
@@ -78,8 +85,10 @@ Parser::~Parser() {
   }
 }
 
-Parser::Parser(istream* input, AntlrParser* antlrParser, CharScanner* antlrLexer, bool deleteInput) :
-  d_done(false), d_antlrParser(antlrParser), d_antlrLexer(antlrLexer), d_input(input), d_deleteInput(deleteInput) {
+Parser::Parser(istream* input, AntlrParser* antlrParser,
+               CharScanner* antlrLexer, bool deleteInput) :
+  d_done(false), d_antlrParser(antlrParser), d_antlrLexer(antlrLexer),
+      d_input(input), d_deleteInput(deleteInput) {
 }
 
 Parser* Parser::getNewParser(ExprManager* em, InputLanguage lang,