Index: src/Parser/ParseNode.h
===================================================================
--- src/Parser/ParseNode.h	(revision 45161b4dbe96eb7c39820eada44ba63904bc88cc)
+++ src/Parser/ParseNode.h	(revision 743fbda0697c3c08bc18806ec8a1c8764098d154)
@@ -5,10 +5,10 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ParseNode.h -- 
+// ParseNode.h --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr  8 16:27:20 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Apr 11 11:50:52 2016
 // Update Count     : 205
 //
@@ -108,5 +108,5 @@
 
 	ConstantNode( Type, std::string * );
-	ConstantNode( const ConstantNode &other ) : value( *new std::string( other.value ) ) {};
+	ConstantNode( const ConstantNode &other ) : type( other.type ), btype( other.btype), value( *new std::string( other.value ) ) {};
 	~ConstantNode() { delete &value; }
 
@@ -177,8 +177,8 @@
 	enum Type { TupleC, Comma, TupleFieldSel, // n-adic
 				// triadic
-				Cond, NCond, 
+				Cond, NCond,
 				// diadic
-				SizeOf, AlignOf, OffsetOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And, 
-				BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq, 
+				SizeOf, AlignOf, OffsetOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And,
+				BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq,
 				Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
 				Index, FieldSel, PFieldSel, Range,
@@ -309,5 +309,5 @@
 	ValofExprNode( const ValofExprNode &other );
 	~ValofExprNode();
-  
+
 	virtual ValofExprNode *clone() const { return new ValofExprNode( *this ); }
 
@@ -333,5 +333,5 @@
 	enum BuiltinType { Valist };
 
-	static const char *storageName[];  
+	static const char *storageName[];
 	static const char *qualifierName[];
 	static const char *basicTypeName[];
@@ -427,5 +427,5 @@
 class StatementNode : public ParseNode {
   public:
-	enum Type { Exp,   If,        Switch,  Case,    Default,  Choose,   Fallthru, 
+	enum Type { Exp,   If,        Switch,  Case,    Default,  Choose,   Fallthru,
 				While, Do,        For,
 				Goto,  Continue,  Break,   Return,  Throw,