Changeset d668182

Timestamp:

May 13, 2016, 1:28:17 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, with_gc

Children:

102b0cd

Parents:

7b3f66b (diff), bb8ea30 (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/Initializer.cc
src/SynTree/ObjectDecl.cc

Location:

src/SynTree

Files:

• ArrayType.cc (modified) (2 diffs)
• Expression.cc (modified) (5 diffs)
• Initializer.cc (modified) (2 diffs)
• ObjectDecl.cc (modified) (2 diffs)
• Statement.cc (modified) (3 diffs)

src/SynTree/ArrayType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ArrayType.cc -- 
+// ArrayType.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:19:07 2015
+// Last Modified On : Thu May 12 14:07:16 2016
 // Update Count     : 11
 //
@@ -51 +51 @@
         if ( dimension ) {
                 os << " with dimension of ";
-                dimension->print( os, 0 );
+                dimension->print( os, indent );
         } // if
 }

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 04 12:17:51 2016
+// Last Modified On : Fri May 13 13:23:11 2016
 // Update Count     : 40
 //
@@ -75 +75 @@
         constant.print( os );
         Expression::print( os, indent );
-        os << std::endl;
 }
 
@@ -325 +324 @@
         os << ", from aggregate: ";
         if (agg != 0) {
+                os << std::string( indent + 2, ' ' );
                 agg->print(os, indent + 2);
         }
@@ -360 +360 @@
         os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
         if (agg != 0) {
+                os << std::string( indent + 2, ' ' );
                 agg->print(os, indent + 2);
         }
@@ -381 +382 @@
 void UntypedExpr::print( std::ostream &os, int indent ) const {
         os << "Applying untyped: " << std::endl;
-        os << std::string( indent+4, ' ' );
-        function->print(os, indent + 4);
+        os << std::string( indent+2, ' ' );
+        function->print(os, indent + 2);
         os << std::string( indent, ' ' ) << "...to: " << std::endl;
-        printAll(args, os, indent + 4);
+        printAll(args, os, indent + 2);
         Expression::print( os, indent );
 }

src/SynTree/Initializer.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 15:51:35 2016
+// Last Modified On : Fri May 13 13:23:03 2016
 // Update Count     : 28
 //
@@ -49 +49 @@
 
         if ( ! designators.empty() ) {
-                os << std::endl << std::string(indent + 2, ' ' ) << "designated by: "   << std::endl;
+                os << std::endl << std::string(indent + 2, ' ' ) << "designated by: " << std::endl;
                 for ( std::list < Expression * >::iterator i = designators.begin(); i != designators.end(); i++ ) {
+                        os << std::string(indent + 4, ' ' );
                         ( *i )->print(os, indent + 4 );
                 }

src/SynTree/ObjectDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 04 12:18:28 2016
+// Last Modified On : Fri May 13 13:23:32 2016
 // Update Count     : 30
 //
@@ -57 +57 @@
 
         if ( init ) {
-                os << std::string(indent, ' ');
                 os << " with initializer ";
                 init->print( os, indent );
-                os << std::string(indent, ' ') << "maybeConstructed? " << init->get_maybeConstructed();
+                os << std::endl << std::string(indent, ' ');
+                os << "maybeConstructed? " << init->get_maybeConstructed();
         } // if
 

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 28 13:34:32 2016
+// Last Modified On : Thu May 12 13:33:18 2016
 // Update Count     : 54
 //
@@ -43 +43 @@
 
 void ExprStmt::print( std::ostream &os, int indent ) const {
-        os << "Expression Statement:" << endl << std::string( indent, ' ' );
+        os << "Expression Statement:" << endl << std::string( indent + 2, ' ' );
         expr->print( os, indent + 2 );
 }
@@ -290 +290 @@
         os << string( indent + 2, ' ' ) << "initialization: \n";
         for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
+                os << string( indent + 4, ' ' );
                 (*it)->print( os, indent + 4 );
         }
 
         os << "\n" << string( indent + 2, ' ' ) << "condition: \n";
-        if ( condition != 0 )
+        if ( condition != 0 ) {
+                os << string( indent + 4, ' ' );
                 condition->print( os, indent + 4 );
+        }
 
         os << "\n" << string( indent + 2, ' ' ) << "increment: \n";
-        if ( increment != 0 )
+        if ( increment != 0 ) {
+                os << string( indent + 4, ' ' );
                 increment->print( os, indent + 4 );
+        }
 
         os << "\n" << string( indent + 2, ' ' ) << "statement block: \n";
-        if ( body != 0 )
+        if ( body != 0 ) {
+                os << string( indent + 4, ' ' );
                 body->print( os, indent + 4 );
+        }
 
         os << endl;