- Timestamp:
- May 4, 2016, 12:18:56 PM (8 years ago)
- 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. - Location:
- src/SynTree
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/SynTree/Expression.cc
r2e3a379 r7cc6bd6 10 10 // Created On : Mon May 18 07:44:20 2015 11 11 // Last Modified By : Rob Schluntz 12 // Last Modified On : Wed Apr 27 17:07:19201612 // Last Modified On : Wed May 04 12:17:51 2016 13 13 // Update Count : 40 14 14 // … … 323 323 324 324 Expression *agg = get_aggregate(); 325 os << std::string( indent, ' ' ) << "from aggregate: ";325 os << ", from aggregate: "; 326 326 if (agg != 0) { 327 os << std::string( indent+2, ' ' );328 327 agg->print(os, indent + 2); 329 328 } … … 361 360 os << std::string( indent, ' ' ) << "from aggregate: " << std::endl; 362 361 if (agg != 0) { 363 os << std::string( indent+2, ' ' );364 362 agg->print(os, indent + 2); 365 363 } -
src/SynTree/FunctionDecl.cc
r2e3a379 r7cc6bd6 5 5 // file "LICENCE" distributed with Cforall. 6 6 // 7 // FunctionDecl.cc -- 7 // FunctionDecl.cc -- 8 8 // 9 9 // Author : Richard C. Bilson 10 10 // Created On : Mon May 18 07:44:20 2015 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : Mon Jul 13 18:11:44 201511 // Last Modified By : Rob Schluntz 12 // Last Modified On : Tue May 03 15:37:43 2016 13 13 // Update Count : 19 14 14 // … … 52 52 using std::endl; 53 53 using std::string; 54 54 55 55 if ( get_name() != "" ) { 56 56 os << get_name() << ": "; … … 87 87 if ( statements ) { 88 88 os << string( indent + 2, ' ' ) << "with body " << endl; 89 os << string( indent + 4, ' ' ); 89 90 statements->print( os, indent + 4 ); 90 91 } // if … … 94 95 using std::endl; 95 96 using std::string; 96 97 97 98 if ( get_name() != "" ) { 98 99 os << get_name() << ": "; -
src/SynTree/ObjectDecl.cc
r2e3a379 r7cc6bd6 10 10 // Created On : Mon May 18 07:44:20 2015 11 11 // Last Modified By : Rob Schluntz 12 // Last Modified On : Tue Apr 26 12:56:27201612 // Last Modified On : Wed May 04 12:18:28 2016 13 13 // Update Count : 30 14 14 // … … 57 57 58 58 if ( init ) { 59 os << std::string(indent, ' '); 59 60 os << " with initializer "; 60 61 init->print( os, indent ); … … 63 64 64 65 if ( bitfieldWidth ) { 66 os << std::string(indent, ' '); 65 67 os << " with bitfield width "; 66 68 bitfieldWidth->print( os );
Note: See TracChangeset
for help on using the changeset viewer.