Changes in src/Parser/ParseNode.h [974906e2:5721a6d]

File:

• src/Parser/ParseNode.h (modified) (10 diffs)

src/Parser/ParseNode.h

@@ -5 +5 @@
 // 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 : Rob Schluntz
-// Last Modified On : Thu Jan 07 13:17:46 2016
-// Update Count     : 177
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Feb  1 13:32:32 2016
+// Update Count     : 184
 //
 
@@ -21 +21 @@
 #include <iterator>
 
-#include "utility.h"
+#include "Common/utility.h"
 #include "Parser/LinkageSpec.h"
 #include "SynTree/Type.h"
 //#include "SynTree/Declaration.h"
-#include "UniqueName.h"
+#include "Common/UniqueName.h"
 
 class ExpressionNode;
@@ -108 +108 @@
 
         ConstantNode( Type, std::string * );
+        ConstantNode( const ConstantNode &other ) : value( *new std::string( other.value ) ) {};
         ~ConstantNode() { delete &value; }
 
@@ -174 +175 @@
 class OperatorNode : public ExpressionNode {
   public:
-        enum Type { TupleC, Comma, TupleFieldSel,
-                                Cond, NCond,
-                                SizeOf, AlignOf, 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,
+        enum Type { TupleC, Comma, TupleFieldSel, // n-adic
+                                // triadic
+                                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, 
+                                Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
+                                Index, FieldSel, PFieldSel, Range,
+                                // monadic
                                 UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress,
-                                Ctor, Dtor,
         };
 
@@ -199 +202 @@
   private:
         Type type;
-        static const char *OpName[];
 };
 
@@ -307 +309 @@
         ValofExprNode( const ValofExprNode &other );
         ~ValofExprNode();
-
+  
         virtual ValofExprNode *clone() const { return new ValofExprNode( *this ); }
 
@@ -330 +332 @@
         enum TypeClass { Type, Dtype, Ftype };
 
-        static const char *storageName[];
+        static const char *storageName[];  
         static const char *qualifierName[];
         static const char *basicTypeName[];
@@ -420 +422 @@
 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,
@@ -518 +520 @@
         ExpressionNode *get_designators() const { return designator; }
 
-        InitializerNode *set_maybeConstructed( bool value ) { maybeConstructed = value; return this; }
-        bool get_maybeConstructed() const { return maybeConstructed; }
-
         InitializerNode *next_init() const { return kids; }
 
@@ -532 +531 @@
         ExpressionNode *designator; // may be list
         InitializerNode *kids;
-        bool maybeConstructed;
 };