Changeset f28a53a for src/SynTree

Timestamp:

Oct 7, 2015, 12:42:10 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

0800284, 50eac1b

Parents:

59cde21 (diff), 1521de20 (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 override-autogen

Location:

src/SynTree

Files:

• Expression.cc (modified) (2 diffs)
• ObjectDecl.cc (modified) (2 diffs)

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:02:45 2015
-// Update Count     : 30
+// Last Modified On : Wed Sep 02 12:07:10 2015
+// Update Count     : 33
 //
 
@@ -31 +31 @@
 Expression::Expression( Expression *_aname ) : env( 0 ), argName( _aname ) {}
 
-Expression::Expression( const Expression &other ) : env( maybeClone( other.env ) ) {
+Expression::Expression( const Expression &other ) : env( maybeClone( other.env ) ), argName( maybeClone( other.get_argName() ) ) {
         cloneAll( other.results, results );
-        argName = other.get_argName();
 }
 

src/SynTree/ObjectDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 18:08:27 2015
-// Update Count     : 16
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Sep 29 14:13:01 2015
+// Update Count     : 18
 //
 
@@ -52 +52 @@
                 get_type()->print( os, indent );
         } else {
-                os << "untyped entity ";
+                os << " untyped entity ";
         } // if
 
         if ( init ) {
-                os << "with initializer ";
+                os << " with initializer ";
                 init->print( os, indent );
         } // if
 
         if ( bitfieldWidth ) {
-                os << "with bitfield width ";
+                os << " with bitfield width ";
                 bitfieldWidth->print( os );
         } // if