Changeset 7cc6bd6

Timestamp:

May 4, 2016, 12:18:56 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, 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:

a1d6d80

Parents:

2e3a379 (diff), 9243a501 (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 'fix-tree-printing' into ctor

Conflicts:

src/SynTree/Expression.cc
src/SynTree/ObjectDecl.cc

Location:

src/SynTree

Files:

• Expression.cc (modified) (3 diffs)
• FunctionDecl.cc (modified) (4 diffs)
• ObjectDecl.cc (modified) (3 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 Apr 27 17:07:19 2016
+// Last Modified On : Wed May 04 12:17:51 2016
 // Update Count     : 40
 //
@@ -323 +323 @@
 
         Expression *agg = get_aggregate();
-        os << std::string( indent, ' ' ) << "from aggregate: ";
+        os << ", from aggregate: ";
         if (agg != 0) {
-                os << std::string( indent+2, ' ' );
                 agg->print(os, indent + 2);
         }
@@ -361 +360 @@
         os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
         if (agg != 0) {
-                os << std::string( indent+2, ' ' );
                 agg->print(os, indent + 2);
         }

src/SynTree/FunctionDecl.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FunctionDecl.cc -- 
+// FunctionDecl.cc --
 //
 // 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:11:44 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue May 03 15:37:43 2016
 // Update Count     : 19
 //
@@ -52 +52 @@
         using std::endl;
         using std::string;
-        
+
         if ( get_name() != "" ) {
                 os << get_name() << ": ";
@@ -87 +87 @@
         if ( statements ) {
                 os << string( indent + 2, ' ' ) << "with body " << endl;
+                os << string( indent + 4, ' ' );
                 statements->print( os, indent + 4 );
         } // if
@@ -94 +95 @@
         using std::endl;
         using std::string;
-        
+
         if ( get_name() != "" ) {
                 os << get_name() << ": ";

src/SynTree/ObjectDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 12:56:27 2016
+// Last Modified On : Wed May 04 12:18:28 2016
 // Update Count     : 30
 //
@@ -57 +57 @@
 
         if ( init ) {
+                os << std::string(indent, ' ');
                 os << " with initializer ";
                 init->print( os, indent );
@@ -63 +64 @@
 
         if ( bitfieldWidth ) {
+                os << std::string(indent, ' ');
                 os << " with bitfield width ";
                 bitfieldWidth->print( os );