Changeset 60089f4


Ignore:
Timestamp:
May 2, 2016, 3:12:59 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
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, with_gc
Children:
9243a501, d7903b1
Parents:
89231bc
Message:

fix printing in CommaExpr?, CompoundStmt?, ForStmt?, etc.

Location:
src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src/Common/utility.h

    r89231bc r60089f4  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // utility.h -- 
     7// utility.h --
    88//
    99// Author           : Richard C. Bilson
    1010// Created On       : Mon May 18 07:44:20 2015
    11 // Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jul  2 18:04:41 2015
     11// Last Modified By : Rob Schluntz
     12// Last Modified On : Thu Apr 28 13:18:24 2016
    1313// Update Count     : 16
    1414//
     
    6262                        os << std::string( indent,  ' ' );
    6363                        (*i)->print( os, indent + 2 );
     64                        // need an endl after each element because it's not easy to know when each individual item should end
    6465                        os << std::endl;
    6566                } // if
     
    128129}
    129130
    130 template < typename T > 
     131template < typename T >
    131132std::string toString ( T value ) {
    132133        std::ostringstream os;
  • src/SynTree/CommaExpr.cc

    r89231bc r60089f4  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // CommaExpr.cc -- 
     7// CommaExpr.cc --
    88//
    99// Author           : Richard C. Bilson
    1010// Created On       : Mon May 18 07:44:20 2015
    11 // Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon May 18 08:09:58 2015
     11// Last Modified By : Rob Schluntz
     12// Last Modified On : Mon May 02 15:11:29 2016
    1313// Update Count     : 1
    1414//
     
    2020CommaExpr::CommaExpr( Expression *arg1, Expression *arg2, Expression *_aname )
    2121                : Expression( _aname ), arg1( arg1 ), arg2( arg2 ) {
     22        // xxx - result of a comma expression is never an lvalue, so should set lvalue
     23        // to false on all result types. Actually doing this causes some strange things
     24        // to happen in later passes (particularly, Specialize, Lvalue, and Box). This needs to be looked into.
    2225        cloneAll( arg2->get_results(), get_results() );
     26        // for ( Type *& type : get_results() ) {
     27        //      type->set_isLvalue( false );
     28        // }
    2329}
    2430
     
    3339
    3440void CommaExpr::print( std::ostream &os, int indent ) const {
    35         os << std::string( indent, ' ' ) << "Comma Expression:" << std::endl;
     41        os << "Comma Expression:" << std::endl;
     42        os << std::string( indent+2, ' ' );
    3643        arg1->print( os, indent+2 );
    3744        os << std::endl;
     45        os << std::string( indent+2, ' ' );
    3846        arg2->print( os, indent+2 );
    3947        Expression::print( os, indent );
  • src/SynTree/CompoundStmt.cc

    r89231bc r60089f4  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // XXX.cc -- 
     7// XXX.cc --
    88//
    99// Author           : Richard C. Bilson
    1010// Created On       : Mon May 18 07:44:20 2015
    11 // Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Jun 23 11:37:49 2015
     11// Last Modified By : Rob Schluntz
     12// Last Modified On : Mon May 02 15:10:47 2016
    1313// Update Count     : 3
    1414//
     
    3434
    3535void CompoundStmt::print( std::ostream &os, int indent ) const {
    36         os << string( indent, ' ' ) << "CompoundStmt" << endl ;
     36        os << "CompoundStmt" << endl ;
    3737        printAll( kids, os, indent + 2 );
    3838}
  • src/SynTree/Expression.cc

    r89231bc r60089f4  
    7272
    7373void ConstantExpr::print( std::ostream &os, int indent ) const {
    74         os << std::string( indent, ' ' ) << "constant expression " ;
     74        os << "constant expression " ;
    7575        constant.print( os );
    7676        Expression::print( os, indent );
     
    381381void UntypedExpr::print( std::ostream &os, int indent ) const {
    382382        os << "Applying untyped: " << std::endl;
    383         os << std::string( indent, ' ' );
     383        os << std::string( indent+4, ' ' );
    384384        function->print(os, indent + 4);
    385385        os << std::string( indent, ' ' ) << "...to: " << std::endl;
    386         os << std::string( indent, ' ' );
    387         printArgs(os, indent + 4);
     386        printAll(args, os, indent + 4);
    388387        Expression::print( os, indent );
    389388}
     
    391390void UntypedExpr::printArgs( std::ostream &os, int indent ) const {
    392391        std::list<Expression *>::const_iterator i;
    393         for (i = args.begin(); i != args.end(); i++)
     392        for (i = args.begin(); i != args.end(); i++) {
     393                os << std::string(indent, ' ' );
    394394                (*i)->print(os, indent);
     395        }
    395396}
    396397
  • src/SynTree/Initializer.cc

    r89231bc r60089f4  
    4444void SingleInit::print( std::ostream &os, int indent ) {
    4545        os << std::endl << std::string(indent, ' ' ) << "Simple Initializer: " << std::endl;
     46        os << std::string(indent+4, ' ' );
    4647        value->print( os, indent+4 );
    4748
  • src/SynTree/Statement.cc

    r89231bc r60089f4  
    1010// Created On       : Mon May 18 07:44:20 2015
    1111// Last Modified By : Rob Schluntz
    12 // Last Modified On : Tue Apr 26 12:33:33 2016
     12// Last Modified On : Thu Apr 28 13:34:32 2016
    1313// Update Count     : 54
    1414//
     
    128128void IfStmt::print( std::ostream &os, int indent ) const {
    129129        os << "If on condition: " << endl ;
     130        os << string( indent+4, ' ' );
    130131        condition->print( os, indent + 4 );
    131132
    132         os << string( indent, ' ' ) << ".... and branches: " << endl;
    133 
     133        os << string( indent+2, ' ' ) << "... then: " << endl;
     134
     135        os << string( indent+4, ' ' );
    134136        thenPart->print( os, indent + 4 );
    135137
    136138        if ( elsePart != 0 ) {
     139                os << string( indent+2, ' ' ) << "... else: " << endl;
     140                os << string( indent+4, ' ' );
    137141                elsePart->print( os, indent + 4 );
    138142        } // if
Note: See TracChangeset for help on using the changeset viewer.