Changeset 347c42f

Timestamp:

Apr 15, 2016, 1:45:13 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, string, with_gc

Children:

356bb95, b644d6f

Parents:

9fd97126 (diff), 37f0da8 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/ParseNode.h (modified) (6 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 : 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 +108 @@
 
         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 +177 @@
         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 +309 @@
         ValofExprNode( const ValofExprNode &other );
         ~ValofExprNode();
-  
+
         virtual ValofExprNode *clone() const { return new ValofExprNode( *this ); }
 
@@ -333 +333 @@
         enum BuiltinType { Valist };
 
-        static const char *storageName[];  
+        static const char *storageName[];
         static const char *qualifierName[];
         static const char *basicTypeName[];
@@ -427 +427 @@
 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,