Changeset 668edd6b for src/SynTree

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

Location:

src/SynTree

Files:

• AddressExpr.cc (modified) (2 diffs)
• ApplicationExpr.cc (modified) (3 diffs)
• Expression.cc (modified) (9 diffs)
• Initializer.cc (modified) (1 diff)
• ObjectDecl.cc (modified) (1 diff)
• Statement.cc (modified) (10 diffs)

src/SynTree/AddressExpr.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// AddressExpr.cc -- 
+// AddressExpr.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 23:54:44 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:52:51 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Apr 26 12:35:13 2016
 // Update Count     : 6
 //
@@ -32 +32 @@
 
 void AddressExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Address of:" << std::endl;
+        os << "Address of:" << std::endl;
         if ( arg ) {
-                arg->print( os, indent+2 );
+                os << std::string( indent+2, ' ' );
+    arg->print( os, indent+2 );
         } // if
 }

src/SynTree/ApplicationExpr.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ApplicationExpr.cc.cc -- 
+// ApplicationExpr.cc.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 07:54:17 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Apr 26 12:41:06 2016
 // Update Count     : 4
 //
@@ -47 +47 @@
         FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() );
         assert( function );
-        
+
         for ( std::list< DeclarationWithType* >::const_iterator i = function->get_returnVals().begin(); i != function->get_returnVals().end(); ++i ) {
                 get_results().push_back( (*i)->get_type()->clone() );
@@ -64 +64 @@
 
 void ApplicationExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Application of" << std::endl;
+        os << "Application of" << std::endl << std::string(indent, ' ');
         function->print( os, indent+2 );
         if ( ! args.empty() ) {

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 );
 }

src/SynTree/Initializer.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 11 17:36:10 2016
+// Last Modified On : Tue Apr 26 12:57:34 2016
 // Update Count     : 28
 //

src/SynTree/ObjectDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Feb 09 13:21:03 2016
+// Last Modified On : Tue Apr 26 12:56:27 2016
 // Update Count     : 30
 //

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Dec 09 14:09:34 2015
+// Last Modified On : Tue Apr 26 12:33:33 2016
 // Update Count     : 54
 //
@@ -43 +43 @@
 
 void ExprStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Expression Statement:" << endl;
+        os << "Expression Statement:" << endl << std::string( indent, ' ' );
         expr->print( os, indent + 2 );
 }
@@ -110 +110 @@
 
 void ReturnStmt::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
-        if ( expr != 0 ) expr->print( os );
+        os << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
+        if ( expr != 0 ) {
+                os << endl << string( indent+2, ' ' );
+                expr->print( os, indent + 2 );
+        }
         os << endl;
 }
@@ -124 +127 @@
 
 void IfStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "If on condition: " << endl ;
+        os << "If on condition: " << endl ;
         condition->print( os, indent + 4 );
 
@@ -153 +156 @@
 
 void SwitchStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Switch on condition: ";
+        os << "Switch on condition: ";
         condition->print( os );
         os << endl;
@@ -218 +221 @@
 
 void ChooseStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Choose on condition: ";
+        os << "Choose on condition: ";
         condition->print( os );
         os << endl;
@@ -247 +250 @@
 
 void WhileStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "While on condition: " << endl ;
+        os << "While on condition: " << endl ;
         condition->print( os, indent + 4 );
 
@@ -273 +276 @@
 
 void ForStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Labels: {";
+        os << "Labels: {";
         for ( std::list<Label>::const_iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
                 os << *it << ",";
@@ -314 +317 @@
 
 void TryStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Try Statement" << endl;
+        os << "Try Statement" << endl;
         os << string( indent + 2, ' ' ) << "with block: " << endl;
         block->print( os, indent + 4 );
@@ -378 +381 @@
 
 void NullStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Null Statement" << endl ;
+        os << "Null Statement" << endl ;
 }