Ignore:
Timestamp:
May 4, 2016, 12:18:56 PM (8 years ago)
Author:
Rob Schluntz <rschlunt@…>
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, 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

File:
1 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        }
Note: See TracChangeset for help on using the changeset viewer.