Changeset 44b5ca0


Ignore:
Timestamp:
Jun 5, 2015, 8:12:32 AM (7 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, 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, resolv-new, string, with_gc
Children:
a65d92e
Parents:
cf0941d
Message:

remove all carriage returns from printing, work on regression testing

Location:
src
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/ExpressionNode.cc

    rcf0941d r44b5ca0  
    1010// Created On       : Sat May 16 13:17:07 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jun  4 21:40:22 2015
    13 // Update Count     : 9
     12// Last Modified On : Fri Jun  5 07:44:47 2015
     13// Update Count     : 10
    1414//
    1515
     
    250250void VarRefNode::print( std::ostream &os, int indent ) const {
    251251        printDesignation( os );
    252         os << '\r' << string( indent, ' ') << "Referencing: ";
     252        os << string( indent, ' ' ) << "Referencing: ";
    253253        os << "Variable: " << get_name();
    254254        os << endl;
     
    273273void OperatorNode::print( std::ostream &os, int indent ) const{
    274274        printDesignation( os );
    275         os << '\r' << string( indent, ' ') << "Operator: " << OpName[type] << endl;
     275        os << string( indent, ' ' ) << "Operator: " << OpName[type] << endl;
    276276        return;
    277277}
     
    550550void CompositeExprNode::print( std::ostream &os, int indent ) const {
    551551        printDesignation( os );
    552         os << '\r' << string( indent, ' ') << "Application of: " << endl;
     552        os << string( indent, ' ' ) << "Application of: " << endl;
    553553        function->print( os, indent + ParseNode::indent_by );
    554554
    555         os << '\r' << string( indent, ' ') ;
     555        os << string( indent, ' ' ) ;
    556556        if ( arguments ) {
    557557                os << "... on arguments: " << endl;
  • src/Parser/StatementNode.cc

    rcf0941d r44b5ca0  
    1010// Created On       : Sat May 16 14:59:41 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Jun  3 11:55:01 2015
    13 // Update Count     : 8
     12// Last Modified On : Fri Jun  5 07:43:40 2015
     13// Update Count     : 10
    1414//
    1515
     
    4949                                next->set_next( new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) ) );
    5050                                decl->set_next( 0 );
    51                         }
     51                        } // if
    5252                } else {
    5353                        if ( decl->get_link() ) {
    5454                                next = new StatementNode( dynamic_cast< DeclarationNode* >( decl->get_link() ) );
    5555                                decl->set_next( 0 );
    56                         }
     56                        } // if
    5757                        this->decl = decl;
    58                 }
    59         }
     58                } // if
     59        } // if
    6060}
    6161
     
    9898        } else {
    9999                newnode->target = 0;
    100         }
     100        } // if
    101101        newnode->decl = maybeClone( decl );
    102102        return newnode;
     
    132132                labels->push_front(*l );
    133133                delete l;
    134         }
     134        } // if
    135135        return this;
    136136}
     
    151151                else
    152152                        block->set_link( stmt );
    153         }
     153        } // if
    154154        return this;
    155155}
     
    165165                        else
    166166                                block->set_link( stmt );
    167         }
     167        } // if
    168168        return this;
    169169}
    170170
    171171void StatementNode::print( std::ostream &os, int indent ) const {
    172         if ( labels != 0 )
     172        if ( labels != 0 ) {
    173173                if ( ! labels->empty()) {
    174174                        std::list<std::string>::const_iterator i;
    175175
    176                         os << '\r' << string( indent, ' ');
     176                        os << string( indent, ' ' );
    177177                        for ( i = labels->begin(); i != labels->end(); i++ )
    178178                                os << *i << ":";
    179179                        os << endl;
    180                 }
     180                } // if
     181        } // if
    181182
    182183        switch ( type ) {
     
    193194                break;
    194195          default:
    195                 os << '\r' << string( indent, ' ') << StatementNode::StType[type] << endl;
     196                os << string( indent, ' ' ) << StatementNode::StType[type] << endl;
    196197                if ( type == Catch ) {
    197198                        if ( decl ) {
    198                                 os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
     199                                os << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
    199200                                decl->print( os, indent + 2*ParseNode::indent_by );
    200201                        } else if ( isCatchRest ) {
    201                                 os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
     202                                os << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
    202203                        } else {
    203204                                ; // should never reach here
    204                         }
    205                 }
     205                        } // if
     206                } // if
    206207                if ( control ) {
    207                         os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Expression: " << endl;
     208                        os << string( indent + ParseNode::indent_by, ' ' ) << "Expression: " << endl;
    208209                        control->printList( os, indent + 2*ParseNode::indent_by );
    209                 }
     210                } // if
    210211                if ( block ) {
    211                         os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
     212                        os << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
    212213                        block->printList( os, indent + 2*ParseNode::indent_by ); 
    213                 }
     214                } // if
    214215                if ( target ) {
    215                         os << '\r' << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl;
    216                 }
     216                        os << string( indent + ParseNode::indent_by, ' ' ) << "Target: " << get_target() << endl;
     217                } // if
    217218                break;
    218         }
     219        } // switch
    219220}
    220221
     
    227228                std::back_insert_iterator< std::list<Label> > lab_it( labs );
    228229                copy( labels->begin(), labels->end(), lab_it );
    229         }
     230        } // if
    230231
    231232        // try {
     
    254255                                elseb = branches.front();
    255256                                branches.pop_front();
    256                         }
     257                        } // if
    257258                        return new IfStmt( labs, notZeroExpr( get_control()->build() ), thenb, elseb );
    258259                }
     
    299300                                assert( get_control() != 0 );
    300301                                return new BranchStmt( labs, get_control()->build(), BranchStmt::Goto );
    301                         }
     302                        } // if
    302303
    303304                        return new BranchStmt( labs, get_target(), BranchStmt::Goto );
     
    322323                        if ( ( finallyBlock = dynamic_cast<FinallyStmt *>( branches.back())) ) {
    323324                                branches.pop_back();
    324                         }
     325                        } // if
    325326                        return new TryStmt( labs, tryBlock, branches, finallyBlock );
    326327                }
     
    342343                // shouldn't be here
    343344                return 0;
    344         }
     345        } // switch
    345346}
    346347
     
    356357        } else {
    357358                last = 0;
    358         }
     359        } // if
    359360}
    360361
     
    367368                last->set_link( stmt );
    368369                last = ( StatementNode *)( stmt->get_link());
    369         }
     370        } // if
    370371}
    371372
     
    373374        if ( first ) {
    374375                first->printList( os, indent+2 );
    375         }
     376        } // if
    376377}
    377378
     
    383384                std::back_insert_iterator< std::list<Label> > lab_it( labs );
    384385                copy( labels->begin(), labels->end(), lab_it );
    385         }
     386        } // if
    386387
    387388        CompoundStmt *cs = new CompoundStmt( labs );
     
    391392
    392393void NullStmtNode::print( ostream &os, int indent ) const {
    393         os << "\r" << string( indent, ' ') << "Null Statement:" << endl;
     394        os << string( indent, ' ' ) << "Null Statement:" << endl;
    394395}
    395396
  • src/SymTab/Indexer.cc

    rcf0941d r44b5ca0  
    1010// Created On       : Sun May 17 21:37:33 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue May 19 16:49:55 2015
    13 // Update Count     : 3
     12// Last Modified On : Fri Jun  5 08:05:17 2015
     13// Update Count     : 5
    1414//
    1515
     
    5151        }
    5252
    53 /********
    54  * A NOTE ON THE ORDER OF TRAVERSAL
    55  *
    56  * Types and typedefs have their base types visited before they are added to the type table.
    57  * This is ok, since there is no such thing as a recursive type or typedef.
    58  *             typedef struct { T *x; } T; // never allowed
    59  *
    60  * for structs/unions, it is possible to have recursion, so the decl should be added as if it's
    61  * incomplete to begin, the members are traversed, and then the complete type should be added
    62  * (assuming the type is completed by this particular declaration).
    63  *             struct T { struct T *x; }; // allowed
    64  *
    65  * It's important to add the complete type to the symbol table *after* the members/base has been
    66  * traversed, since that traversal may modify the definition of the type and these modifications
    67  * should be visible when the symbol table is queried later in this pass.
    68  *
    69  * TODO: figure out whether recursive contexts are sensible/possible/reasonable.
    70  */
     53
     54// A NOTE ON THE ORDER OF TRAVERSAL
     55//
     56// Types and typedefs have their base types visited before they are added to the type table.  This is ok, since there is
     57// no such thing as a recursive type or typedef.
     58//
     59//             typedef struct { T *x; } T; // never allowed
     60//
     61// for structs/unions, it is possible to have recursion, so the decl should be added as if it's incomplete to begin, the
     62// members are traversed, and then the complete type should be added (assuming the type is completed by this particular
     63// declaration).
     64//
     65//             struct T { struct T *x; }; // allowed
     66//
     67// It is important to add the complete type to the symbol table *after* the members/base has been traversed, since that
     68// traversal may modify the definition of the type and these modifications should be visible when the symbol table is
     69// queried later in this pass.
     70//
     71// TODO: figure out whether recursive contexts are sensible/possible/reasonable.
     72
    7173
    7274        void Indexer::visit( TypeDecl *typeDecl ) {
    7375                // see A NOTE ON THE ORDER OF TRAVERSAL, above
    74                 // note that assertions come after the type is added to the symtab, since they aren't part
    75                 // of the type proper and may depend on the type itself
     76                // note that assertions come after the type is added to the symtab, since they are not part of the type proper
     77                // and may depend on the type itself
    7678                enterScope();
    7779                acceptAll( typeDecl->get_parameters(), *this );
  • src/SynTree/CompoundStmt.cc

    rcf0941d r44b5ca0  
    1010// Created On       : Mon May 18 07:44:20 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon May 18 08:11:02 2015
    13 // Update Count     : 1
     12// Last Modified On : Fri Jun  5 07:46:03 2015
     13// Update Count     : 2
    1414//
    1515
     
    3434
    3535void CompoundStmt::print( std::ostream &os, int indent ) {
    36         os << "\r" << string(indent, ' ') << "CompoundStmt" << endl ;
    37         printAll( kids, os, indent+2 );
     36        os << string( indent, ' ' ) << "CompoundStmt" << endl ;
     37        printAll( kids, os, indent + 2 );
    3838}
    3939
  • src/SynTree/Expression.cc

    rcf0941d r44b5ca0  
    1010// Created On       : Mon May 18 07:44:20 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jun  4 21:42:55 2015
    13 // Update Count     : 10
     12// Last Modified On : Fri Jun  5 07:51:09 2015
     13// Update Count     : 11
    1414//
    1515
     
    9393
    9494void VariableExpr::print( std::ostream &os, int indent ) const {
    95         os << std::string(indent, ' ') << "Variable Expression: ";
     95        os << std::string( indent, ' ' ) << "Variable Expression: ";
    9696
    9797        Declaration *decl = get_var();
     
    122122
    123123void SizeofExpr::print( std::ostream &os, int indent) const {
    124         os << std::string(indent, ' ') << "Sizeof Expression on: ";
     124        os << std::string( indent, ' ' ) << "Sizeof Expression on: ";
    125125
    126126        if (isType)
     
    152152
    153153void AttrExpr::print( std::ostream &os, int indent) const {
    154         os << std::string(indent, ' ') << "Attr ";
     154        os << std::string( indent, ' ' ) << "Attr ";
    155155        attr->print( os, indent + 2 );
    156156        if ( isType || expr ) {
     
    184184
    185185void CastExpr::print( std::ostream &os, int indent ) const {
    186         os << std::string(indent, ' ') << "Cast of:" << std::endl;
     186        os << std::string( indent, ' ' ) << "Cast of:" << std::endl;
    187187        arg->print(os, indent+2);
    188         os << std::endl << std::string(indent, ' ') << "to:" << std::endl;
     188        os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl;
    189189        if ( results.empty() ) {
    190                 os << std::string(indent+2, ' ') << "nothing" << std::endl;
     190                os << std::string( indent+2, ' ' ) << "nothing" << std::endl;
    191191        } else {
    192192                printAll(results, os, indent+2);
     
    207207
    208208void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
    209         os << std::string(indent, ' ') << "Member Expression, with field: " << get_member();
     209        os << std::string( indent, ' ' ) << "Member Expression, with field: " << get_member();
    210210
    211211        Expression *agg = get_aggregate();
    212         os << std::string(indent, ' ') << "from aggregate: ";
     212        os << std::string( indent, ' ' ) << "from aggregate: ";
    213213        if (agg != 0) agg->print(os, indent + 2);
    214214        Expression::print( os, indent );
     
    234234
    235235void MemberExpr::print( std::ostream &os, int indent ) const {
    236         os << std::string(indent, ' ') << "Member Expression, with field: " << std::endl;
     236        os << std::string( indent, ' ' ) << "Member Expression, with field: " << std::endl;
    237237
    238238        assert( member );
    239         os << std::string(indent + 2, ' ');
     239        os << std::string( indent + 2, ' ' );
    240240        member->print( os, indent + 2 );
    241241        os << std::endl;
    242242
    243243        Expression *agg = get_aggregate();
    244         os << std::string(indent, ' ') << "from aggregate: " << std::endl;
     244        os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
    245245        if (agg != 0) agg->print(os, indent + 2);
    246246        Expression::print( os, indent );
     
    261261
    262262void UntypedExpr::print( std::ostream &os, int indent ) const {
    263         os << std::string(indent, ' ') << "Applying untyped: " << std::endl;
     263        os << std::string( indent, ' ' ) << "Applying untyped: " << std::endl;
    264264        function->print(os, indent + 4);
    265         os << "\r" << std::string(indent, ' ') << "...to: " << std::endl;
     265        os << std::string( indent, ' ' ) << "...to: " << std::endl;
    266266        printArgs(os, indent + 4);
    267267        Expression::print( os, indent );
     
    282282
    283283void NameExpr::print( std::ostream &os, int indent ) const {
    284         os << std::string(indent, ' ') << "Name: " << get_name() << std::endl;
     284        os << std::string( indent, ' ' ) << "Name: " << get_name() << std::endl;
    285285        Expression::print( os, indent );
    286286}
     
    301301
    302302void LogicalExpr::print( std::ostream &os, int indent )const {
    303         os << std::string(indent, ' ') << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
     303        os << std::string( indent, ' ' ) << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: ";
    304304        arg1->print(os);
    305305        os << " and ";
     
    323323
    324324void ConditionalExpr::print( std::ostream &os, int indent ) const {
    325         os << std::string(indent, ' ') << "Conditional expression on: " << std::endl;
     325        os << std::string( indent, ' ' ) << "Conditional expression on: " << std::endl;
    326326        arg1->print( os, indent+2 );
    327         os << std::string(indent, ' ') << "First alternative:" << std::endl;
     327        os << std::string( indent, ' ' ) << "First alternative:" << std::endl;
    328328        arg2->print( os, indent+2 );
    329         os << std::string(indent, ' ') << "Second alternative:" << std::endl;
     329        os << std::string( indent, ' ' ) << "Second alternative:" << std::endl;
    330330        arg3->print( os, indent+2 );
    331331        os << std::endl;
     
    334334
    335335void UntypedValofExpr::print( std::ostream &os, int indent ) const {
    336         os << std::string(indent, ' ') << "Valof Expression: " << std::endl;
     336        os << std::string( indent, ' ' ) << "Valof Expression: " << std::endl;
    337337        if ( get_body() != 0 )
    338338                get_body()->print( os, indent + 2 );
  • src/SynTree/Statement.cc

    rcf0941d r44b5ca0  
    99// Author           : Richard C. Bilson
    1010// Created On       : Mon May 18 07:44:20 2015
    11 // Last Modified By : Rob Schluntz
    12 // Last Modified On : Tue Jun 02 13:07:09 2015
    13 // Update Count     : 14
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Fri Jun  5 07:51:04 2015
     13// Update Count     : 15
    1414//
    1515
     
    3939
    4040void ExprStmt::print( std::ostream &os, int indent ) {
    41         os << "\r" << string(indent, ' ') << "Expression Statement:" << endl;
     41        os << string( indent, ' ' ) << "Expression Statement:" << endl;
    4242        expr->print( os, indent + 2 );
    4343}
     
    5959
    6060void BranchStmt::print( std::ostream &os, int indent ) {
    61         os << "\r" << string( indent, ' ') << "Branch (" << brType[type] << ")" << endl ;
     61        os << string( indent, ' ' ) << "Branch (" << brType[type] << ")" << endl ;
    6262}
    6363
     
    6969
    7070void ReturnStmt::print( std::ostream &os, int indent ) {
    71         os << "\r" << std::string( indent, ' ') << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
     71        os << std::string( indent, ' ' ) << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
    7272        if ( expr != 0 ) expr->print( os );
    7373        os << endl;
     
    8080
    8181void IfStmt::print( std::ostream &os, int indent ) {
    82         os << "\r" << string( indent, ' ') << "If on condition: " << endl ;
     82        os << string( indent, ' ' ) << "If on condition: " << endl ;
    8383        condition->print( os, indent + 4 );
    8484
    85         os << string( indent, ' ') << ".... and branches: " << endl;
     85        os << string( indent, ' ' ) << ".... and branches: " << endl;
    8686
    8787        thenPart->print( os, indent + 4 );
     
    104104
    105105void SwitchStmt::print( std::ostream &os, int indent ) {
    106         os << "\r" << string( indent, ' ') << "Switch on condition: ";
     106        os << string( indent, ' ' ) << "Switch on condition: ";
    107107        condition->print( os );
    108108        os << endl;
     
    131131
    132132void CaseStmt::print( std::ostream &os, int indent ) {
    133         os << "\r" << string( indent, ' ');
     133        os << string( indent, ' ' );
    134134
    135135        if ( isDefault())
     
    159159
    160160void ChooseStmt::print( std::ostream &os, int indent ) {
    161         os << "\r" << string( indent, ' ') << "Choose on condition: ";
     161        os << string( indent, ' ' ) << "Choose on condition: ";
    162162        condition->print( os );
    163163        os << endl;
     
    172172
    173173void FallthruStmt::print( std::ostream &os, int indent ) {
    174         os << "\r" << string( indent, ' ') << "Fall-through statement" << endl;
     174        os << string( indent, ' ' ) << "Fall-through statement" << endl;
    175175}
    176176
     
    184184
    185185void WhileStmt::print( std::ostream &os, int indent ) {
    186         os << "\r" << string( indent, ' ') << "While on condition: " << endl ;
     186        os << string( indent, ' ' ) << "While on condition: " << endl ;
    187187        condition->print( os, indent + 4 );
    188188
    189         os << string( indent, ' ') << ".... with body: " << endl;
     189        os << string( indent, ' ' ) << ".... with body: " << endl;
    190190
    191191        if ( body != 0 ) body->print( os, indent + 4 );
     
    204204
    205205void ForStmt::print( std::ostream &os, int indent ) {
    206         os << "\r" << string( indent, ' ') << "Labels: {";
     206        os << string( indent, ' ' ) << "Labels: {";
    207207        for (std::list<Label>::iterator it = get_labels().begin(); it != get_labels().end(); ++it) {
    208208                os << *it << ",";
     
    210210        os << "}" << endl;
    211211
    212         os << "\r" << string( indent, ' ') << "For Statement" << endl ;
    213 
    214         os << "\r" << string( indent + 2, ' ') << "initialization: \n";
     212        os << string( indent, ' ' ) << "For Statement" << endl ;
     213
     214        os << string( indent + 2, ' ' ) << "initialization: \n";
    215215        if ( initialization != 0 )
    216216                initialization->print( os, indent + 4 );
    217217
    218         os << "\n\r" << string( indent + 2, ' ') << "condition: \n";
     218        os << "\n" << string( indent + 2, ' ' ) << "condition: \n";
    219219        if ( condition != 0 )
    220220                condition->print( os, indent + 4 );
    221221
    222         os << "\n\r" << string( indent + 2, ' ') << "increment: \n";
     222        os << "\n" << string( indent + 2, ' ' ) << "increment: \n";
    223223        if ( increment != 0 )
    224224                increment->print( os, indent + 4 );
    225225
    226         os << "\n\r" << string( indent + 2, ' ') << "statement block: \n";
     226        os << "\n" << string( indent + 2, ' ' ) << "statement block: \n";
    227227        if ( body != 0 )
    228228                body->print( os, indent + 4 );
     
    246246
    247247void TryStmt::print( std::ostream &os, int indent ) {
    248         os << "\r" << string( indent, ' ') << "Try Statement" << endl;
    249         os << string( indent + 2, ' ') << "with block: " << endl;
     248        os << string( indent, ' ' ) << "Try Statement" << endl;
     249        os << string( indent + 2, ' ' ) << "with block: " << endl;
    250250        block->print( os, indent + 4 );
    251251
    252252        // handlers
    253         os << string( indent + 2, ' ') << "and handlers: " << endl;
     253        os << string( indent + 2, ' ' ) << "and handlers: " << endl;
    254254        std::list<Statement *>::iterator i;
    255255        for ( i = handlers.begin(); i != handlers.end(); i++)
     
    258258        // finally block
    259259        if ( finallyBlock != 0 ) {
    260                 os << string( indent + 2, ' ') << "Finally block: " << endl;
     260                os << string( indent + 2, ' ' ) << "Finally block: " << endl;
    261261                finallyBlock->print( os, indent + 4 );
    262262        } // if
     
    273273
    274274void CatchStmt::print( std::ostream &os, int indent ) {
    275         os << "\r" << string( indent, ' ') << "Catch Statement" << endl;
    276 
    277         os << "\r" << string( indent, ' ') << "... catching" << endl;
     275        os << string( indent, ' ' ) << "Catch Statement" << endl;
     276
     277        os << string( indent, ' ' ) << "... catching" << endl;
    278278        if ( decl ) {
    279279                decl->printShort( os, indent + 4 );
    280280                os << endl;
    281281        } else if ( catchRest )
    282                 os << "\r" << string( indent + 4 , ' ') << "the rest" << endl;
     282                os << string( indent + 4 , ' ' ) << "the rest" << endl;
    283283        else
    284                 os << "\r" << string( indent + 4 , ' ') << ">>> Error:  this catch clause must have a declaration <<<" << endl;
     284                os << string( indent + 4 , ' ' ) << ">>> Error:  this catch clause must have a declaration <<<" << endl;
    285285}
    286286
     
    295295
    296296void FinallyStmt::print( std::ostream &os, int indent ) {
    297         os << "\r" << string( indent, ' ') << "Finally Statement" << endl;
    298         os << string( indent + 2, ' ') << "with block: " << endl;
     297        os << string( indent, ' ' ) << "Finally Statement" << endl;
     298        os << string( indent + 2, ' ' ) << "with block: " << endl;
    299299        block->print( os, indent + 4 );
    300300}
     
    305305
    306306void NullStmt::print( std::ostream &os, int indent ) {
    307         os << "\r" << string( indent, ' ') << "Null Statement" << endl ;
     307        os << string( indent, ' ' ) << "Null Statement" << endl ;
    308308}
    309309
  • src/Tests/SynTree/make-rules

    rcf0941d r44b5ca0  
    88TEST_IN := $(TESTS:.tst=.c)
    99
    10 $(OUTPUTDIR)/%.tst:%.c $(CFA)
     10$(OUTPUTDIR)/%.tst : %.c $(CFA)
    1111        $(CFA) $(CFAOPT) < $< > $@ 2>&1
    1212
    13 $(OUTPUTDIR)/report: $(TESTS) $(EXPECTED)
     13$(OUTPUTDIR)/report : $(TESTS) $(EXPECTED)
    1414        rm -f $@
    1515        @for i in $(TESTS); do \
     
    1818        done
    1919
    20 clean:
     20clean :
    2121        rm -rf $(OUTPUTDIR)
  • src/examples/Makefile.am

    rcf0941d r44b5ca0  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Sun May 31 14:16:58 2015
    14 ## Update Count     : 21
     13## Last Modified On : Thu Jun  4 23:13:10 2015
     14## Update Count     : 22
    1515###############################################################################
    16 
    17 # create object files in directory with source files
    18 #AUTOMAKE_OPTIONS = subdir-objects
    1916
    2017# applies to both programs
  • src/examples/Makefile.in

    rcf0941d r44b5ca0  
    1818######################## -*- Mode: Makefile-Automake -*- ######################
    1919###############################################################################
    20 
    21 # create object files in directory with source files
    22 #AUTOMAKE_OPTIONS = subdir-objects
    2320
    2421VPATH = @srcdir@
Note: See TracChangeset for help on using the changeset viewer.