Changeset 44b5ca0 for src/Parser

Timestamp:

Jun 5, 2015, 8:12:32 AM (10 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

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (4 diffs)
• StatementNode.cc (modified) (17 diffs)

src/Parser/ExpressionNode.cc ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  4 21:40:22 2015
-// Update Count     : 9
+// Last Modified On : Fri Jun  5 07:44:47 2015
+// Update Count     : 10
 // 
 
@@ -250 +250 @@
 void VarRefNode::print( std::ostream &os, int indent ) const {
         printDesignation( os );
-        os << '\r' << string( indent, ' ') << "Referencing: ";
+        os << string( indent, ' ' ) << "Referencing: ";
         os << "Variable: " << get_name();
         os << endl;
@@ -273 +273 @@
 void OperatorNode::print( std::ostream &os, int indent ) const{
         printDesignation( os );
-        os << '\r' << string( indent, ' ') << "Operator: " << OpName[type] << endl;
+        os << string( indent, ' ' ) << "Operator: " << OpName[type] << endl;
         return;
 }
@@ -550 +550 @@
 void CompositeExprNode::print( std::ostream &os, int indent ) const {
         printDesignation( os );
-        os << '\r' << string( indent, ' ') << "Application of: " << endl;
+        os << string( indent, ' ' ) << "Application of: " << endl;
         function->print( os, indent + ParseNode::indent_by );
 
-        os << '\r' << string( indent, ' ') ;
+        os << string( indent, ' ' ) ;
         if ( arguments ) {
                 os << "... on arguments: " << endl;

src/Parser/StatementNode.cc ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  3 11:55:01 2015
-// Update Count     : 8
+// Last Modified On : Fri Jun  5 07:43:40 2015
+// Update Count     : 10
 //
 
@@ -49 +49 @@
                                 next->set_next( new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) ) );
                                 decl->set_next( 0 );
-                        }
+                        } // if
                 } else {
                         if ( decl->get_link() ) {
                                 next = new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) );
                                 decl->set_next( 0 );
-                        }
+                        } // if
                         this->decl = decl;
-                }
-        }
+                } // if
+        } // if
 }
 
@@ -98 +98 @@
         } else {
                 newnode->target = 0;
-        }
+        } // if
         newnode->decl = maybeClone( decl );
         return newnode;
@@ -132 +132 @@
                 labels->push_front(*l ); 
                 delete l;
-        }
+        } // if
         return this;
 }
@@ -151 +151 @@
                 else
                         block->set_link( stmt );
-        }
+        } // if
         return this;
 }
@@ -165 +165 @@
                         else
                                 block->set_link( stmt );
-        }
+        } // if
         return this;
 }
 
 void StatementNode::print( std::ostream &os, int indent ) const {
-        if ( labels != 0 )
+        if ( labels != 0 ) {
                 if ( ! labels->empty()) {
                         std::list<std::string>::const_iterator i;
 
-                        os << '\r' << string( indent, ' ');
+                        os << string( indent, ' ' );
                         for ( i = labels->begin(); i != labels->end(); i++ )
                                 os << *i << ":";
                         os << endl;
-                }
+                } // if
+        } // if
 
         switch ( type ) {
@@ -193 +194 @@
                 break;
           default:
-                os << '\r' << string( indent, ' ') << StatementNode::StType[type] << endl;
+                os << string( indent, ' ' ) << StatementNode::StType[type] << endl;
                 if ( type == Catch ) {
                         if ( decl ) {
-                                os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
+                                os << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
                                 decl->print( os, indent + 2*ParseNode::indent_by );
                         } else if ( isCatchRest ) {
-                                os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
+                                os << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
                         } else {
                                 ; // should never reach here
-                        }
-                }
+                        } // if
+                } // if
                 if ( control ) {
-                        os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Expression: " << endl;
+                        os << string( indent + ParseNode::indent_by, ' ' ) << "Expression: " << endl;
                         control->printList( os, indent + 2*ParseNode::indent_by );
-                }
+                } // if
                 if ( block ) {
-                        os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
+                        os << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
                         block->printList( os, indent + 2*ParseNode::indent_by );  
-                }
+                } // if
                 if ( target ) {
-                        os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl;
-                }
+                        os << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl;
+                } // if
                 break;
-        }
+        } // switch
 }
 
@@ -227 +228 @@
                 std::back_insert_iterator< std::list<Label> > lab_it( labs );
                 copy( labels->begin(), labels->end(), lab_it );
-        }
+        } // if
 
         // try {
@@ -254 +255 @@
                                 elseb = branches.front();
                                 branches.pop_front();
-                        }
+                        } // if
                         return new IfStmt( labs, notZeroExpr( get_control()->build() ), thenb, elseb );
                 }
@@ -299 +300 @@
                                 assert( get_control() != 0 );
                                 return new BranchStmt( labs, get_control()->build(), BranchStmt::Goto );
-                        }
+                        } // if
 
                         return new BranchStmt( labs, get_target(), BranchStmt::Goto );
@@ -322 +323 @@
                         if ( ( finallyBlock = dynamic_cast<FinallyStmt *>( branches.back())) ) {
                                 branches.pop_back();
-                        }
+                        } // if
                         return new TryStmt( labs, tryBlock, branches, finallyBlock );
                 }
@@ -342 +343 @@
                 // shouldn't be here
                 return 0;
-        }
+        } // switch
 }
 
@@ -356 +357 @@
         } else {
                 last = 0;
-        }
+        } // if
 }
 
@@ -367 +368 @@
                 last->set_link( stmt );
                 last = ( StatementNode *)( stmt->get_link());
-        }
+        } // if
 }
 
@@ -373 +374 @@
         if ( first ) {
                 first->printList( os, indent+2 );
-        }
+        } // if
 }
 
@@ -383 +384 @@
                 std::back_insert_iterator< std::list<Label> > lab_it( labs );
                 copy( labels->begin(), labels->end(), lab_it );
-        }
+        } // if
 
         CompoundStmt *cs = new CompoundStmt( labs );
@@ -391 +392 @@
 
 void NullStmtNode::print( ostream &os, int indent ) const {
-        os << "\r" << string( indent, ' ') << "Null Statement:" << endl;
+        os << string( indent, ' ' ) << "Null Statement:" << endl;
 }