Changeset d7903b1 for src/SynTree/Statement.cc

Timestamp:

May 2, 2016, 3:19:54 PM (8 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:

2e3a379

Parents:

fbfde843 (diff), 60089f4 (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/CommaExpr.cc
src/SynTree/CompoundStmt.cc

File:

• src/SynTree/Statement.cc (modified) (2 diffs)

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 12:33:33 2016
+// Last Modified On : Thu Apr 28 13:34:32 2016
 // Update Count     : 54
 //
@@ -128 +128 @@
 void IfStmt::print( std::ostream &os, int indent ) const {
         os << "If on condition: " << endl ;
+        os << string( indent+4, ' ' );
         condition->print( os, indent + 4 );
 
-        os << string( indent, ' ' ) << ".... and branches: " << endl;
-
+        os << string( indent+2, ' ' ) << "... then: " << endl;
+
+        os << string( indent+4, ' ' );
         thenPart->print( os, indent + 4 );
 
         if ( elsePart != 0 ) {
+                os << string( indent+2, ' ' ) << "... else: " << endl;
+                os << string( indent+4, ' ' );
                 elsePart->print( os, indent + 4 );
         } // if