Changeset d41280e for src/Parser/ParseNode.h

Timestamp:

Feb 8, 2016, 10:07:42 AM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

c44e622

Parents:

00ede9e (diff), bd85400 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into gc_noraii

File:

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

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 13:27:11 2015
-// Update Count     : 172
+// 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,
+        enum Type { TupleC, Comma, TupleFieldSel, // n-adic
+                                // triadic
                                 Cond, NCond, 
-                                SizeOf, AlignOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And, 
+                                // 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,
-                                UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress
+                                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,
         };
 
@@ -198 +202 @@
   private:
         Type type;
-        static const char *OpName[];
 };