Changeset 1cdfa82 for src/SynTree/Statement.cc

Timestamp:

Apr 25, 2018, 4:55:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

File:

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

src/SynTree/Statement.cc

@@ -34 +34 @@
 Statement::Statement( const std::list<Label> & labels ) : labels( labels ) {}
 
-void Statement::print( std::ostream & os, Indenter ) const {
+void Statement::print( std::ostream & os, Indenter indent ) const {
         if ( ! labels.empty() ) {
-                os << "Labels: {";
+                os << indent << "... Labels: {";
                 for ( const Label & l : labels ) {
                         os << l << ",";
@@ -188 +188 @@
 
 void CaseStmt::print( std::ostream &os, Indenter indent ) const {
-        if ( isDefault() ) os << "Default ";
+        if ( isDefault() ) os << indent << "Default ";
         else {
-                os << "Case ";
+                os << indent << "Case ";
                 condition->print( os, indent );
         } // if
@@ -196 +196 @@
 
         for ( Statement * stmt : stmts ) {
+                os << indent+1;
                 stmt->print( os, indent+1 );
         }
@@ -391 +392 @@
 }
 
-void NullStmt::print( std::ostream &os, Indenter ) const {
+void NullStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Null Statement" << endl;
+        Statement::print( os, indent );
 }