Changeset 668edd6b for src/SynTree/Expression.cc

Timestamp:

Apr 26, 2016, 12:58:14 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:

1b31345

Parents:

5382492 (diff), 89231bc (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

File:

• src/SynTree/Expression.cc (modified) (9 diffs)

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri Apr 22 16:20:43 2016
+// Last Modified On : Tue Apr 26 12:58:05 2016
 // Update Count     : 40
 //
@@ -95 +95 @@
 
 void VariableExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Variable Expression: ";
+        os << "Variable Expression: ";
 
         Declaration *decl = get_var();
@@ -124 +124 @@
 
 void SizeofExpr::print( std::ostream &os, int indent) const {
-        os << std::string( indent, ' ' ) << "Sizeof Expression on: ";
+        os << "Sizeof Expression on: ";
 
         if (isType)
@@ -297 +297 @@
 
 void CastExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Cast of:" << std::endl;
+        os << "Cast of:" << std::endl << std::string( indent+2, ' ' );
         arg->print(os, indent+2);
         os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl;
@@ -320 +320 @@
 
 void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Member Expression, with field: " << get_member();
+        os << "Untyped Member Expression, with field: " << get_member();
 
         Expression *agg = get_aggregate();
         os << std::string( indent, ' ' ) << "from aggregate: ";
-        if (agg != 0) agg->print(os, indent + 2);
+        if (agg != 0) {
+                os << std::string( indent+2, ' ' );
+                agg->print(os, indent + 2);
+        }
+        os << std::string( indent+2, ' ' );
         Expression::print( os, indent );
 }
@@ -347 +351 @@
 
 void MemberExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Member Expression, with field: " << std::endl;
+        os << "Member Expression, with field: " << std::endl;
 
         assert( member );
@@ -356 +360 @@
         Expression *agg = get_aggregate();
         os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
-        if (agg != 0) agg->print(os, indent + 2);
+        if (agg != 0) {
+                os << std::string( indent+2, ' ' );
+                agg->print(os, indent + 2);
+        }
+        os << std::string( indent+2, ' ' );
         Expression::print( os, indent );
 }
@@ -374 +382 @@
 
 void UntypedExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Applying untyped: " << std::endl;
+        os << "Applying untyped: " << std::endl;
+        os << std::string( indent, ' ' );
         function->print(os, indent + 4);
         os << std::string( indent, ' ' ) << "...to: " << std::endl;
+        os << std::string( indent, ' ' );
         printArgs(os, indent + 4);
         Expression::print( os, indent );
@@ -395 +405 @@
 
 void NameExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Name: " << get_name() << std::endl;
+        os << "Name: " << get_name() << std::endl;
         Expression::print( os, indent );
 }