Changeset b3f252a for src/SynTree/Declaration.h

Timestamp:

Sep 7, 2017, 10:36:35 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

e0886db

Parents:

871cdb4 (diff), 416cc86 (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/SynTree/Declaration.h (modified) (3 diffs)

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 10:15:00 2017
-// Update Count     : 128
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Sep  3 19:24:06 2017
+// Update Count     : 131
 //
 
@@ -82 +82 @@
         int scopeLevel = 0;
 
-        ConstantExpr *asmName;
+        Expression *asmName;
         std::list< Attribute * > attributes;
 
@@ -97 +97 @@
         DeclarationWithType * set_scopeLevel( int newValue ) { scopeLevel = newValue; return this; }
 
-        ConstantExpr *get_asmName() const { return asmName; }
-        DeclarationWithType * set_asmName( ConstantExpr *newValue ) { asmName = newValue; return this; }
+        Expression *get_asmName() const { return asmName; }
+        DeclarationWithType * set_asmName( Expression *newValue ) { asmName = newValue; return this; }
 
         std::list< Attribute * >& get_attributes() { return attributes; }