Merging from branches/antlr3 (r246:354)

1 files changed, 17 insertions, 0 deletions

diff --git a/src/expr/expr.h b/src/expr/expr.h
index c5478b1da..48b64fd17 100644
--- a/src/expr/expr.h
+++ b/src/expr/expr.h
@@ -48,6 +48,14 @@ 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();
 
@@ -61,6 +69,15 @@ public:
   Expr& operator=(const Expr& e);
 
   /**
+   * Assignment 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 (i.e., a rule attribute
+   * <code>Expr e</code> gets initialized with <code>e = NULL;</code>.
+   * Should be removed if future versions of ANTLR fix the problem.
+   */
+  Expr& operator=(uintptr_t n);
+
+  /**
    * Syntactic comparison operator. Returns true if expressions belong to the
    * same expression manager and are syntactically identical.
    * @param e the expression to compare to