* reviewed BooleanSimplification, added documentation & unit test

* work around a lexer ambiguity in CVC grammar
* add support for tracing antlr parser/lexer
* add parsing support for more language features
* initial parameterized types parsing work to support Andy's work

1 files changed, 45 insertions, 0 deletions

diff --git a/src/util/boolean_simplification.cpp b/src/util/boolean_simplification.cpp
new file mode 100644
index 000000000..a154f342f
--- /dev/null
+++ b/src/util/boolean_simplification.cpp
@@ -0,0 +1,45 @@
+/*********************                                                        */
+/*! \file boolean_simplification.cpp
+ ** \verbatim
+ ** Original author: taking
+ ** Major contributors: none
+ ** Minor contributors (to current version): none
+ ** This file is part of the CVC4 prototype.
+ ** Copyright (c) 2009, 2010, 2011  The Analysis of Computer Systems Group (ACSys)
+ ** Courant Institute of Mathematical Sciences
+ ** New York University
+ ** See the file COPYING in the top-level source directory for licensing
+ ** information.\endverbatim
+ **
+ ** \brief Simple routines for Boolean simplification
+ **
+ ** Simple, commonly-used routines for Boolean simplification.
+ **/
+
+#include "util/boolean_simplification.h"
+
+namespace CVC4 {
+
+void
+BooleanSimplification::push_back_associative_commute_recursive
+    (Node n, std::vector<Node>& buffer, Kind k, Kind notK, bool negateNode)
+    throw(AssertionException) {
+  Node::iterator i = n.begin(), end = n.end();
+  for(; i != end; ++i){
+    Node child = *i;
+    if(child.getKind() == k){
+      push_back_associative_commute_recursive(child, buffer, k, notK, negateNode);
+    }else if(child.getKind() == kind::NOT && child[0].getKind() == notK){
+      push_back_associative_commute_recursive(child, buffer, notK, k, !negateNode);
+    }else{
+      if(negateNode){
+        buffer.push_back(negate(child));
+      }else{
+        buffer.push_back(child);
+      }
+    }
+  }
+}/* BooleanSimplification::push_back_associative_commute_recursive() */
+
+}/* CVC4 namespace */
+