Adding more parser tests

diff --git a/src/parser/smt/smt_lexer.g b/src/parser/smt/smt_lexer.g
index 70f60a0bcbebc66eaae4ef86d996c2b5c54e48ea..bc8c05fdd6cc2a5c54781a23016e7be70b8510cc 100644 (file)
--- a/src/parser/smt/smt_lexer.g
+++ b/src/parser/smt/smt_lexer.g
@@ -150,3 +150,9 @@ STRING_LITERAL options { paraphrase = "a string literal"; }
   :  '\"' (~('\"'))* '\"'
   ;
   
+/**
+ * Matches the comments and ignores them
+ */
+COMMENT options { paraphrase = "comment"; }
+  : ';' (~('\n' | '\r'))*                    { $setType(antlr::Token::SKIP); }
+  ;

diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index cf78d8e347652a3da8d084e30c69fd5c0248a47b..d8f321f1074f890c5a837c68875237ec781e3705 100644 (file)
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -16,7 +16,8 @@ AM_LDFLAGS_PUBLIC = \
 TESTS = \
        expr/node_white \
        expr/node_black \
-       parser/cvc/cvc_parser_black
+       parser/cvc/cvc_parser_black \
+       parser/smt/smt_parser_black
 
 # without these here, LTCXXCOMPILE, CXXLINK, etc., aren't set :-(
 noinst_LTLIBRARIES = libdummy.la

diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in
index f20905330dcfe37c6ddf7d66d39f47d2854246fb..251ef2dfe945d736569f041d9b4219caf2265d7f 100644 (file)
--- a/test/unit/Makefile.in
+++ b/test/unit/Makefile.in
@@ -235,7 +235,8 @@ top_srcdir = @top_srcdir@
 @HAVE_CXXTESTGEN_TRUE@TESTS = \
 @HAVE_CXXTESTGEN_TRUE@ expr/node_white \
 @HAVE_CXXTESTGEN_TRUE@ expr/node_black \
-@HAVE_CXXTESTGEN_TRUE@ parser/cvc/cvc_parser_black
+@HAVE_CXXTESTGEN_TRUE@ parser/cvc/cvc_parser_black \
+@HAVE_CXXTESTGEN_TRUE@ parser/smt/smt_parser_black
 
 
 # without these here, LTCXXCOMPILE, CXXLINK, etc., aren't set :-(

diff --git a/test/unit/parser/cvc/cvc_parser_black.h b/test/unit/parser/cvc/cvc_parser_black.h
index b34185e0151fed32c2821535d57b6d008e2dccf9..e99cce44ddb18be0d7059e9bd0917a9aee4d43c8 100644 (file)
--- a/test/unit/parser/cvc/cvc_parser_black.h
+++ b/test/unit/parser/cvc/cvc_parser_black.h
@@ -1,9 +1,10 @@
-/* Black box testing of CVC4::Node. */
+/* Black box testing of CVC4::parser::CvcParser. */
 
 #include <cxxtest/TestSuite.h>
 //#include <string>
 #include <sstream>
 
+#include "expr/expr.h"
 #include "expr/expr_manager.h"
 #include "parser/cvc/cvc_parser.h"
 
@@ -11,36 +12,97 @@ using namespace CVC4;
 using namespace CVC4::parser;
 using namespace std;
 
-const string d_goodInputs[] = {
+const string goodInputs[] = {
+      "", // empty string is OK
       "ASSERT TRUE;",
       "QUERY TRUE;",
       "CHECKSAT FALSE;",
       "a, b : BOOLEAN;",
       "x, y : INT;",
-      "a, b : BOOLEAN; QUERY (a => b) AND a => b;"
+      "a, b : BOOLEAN; QUERY (a => b) AND a => b;",
+      "%% nothing but a comment",
+      "% a comment\nASSERT TRUE %a command\n% another comment"
   };
 
+/* The following expressions are good in a context where a, b, and c have been declared as BOOLEAN. */
+const string goodBooleanExprs[] = {
+    "a AND b",
+    "a AND b OR c",
+    "(a => b) AND a => b",
+    "(a <=> b) AND (NOT a)",
+    "(a XOR b) <=> (a OR b) AND (NOT (a AND b))"
+};
+
+const string badInputs[] = {
+      ";", // no command
+      "ASSERT;", // no args
+      "QUERY",
+      "CHECKSAT;",
+      "a, b : boolean;", // lowercase boolean isn't a type
+      "0x : INT;", // 0x isn't an identifier
+      "a, b : BOOLEAN\nQUERY (a => b) AND a => b;" // no semicolon after decl
+  };
+
+/* The following expressions are bad even in a context where a, b, and c have been declared as BOOLEAN. */
+const string badBooleanExprs[] = {
+    "",
+    "a AND", // wrong arity
+    "AND(a,b)", // not infix
+    "(OR (AND a b) c)", // not infix
+    "a IMPLIES b", // should be =>
+    "a NOT b", // wrong arity, not infix
+    "a and b" // wrong case
+};
+
 class CvcParserBlack : public CxxTest::TestSuite {
 private:
-
   ExprManager *d_exprManager;
 
-
 public:
   void setUp() {
-//    cout << "In setUp()\n";
     d_exprManager = new ExprManager();
-//    cout << "Leaving setUp()\n";
   }
 
   void testGoodInputs() {
-//    cout << "In testGoodInputs()\n";
-    for( int i=0; i < sizeof(d_goodInputs); ++i ) {
-      istringstream stream(d_goodInputs[i]);
-      CvcParser cvcParser(d_exprManager,stream);
+    //    cout << "In testGoodInputs()\n";
+    for(int i = 0; i < sizeof(goodInputs); ++i) {
+      istringstream stream(goodInputs[i]);
+      CvcParser cvcParser(d_exprManager, stream);
       TS_ASSERT( !cvcParser.done() );
-      while( !cvcParser.done() ) {
-        TS_ASSERT( cvcParser.parseNextCommand() );
+      while(!cvcParser.done()) {
+        TS_ASSERT( cvcParser.parseNextCommand() != NULL );
       }
+    }
   }
+
+  void testBadInputs() {
+    //    cout << "In testGoodInputs()\n";
+    for(int i = 0; i < sizeof(badInputs); ++i) {
+      istringstream stream(badInputs[i]);
+      CvcParser cvcParser(d_exprManager, stream);
+      TS_ASSERT_THROWS( cvcParser.parseNextCommand(), ParserException );
+    }
+  }
+
+  void testGoodBooleanExprs() {
+    //    cout << "In testGoodInputs()\n";
+    for(int i = 0; i < sizeof(goodBooleanExprs); ++i) {
+      istringstream stream(goodBooleanExprs[i]);
+      CvcParser cvcParser(d_exprManager, stream);
+      TS_ASSERT( !cvcParser.done() );
+      while(!cvcParser.done()) {
+        TS_ASSERT( !cvcParser.parseNextExpression().isNull() );
+      }
+    }
+  }
+
+  void testBadBooleanExprs() {
+    //    cout << "In testGoodInputs()\n";
+    for(int i = 0; i < sizeof(badBooleanExprs); ++i) {
+      istringstream stream(badBooleanExprs[i]);
+      CvcParser cvcParser(d_exprManager, stream);
+      TS_ASSERT_THROWS( cvcParser.parseNextExpression(), ParserException );
+    }
+  }
+
 };