Changeset 44b5ca0 for src/SynTree/Expression.cc

Timestamp:

Jun 5, 2015, 8:12:32 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, string, with_gc

Children:

a65d92e

Parents:

cf0941d

Message:

remove all carriage returns from printing, work on regression testing

File:

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

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  4 21:42:55 2015
-// Update Count     : 10
+// Last Modified On : Fri Jun  5 07:51:09 2015
+// Update Count     : 11
 //
 
@@ -93 +93 @@
 
 void VariableExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Variable Expression: ";
+        os << std::string( indent, ' ' ) << "Variable Expression: ";
 
         Declaration *decl = get_var();
@@ -122 +122 @@
 
 void SizeofExpr::print( std::ostream &os, int indent) const {
-        os << std::string(indent, ' ') << "Sizeof Expression on: ";
+        os << std::string( indent, ' ' ) << "Sizeof Expression on: ";
 
         if (isType)
@@ -152 +152 @@
 
 void AttrExpr::print( std::ostream &os, int indent) const {
-        os << std::string(indent, ' ') << "Attr ";
+        os << std::string( indent, ' ' ) << "Attr ";
         attr->print( os, indent + 2 );
         if ( isType || expr ) {
@@ -184 +184 @@
 
 void CastExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Cast of:" << std::endl;
+        os << std::string( indent, ' ' ) << "Cast of:" << std::endl;
         arg->print(os, indent+2);
-        os << std::endl << std::string(indent, ' ') << "to:" << std::endl;
+        os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl;
         if ( results.empty() ) {
-                os << std::string(indent+2, ' ') << "nothing" << std::endl;
+                os << std::string( indent+2, ' ' ) << "nothing" << std::endl;
         } else {
                 printAll(results, os, indent+2);
@@ -207 +207 @@
 
 void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Member Expression, with field: " << get_member();
+        os << std::string( indent, ' ' ) << "Member Expression, with field: " << get_member();
 
         Expression *agg = get_aggregate();
-        os << std::string(indent, ' ') << "from aggregate: ";
+        os << std::string( indent, ' ' ) << "from aggregate: ";
         if (agg != 0) agg->print(os, indent + 2);
         Expression::print( os, indent );
@@ -234 +234 @@
 
 void MemberExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Member Expression, with field: " << std::endl;
+        os << std::string( indent, ' ' ) << "Member Expression, with field: " << std::endl;
 
         assert( member );
-        os << std::string(indent + 2, ' ');
+        os << std::string( indent + 2, ' ' );
         member->print( os, indent + 2 );
         os << std::endl;
 
         Expression *agg = get_aggregate();
-        os << std::string(indent, ' ') << "from aggregate: " << std::endl;
+        os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
         if (agg != 0) agg->print(os, indent + 2);
         Expression::print( os, indent );
@@ -261 +261 @@
 
 void UntypedExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Applying untyped: " << std::endl;
+        os << std::string( indent, ' ' ) << "Applying untyped: " << std::endl;
         function->print(os, indent + 4);
-        os << "\r" << std::string(indent, ' ') << "...to: " << std::endl;
+        os << std::string( indent, ' ' ) << "...to: " << std::endl;
         printArgs(os, indent + 4);
         Expression::print( os, indent );
@@ -282 +282 @@
 
 void NameExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Name: " << get_name() << std::endl;
+        os << std::string( indent, ' ' ) << "Name: " << get_name() << std::endl;
         Expression::print( os, indent );
 }
@@ -301 +301 @@
 
 void LogicalExpr::print( std::ostream &os, int indent )const {
-        os << std::string(indent, ' ') << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
+        os << std::string( indent, ' ' ) << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
         arg1->print(os);
         os << " and ";
@@ -323 +323 @@
 
 void ConditionalExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Conditional expression on: " << std::endl;
+        os << std::string( indent, ' ' ) << "Conditional expression on: " << std::endl;
         arg1->print( os, indent+2 );
-        os << std::string(indent, ' ') << "First alternative:" << std::endl;
+        os << std::string( indent, ' ' ) << "First alternative:" << std::endl;
         arg2->print( os, indent+2 );
-        os << std::string(indent, ' ') << "Second alternative:" << std::endl;
+        os << std::string( indent, ' ' ) << "Second alternative:" << std::endl;
         arg3->print( os, indent+2 );
         os << std::endl;
@@ -334 +334 @@
 
 void UntypedValofExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Valof Expression: " << std::endl;
+        os << std::string( indent, ' ' ) << "Valof Expression: " << std::endl;
         if ( get_body() != 0 )
                 get_body()->print( os, indent + 2 );