Minor fixes to various parts of CVC4, including the removal of the uintptr_t constructors for Type and Expr (which existed due to ANTLR limitations). These issues are now handled (as a hack, due to said limitations) in the parser rather than the CVC4 core.

4 files changed, 1 insertions, 30 deletions

diff --git a/src/expr/expr_template.cpp b/src/expr/expr_template.cpp
index b7000fea6..286ddf611 100644
--- a/src/expr/expr_template.cpp
+++ b/src/expr/expr_template.cpp
@@ -95,13 +95,6 @@ Expr::Expr(const Expr& e) :
   d_exprManager(e.d_exprManager) {
 }
 
-Expr::Expr(uintptr_t n) :
-  d_node(new Node),
-  d_exprManager(NULL) {
-
-  AlwaysAssert(n == 0);
-}
-
 Expr::~Expr() {
   ExprManagerScope ems(*this);
   delete d_node;
diff --git a/src/expr/expr_template.h b/src/expr/expr_template.h
index 43d40105e..b0157adbf 100644
--- a/src/expr/expr_template.h
+++ b/src/expr/expr_template.h
@@ -153,14 +153,6 @@ public:
    */
   Expr(const Expr& e);
 
-  /**
-   * Initialize from an integer. Fails if the integer is not 0.
-   * NOTE: This is here purely to support the auto-initialization
-   * behavior of the ANTLR3 C backend. Should be removed if future
-   * versions of ANTLR fix the problem.
-   */
-  Expr(uintptr_t n);
-
   /** Destructor */
   ~Expr();
 
@@ -758,7 +750,7 @@ public:
 
 ${getConst_instantiations}
 
-#line 762 "${template}"
+#line 754 "${template}"
 
 namespace expr {
 
diff --git a/src/expr/type.cpp b/src/expr/type.cpp
index 0df385a29..567bb2d40 100644
--- a/src/expr/type.cpp
+++ b/src/expr/type.cpp
@@ -53,12 +53,6 @@ Type::Type() :
   d_nodeManager(NULL) {
 }
 
-Type::Type(uintptr_t n) :
-  d_typeNode(new TypeNode),
-  d_nodeManager(NULL) {
-  AlwaysAssert(n == 0);
-}
-
 Type::Type(const Type& t) :
   d_typeNode(new TypeNode(*t.d_typeNode)),
   d_nodeManager(t.d_nodeManager) {
diff --git a/src/expr/type.h b/src/expr/type.h
index 682e5fbcd..980a750d5 100644
--- a/src/expr/type.h
+++ b/src/expr/type.h
@@ -112,14 +112,6 @@ protected:
 
 public:
 
-  /**
-   * Initialize from an integer. Fails if the integer is not 0.
-   * NOTE: This is here purely to support the auto-initialization
-   * behavior of the ANTLR3 C backend. Should be removed if future
-   * versions of ANTLR fix the problem.
-   */
-  Type(uintptr_t n);
-
   /** Force a virtual destructor for safety. */
   virtual ~Type();