Changes in src/SynTree/Expression.cc [843054c2:5f2f2d7]

File:

• src/SynTree/Expression.cc (modified) (14 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 : Mon May 18 08:27:07 2015
-// Update Count     : 2
+// Last Modified On : Sun Jun  7 08:40:46 2015
+// Update Count     : 16
 //
 
@@ -50 +50 @@
 }
 
-void Expression::print(std::ostream &os, int indent) const {
+void Expression::print( std::ostream &os, int indent ) const {
         if ( env ) {
-                os << std::string(indent, ' ') << "with environment:" << std::endl;
+                os << std::string( indent, ' ' ) << "with environment:" << std::endl;
                 env->print( os, indent+2 );
         } // if
 
         if ( argName ) {
-                os << std::string(indent, ' ') << "with designator:";
+                os << std::string( indent, ' ' ) << "with designator:";
                 argName->print( os, indent+2 );
         } // if
@@ -72 +72 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Constant Expression: " ;
-        constant.print(os);
-        os << std::endl;
+        os << "constant expression " ;
+        constant.print( os );
         Expression::print( os, indent );
 }
@@ -93 +92 @@
 
 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 +121 @@
 
 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 +151 @@
 
 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 +183 @@
 
 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 +206 @@
 
 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 +233 @@
 
 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 +260 @@
 
 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 +281 @@
 
 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 +300 @@
 
 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 +322 @@
 
 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 +333 @@
 
 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 );