Changeset d7903b1

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

Location:

src

Files:

• Common/utility.h (modified) (3 diffs)
• SynTree/CommaExpr.cc (modified) (3 diffs)
• SynTree/CompoundStmt.cc (modified) (2 diffs)
• SynTree/Expression.cc (modified) (3 diffs)
• SynTree/Initializer.cc (modified) (1 diff)
• SynTree/Statement.cc (modified) (2 diffs)

src/Common/utility.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// utility.h -- 
+// utility.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  2 18:04:41 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Apr 28 13:18:24 2016
 // Update Count     : 16
 //
@@ -62 +62 @@
                         os << std::string( indent,  ' ' );
                         (*i)->print( os, indent + 2 );
+                        // need an endl after each element because it's not easy to know when each individual item should end
                         os << std::endl;
                 } // if
@@ -128 +129 @@
 }
 
-template < typename T > 
+template < typename T >
 std::string toString ( T value ) {
         std::ostringstream os;

src/SynTree/CommaExpr.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 06 17:07:54 2016
+// Last Modified On : Mon May 02 15:19:44 2016
 // Update Count     : 1
 //
@@ -21 +21 @@
                 : Expression( _aname ), arg1( arg1 ), arg2( arg2 ) {
         // xxx - result of a comma expression is never an lvalue, so should set lvalue
-        // to false on all result types
+        // to false on all result types. Actually doing this causes some strange things
+        // to happen in later passes (particularly, Specialize, Lvalue, and Box). This needs to be looked into.
         cloneAll( arg2->get_results(), get_results() );
+        // for ( Type *& type : get_results() ) {
+        //      type->set_isLvalue( false );
+        // }
 }
 
@@ -35 +39 @@
 
 void CommaExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Comma Expression:" << std::endl;
+        os << "Comma Expression:" << std::endl;
+        os << std::string( indent+2, ' ' );
         arg1->print( os, indent+2 );
         os << std::endl;
+        os << std::string( indent+2, ' ' );
         arg2->print( os, indent+2 );
         Expression::print( os, indent );

src/SynTree/CompoundStmt.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 06 14:35:37 2016
+// Last Modified On : Mon May 02 15:19:17 2016
 // Update Count     : 3
 //
@@ -84 +84 @@
 
 void CompoundStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "CompoundStmt" << endl ;
+        os << "CompoundStmt" << endl ;
         printAll( kids, os, indent + 2 );
 }

src/SynTree/Expression.cc

@@ -72 +72 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "constant expression " ;
+        os << "constant expression " ;
         constant.print( os );
         Expression::print( os, indent );
@@ -383 +383 @@
 void UntypedExpr::print( std::ostream &os, int indent ) const {
         os << "Applying untyped: " << std::endl;
-        os << std::string( indent, ' ' );
+        os << std::string( indent+4, ' ' );
         function->print(os, indent + 4);
         os << std::string( indent, ' ' ) << "...to: " << std::endl;
-        os << std::string( indent, ' ' );
-        printArgs(os, indent + 4);
+        printAll(args, os, indent + 4);
         Expression::print( os, indent );
 }
@@ -393 +392 @@
 void UntypedExpr::printArgs( std::ostream &os, int indent ) const {
         std::list<Expression *>::const_iterator i;
-        for (i = args.begin(); i != args.end(); i++)
+        for (i = args.begin(); i != args.end(); i++) {
+                os << std::string(indent, ' ' );
                 (*i)->print(os, indent);
+        }
 }
 

src/SynTree/Initializer.cc

@@ -45 +45 @@
 void SingleInit::print( std::ostream &os, int indent ) {
         os << std::endl << std::string(indent, ' ' ) << "Simple Initializer: " << std::endl;
+        os << std::string(indent+4, ' ' );
         value->print( os, indent+4 );
 

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