Changeset 7cc6bd6


Ignore:
Timestamp:
May 4, 2016, 12:18:56 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:
a1d6d80
Parents:
2e3a379 (diff), 9243a501 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'fix-tree-printing' into ctor

Conflicts:

src/SynTree/Expression.cc
src/SynTree/ObjectDecl.cc

Location:
src/SynTree
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/SynTree/Expression.cc

    r2e3a379 r7cc6bd6  
    1010// Created On       : Mon May 18 07:44:20 2015
    1111// Last Modified By : Rob Schluntz
    12 // Last Modified On : Wed Apr 27 17:07:19 2016
     12// Last Modified On : Wed May 04 12:17:51 2016
    1313// Update Count     : 40
    1414//
     
    323323
    324324        Expression *agg = get_aggregate();
    325         os << std::string( indent, ' ' ) << "from aggregate: ";
     325        os << ", from aggregate: ";
    326326        if (agg != 0) {
    327                 os << std::string( indent+2, ' ' );
    328327                agg->print(os, indent + 2);
    329328        }
     
    361360        os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
    362361        if (agg != 0) {
    363                 os << std::string( indent+2, ' ' );
    364362                agg->print(os, indent + 2);
    365363        }
  • src/SynTree/FunctionDecl.cc

    r2e3a379 r7cc6bd6  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // FunctionDecl.cc -- 
     7// FunctionDecl.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 Jul 13 18:11:44 2015
     11// Last Modified By : Rob Schluntz
     12// Last Modified On : Tue May 03 15:37:43 2016
    1313// Update Count     : 19
    1414//
     
    5252        using std::endl;
    5353        using std::string;
    54        
     54
    5555        if ( get_name() != "" ) {
    5656                os << get_name() << ": ";
     
    8787        if ( statements ) {
    8888                os << string( indent + 2, ' ' ) << "with body " << endl;
     89                os << string( indent + 4, ' ' );
    8990                statements->print( os, indent + 4 );
    9091        } // if
     
    9495        using std::endl;
    9596        using std::string;
    96        
     97
    9798        if ( get_name() != "" ) {
    9899                os << get_name() << ": ";
  • src/SynTree/ObjectDecl.cc

    r2e3a379 r7cc6bd6  
    1010// Created On       : Mon May 18 07:44:20 2015
    1111// Last Modified By : Rob Schluntz
    12 // Last Modified On : Tue Apr 26 12:56:27 2016
     12// Last Modified On : Wed May 04 12:18:28 2016
    1313// Update Count     : 30
    1414//
     
    5757
    5858        if ( init ) {
     59                os << std::string(indent, ' ');
    5960                os << " with initializer ";
    6061                init->print( os, indent );
     
    6364
    6465        if ( bitfieldWidth ) {
     66                os << std::string(indent, ' ');
    6567                os << " with bitfield width ";
    6668                bitfieldWidth->print( os );
Note: See TracChangeset for help on using the changeset viewer.