Index: src/CodeGen/CodeGenerator.cc =================================================================== --- src/CodeGen/CodeGenerator.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/CodeGen/CodeGenerator.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -1088,4 +1088,7 @@ } // namespace CodeGen + +unsigned Indenter::tabsize = 2; + std::ostream & operator<<( std::ostream & out, const BaseSyntaxNode * node ) { if ( node ) { Index: src/Common/Indenter.h =================================================================== --- src/Common/Indenter.h (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/Common/Indenter.h (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -18,7 +18,9 @@ struct Indenter { - Indenter( unsigned int amt = 2 ) : amt( amt ) {} - unsigned int amt = 2; // amount 1 level increases indent by (i.e. how much to increase by in operator++) - unsigned int indent = 0; + static unsigned tabsize; + + Indenter( unsigned int amt = tabsize, unsigned int indent = 0 ) : amt( amt ), indent( indent ) {} + unsigned int amt; // amount 1 level increases indent by (i.e. how much to increase by in operator++) + unsigned int indent; Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; } @@ -30,5 +32,5 @@ }; -inline std::ostream & operator<<( std::ostream & out, Indenter & indent ) { +inline std::ostream & operator<<( std::ostream & out, const Indenter & indent ) { return out << std::string(indent.indent, ' '); } Index: src/Common/utility.h =================================================================== --- src/Common/utility.h (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/Common/utility.h (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -28,4 +28,6 @@ #include +#include "Common/Indenter.h" + template< typename T > static inline T * maybeClone( const T *orig ) { @@ -75,9 +77,9 @@ template< typename Container > -void printAll( const Container &container, std::ostream &os, int indent = 0 ) { +void printAll( const Container &container, std::ostream &os, Indenter indent = {} ) { for ( typename Container::const_iterator i = container.begin(); i != container.end(); ++i ) { if ( *i ) { - os << std::string( indent, ' ' ); - (*i)->print( os, indent + 2 ); + os << indent; + (*i)->print( os, indent ); // need an endl after each element because it's not easy to know when each individual item should end os << std::endl; @@ -351,14 +353,16 @@ template< typename T1, typename T2 > struct group_iterate_t { +private: + std::tuple args; +public: group_iterate_t( bool skipBoundsCheck, const T1 & v1, const T2 & v2 ) : args(v1, v2) { assertf(skipBoundsCheck || v1.size() == v2.size(), "group iteration requires containers of the same size: <%zd, %zd>.", v1.size(), v2.size()); }; + typedef std::tuple(args).begin()), decltype(*std::get<1>(args).begin())> value_type; + typedef decltype(std::get<0>(args).begin()) T1Iter; + typedef decltype(std::get<1>(args).begin()) T2Iter; + struct iterator { - typedef typename std::remove_reference::type T1val; - typedef typename std::remove_reference::type T2val; - typedef std::tuple value_type; - typedef typename T1val::iterator T1Iter; - typedef typename T2val::iterator T2Iter; typedef std::tuple IterTuple; IterTuple it; @@ -370,9 +374,7 @@ value_type operator*() const { return std::tie( *std::get<0>(it), *std::get<1>(it) ); } }; + iterator begin() { return iterator( std::get<0>(args).begin(), std::get<1>(args).begin() ); } iterator end() { return iterator( std::get<0>(args).end(), std::get<1>(args).end() ); } - -private: - std::tuple args; }; Index: src/InitTweak/FixInit.cc =================================================================== --- src/InitTweak/FixInit.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/InitTweak/FixInit.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -552,6 +552,5 @@ Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) ); // move env from callExpr to retExpr - retExpr->set_env( callExpr->get_env() ); - callExpr->set_env( nullptr ); + std::swap( retExpr->env, callExpr->env ); return retExpr; } else { Index: src/ResolvExpr/Alternative.cc =================================================================== --- src/ResolvExpr/Alternative.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/ResolvExpr/Alternative.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -66,17 +66,17 @@ } - void Alternative::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Cost " << cost << ": "; + void Alternative::print( std::ostream &os, Indenter indent ) const { + os << "Cost " << cost << ": "; if ( expr ) { - expr->print( os, indent ); - os << "(types:" << std::endl; - os << std::string( indent+4, ' ' ); - expr->get_result()->print( os, indent + 4 ); - os << std::endl << ")" << std::endl; + expr->print( os, indent+1 ); + os << std::endl << indent << "(types:" << std::endl; + os << indent+1; + expr->result->print( os, indent+1 ); + os << std::endl << indent << ")" << std::endl; } else { os << "Null expression!" << std::endl; } // if - os << std::string( indent, ' ' ) << "Environment: "; - env.print( os, indent+2 ); + os << indent << "Environment: "; + env.print( os, indent+1 ); os << std::endl; } Index: src/ResolvExpr/Alternative.h =================================================================== --- src/ResolvExpr/Alternative.h (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/ResolvExpr/Alternative.h (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -39,5 +39,5 @@ ~Alternative(); - void print( std::ostream &os, int indent = 0 ) const; + void print( std::ostream &os, Indenter indent = {} ) const; Cost cost; Index: src/ResolvExpr/AlternativeFinder.cc =================================================================== --- src/ResolvExpr/AlternativeFinder.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/ResolvExpr/AlternativeFinder.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -75,5 +75,6 @@ namespace { - void printAlts( const AltList &list, std::ostream &os, int indent = 0 ) { + void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt = 0 ) { + Indenter indent = { Indenter::tabsize, indentAmt }; for ( AltList::const_iterator i = list.begin(); i != list.end(); ++i ) { i->print( os, indent ); @@ -195,8 +196,8 @@ AltList winners; findMinCost( alternatives.begin(), alternatives.end(), back_inserter( winners ) ); - stream << "Cannot choose between " << winners.size() << " alternatives for expression "; + stream << "Cannot choose between " << winners.size() << " alternatives for expression\n"; expr->print( stream ); - stream << "Alternatives are:"; - printAlts( winners, stream, 8 ); + stream << "Alternatives are:\n"; + printAlts( winners, stream, 1 ); throw SemanticError( stream.str() ); } @@ -728,5 +729,5 @@ PRINT( std::cerr << "known function ops:" << std::endl; - printAlts( funcOpFinder.alternatives, std::cerr, 8 ); + printAlts( funcOpFinder.alternatives, std::cerr, 1 ); ) Index: src/ResolvExpr/TypeEnvironment.cc =================================================================== --- src/ResolvExpr/TypeEnvironment.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/ResolvExpr/TypeEnvironment.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -68,11 +68,11 @@ } - void EqvClass::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "( "; + void EqvClass::print( std::ostream &os, Indenter indent ) const { + os << "( "; std::copy( vars.begin(), vars.end(), std::ostream_iterator< std::string >( os, " " ) ); os << ")"; if ( type ) { os << " -> "; - type->print( os, indent ); + type->print( os, indent+1 ); } // if if ( ! allowWidening ) { @@ -144,5 +144,5 @@ } - void TypeEnvironment::print( std::ostream &os, int indent ) const { + void TypeEnvironment::print( std::ostream &os, Indenter indent ) const { for ( std::list< EqvClass >::const_iterator i = env.begin(); i != env.end(); ++i ) { i->print( os, indent ); Index: src/ResolvExpr/TypeEnvironment.h =================================================================== --- src/ResolvExpr/TypeEnvironment.h (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/ResolvExpr/TypeEnvironment.h (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -68,5 +68,5 @@ EqvClass &operator=( const EqvClass &other ); ~EqvClass(); - void print( std::ostream &os, int indent = 0 ) const; + void print( std::ostream &os, Indenter indent = {} ) const; }; @@ -80,5 +80,5 @@ void makeSubstitution( TypeSubstitution &result ) const; bool isEmpty() const { return env.empty(); } - void print( std::ostream &os, int indent = 0 ) const; + void print( std::ostream &os, Indenter indent = {} ) const; void combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) ); void simpleCombine( const TypeEnvironment &second ); Index: src/SynTree/AddressExpr.cc =================================================================== --- src/SynTree/AddressExpr.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/AddressExpr.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -62,9 +62,9 @@ } -void AddressExpr::print( std::ostream &os, int indent ) const { +void AddressExpr::print( std::ostream &os, Indenter indent ) const { os << "Address of:" << std::endl; if ( arg ) { - os << std::string( indent+2, ' ' ); - arg->print( os, indent+2 ); + os << indent+1; + arg->print( os, indent+1 ); } // if } @@ -77,6 +77,6 @@ LabelAddressExpr::~LabelAddressExpr() {} -void LabelAddressExpr::print( std::ostream & os, int indent ) const { - os << "Address of label:" << std::endl << std::string( indent+2, ' ' ) << arg; +void LabelAddressExpr::print( std::ostream & os, Indenter ) const { + os << "Address of label:" << arg; } Index: src/SynTree/AggregateDecl.cc =================================================================== --- src/SynTree/AggregateDecl.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/AggregateDecl.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -41,38 +41,38 @@ } -void AggregateDecl::print( std::ostream &os, int indent ) const { +void AggregateDecl::print( std::ostream &os, Indenter indent ) const { using std::string; using std::endl; - os << typeString() << " " << get_name() << ":"; + os << typeString() << " " << name << ":"; if ( get_linkage() != LinkageSpec::Cforall ) { - os << " " << LinkageSpec::linkageName( get_linkage() ); + os << " " << LinkageSpec::linkageName( linkage ); } // if - os << " with body " << has_body() << endl; + os << " with body " << has_body(); if ( ! parameters.empty() ) { - os << endl << string( indent+2, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent+4 ); + os << endl << indent << "... with parameters" << endl; + printAll( parameters, os, indent+1 ); } // if if ( ! members.empty() ) { - os << endl << string( indent+2, ' ' ) << "with members" << endl; - printAll( members, os, indent+4 ); + os << endl << indent << "... with members" << endl; + printAll( members, os, indent+1 ); } // if if ( ! attributes.empty() ) { - os << endl << string( indent+2, ' ' ) << "with attributes" << endl; - printAll( attributes, os, indent+4 ); + os << endl << indent << "... with attributes" << endl; + printAll( attributes, os, indent+1 ); } // if + os << endl; } -void AggregateDecl::printShort( std::ostream &os, int indent ) const { +void AggregateDecl::printShort( std::ostream &os, Indenter indent ) const { using std::string; using std::endl; - os << typeString() << " " << get_name(); - os << string( indent+2, ' ' ) << "with body " << has_body() << endl; + os << typeString() << " " << name << " with body " << has_body() << endl; if ( ! parameters.empty() ) { - os << endl << string( indent+2, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent+4 ); + os << indent << "... with parameters" << endl; + printAll( parameters, os, indent+1 ); } // if } Index: src/SynTree/ApplicationExpr.cc =================================================================== --- src/SynTree/ApplicationExpr.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/ApplicationExpr.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -68,24 +68,25 @@ } -void printInferParams( const InferredParams & inferParams, std::ostream &os, int indent, int level ) { +void printInferParams( const InferredParams & inferParams, std::ostream &os, Indenter indent, int level ) { if ( ! inferParams.empty() ) { - os << std::string(indent, ' ') << "with inferred parameters " << level << ":" << std::endl; + os << indent << "with inferred parameters " << level << ":" << std::endl; for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) { - os << std::string(indent+2, ' '); - Declaration::declFromId( i->second.decl )->printShort( os, indent+2 ); + os << indent+1; + Declaration::declFromId( i->second.decl )->printShort( os, indent+1 ); os << std::endl; - printInferParams( *i->second.inferParams, os, indent+2, level+1 ); + printInferParams( *i->second.inferParams, os, indent+1, level+1 ); } // for } // if } -void ApplicationExpr::print( std::ostream &os, int indent ) const { - os << "Application of" << std::endl << std::string(indent+2, ' '); - function->print( os, indent+2 ); +void ApplicationExpr::print( std::ostream &os, Indenter indent ) const { + os << "Application of" << std::endl << indent+1; + function->print( os, indent+1 ); + os << std::endl; if ( ! args.empty() ) { - os << std::string( indent, ' ' ) << "to arguments" << std::endl; - printAll( args, os, indent+2 ); + os << indent << "... to arguments" << std::endl; + printAll( args, os, indent+1 ); } // if - printInferParams( inferParams, os, indent+2, 0 ); + printInferParams( inferParams, os, indent+1, 0 ); Expression::print( os, indent ); } Index: src/SynTree/ArrayType.cc =================================================================== --- src/SynTree/ArrayType.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/ArrayType.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -39,5 +39,5 @@ } -void ArrayType::print( std::ostream &os, int indent ) const { +void ArrayType::print( std::ostream &os, Indenter indent ) const { Type::print( os, indent ); if ( isStatic ) { Index: src/SynTree/AttrType.cc =================================================================== --- src/SynTree/AttrType.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/AttrType.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// AttrType.cc.cc -- +// AttrType.cc.cc -- // // Author : Richard C. Bilson @@ -42,5 +42,5 @@ } -void AttrType::print( std::ostream &os, int indent ) const { +void AttrType::print( std::ostream &os, Indenter indent ) const { Type::print( os, indent ); os << "attribute " << name << " applied to "; Index: src/SynTree/Attribute.cc =================================================================== --- src/SynTree/Attribute.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/Attribute.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -28,5 +28,5 @@ } -void Attribute::print( std::ostream &os, int indent ) const { +void Attribute::print( std::ostream &os, Indenter indent ) const { using std::endl; using std::string; @@ -36,5 +36,5 @@ if ( ! parameters.empty() ) { os << " with parameters: " << endl; - printAll( parameters, os, indent ); + printAll( parameters, os, indent+1 ); } } Index: src/SynTree/Attribute.h =================================================================== --- src/SynTree/Attribute.h (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/Attribute.h (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -46,5 +46,5 @@ virtual void accept( Visitor & v ) override { v.visit( this ); } virtual Attribute * acceptMutator( Mutator & m ) override { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const override; + virtual void print( std::ostream & os, Indenter indent = {} ) const override; }; Index: src/SynTree/BaseSyntaxNode.h =================================================================== --- src/SynTree/BaseSyntaxNode.h (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/BaseSyntaxNode.h (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -17,4 +17,5 @@ #include "Common/CodeLocation.h" +#include "Common/Indenter.h" class Visitor; class Mutator; @@ -29,5 +30,11 @@ virtual void accept( Visitor & v ) = 0; virtual BaseSyntaxNode * acceptMutator( Mutator & m ) = 0; - virtual void print( std::ostream & os, int indent = 0 ) const = 0; + /// Notes: + /// * each node is responsible for indenting its children. + /// * Expressions should not finish with a newline, since the expression's parent has better information. + virtual void print( std::ostream & os, Indenter indent = {} ) const = 0; + void print( std::ostream & os, unsigned int indent ) { + print( os, Indenter{ Indenter::tabsize, indent }); + } }; Index: src/SynTree/BasicType.cc =================================================================== --- src/SynTree/BasicType.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/BasicType.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// BasicType.cc -- +// BasicType.cc -- // // Author : Richard C. Bilson @@ -24,5 +24,5 @@ BasicType::BasicType( const Type::Qualifiers &tq, Kind bt, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), kind( bt ) {} -void BasicType::print( std::ostream &os, int indent ) const { +void BasicType::print( std::ostream &os, Indenter indent ) const { Type::print( os, indent ); os << BasicType::typeNames[ kind ]; Index: src/SynTree/CommaExpr.cc =================================================================== --- src/SynTree/CommaExpr.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/CommaExpr.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -39,11 +39,11 @@ } -void CommaExpr::print( std::ostream &os, int indent ) const { +void CommaExpr::print( std::ostream &os, Indenter indent ) const { os << "Comma Expression:" << std::endl; - os << std::string( indent+2, ' ' ); - arg1->print( os, indent+2 ); + os << (indent+1); + arg1->print( os, indent+1 ); os << std::endl; - os << std::string( indent+2, ' ' ); - arg2->print( os, indent+2 ); + os << (indent+1); + arg2->print( os, indent+1 ); Expression::print( os, indent ); } Index: src/SynTree/CompoundStmt.cc =================================================================== --- src/SynTree/CompoundStmt.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/CompoundStmt.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -73,7 +73,7 @@ } -void CompoundStmt::print( std::ostream &os, int indent ) const { - os << "CompoundStmt" << endl ; - printAll( kids, os, indent + 2 ); +void CompoundStmt::print( std::ostream &os, Indenter indent ) const { + os << "CompoundStmt" << endl; + printAll( kids, os, indent+1 ); } Index: src/SynTree/DeclStmt.cc =================================================================== --- src/SynTree/DeclStmt.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/DeclStmt.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -33,5 +33,5 @@ } -void DeclStmt::print( std::ostream &os, int indent ) const { +void DeclStmt::print( std::ostream &os, Indenter indent ) const { assert( decl != 0 ); os << "Declaration of "; Index: src/SynTree/Declaration.cc =================================================================== --- src/SynTree/Declaration.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/Declaration.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -70,9 +70,9 @@ } -void AsmDecl::print( std::ostream &os, int indent ) const { +void AsmDecl::print( std::ostream &os, Indenter indent ) const { stmt->print( os, indent ); } -void AsmDecl::printShort( std::ostream &os, int indent ) const { +void AsmDecl::printShort( std::ostream &os, Indenter indent ) const { stmt->print( os, indent ); } Index: src/SynTree/Declaration.h =================================================================== --- src/SynTree/Declaration.h (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/Declaration.h (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -64,6 +64,6 @@ virtual void accept( Visitor &v ) override = 0; virtual Declaration *acceptMutator( Mutator &m ) override = 0; - virtual void print( std::ostream &os, int indent = 0 ) const override = 0; - virtual void printShort( std::ostream &os, int indent = 0 ) const = 0; + virtual void print( std::ostream &os, Indenter indent = {} ) const override = 0; + virtual void printShort( std::ostream &os, Indenter indent = {} ) const = 0; static void dumpIds( std::ostream &os ); @@ -142,6 +142,6 @@ virtual void accept( Visitor &v ) override { v.visit( this ); } virtual DeclarationWithType *acceptMutator( Mutator &m ) override { return m.mutate( this ); } - virtual void print( std::ostream &os, int indent = 0 ) const override; - virtual void printShort( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; + virtual void printShort( std::ostream &os, Indenter indent = {} ) const override; }; @@ -170,6 +170,6 @@ virtual void accept( Visitor &v ) override { v.visit( this ); } virtual DeclarationWithType *acceptMutator( Mutator &m ) override { return m.mutate( this ); } - virtual void print( std::ostream &os, int indent = 0 ) const override; - virtual void printShort( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; + virtual void printShort( std::ostream &os, Indenter indent = {} ) const override; }; @@ -193,6 +193,6 @@ virtual NamedTypeDecl *clone() const override = 0; - virtual void print( std::ostream &os, int indent = 0 ) const override; - virtual void printShort( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; + virtual void printShort( std::ostream &os, Indenter indent = {} ) const override; }; @@ -235,5 +235,5 @@ virtual void accept( Visitor &v ) override { v.visit( this ); } virtual Declaration *acceptMutator( Mutator &m ) override { return m.mutate( this ); } - virtual void print( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; private: @@ -276,6 +276,6 @@ AggregateDecl * set_body( bool body ) { AggregateDecl::body = body; return this; } - virtual void print( std::ostream &os, int indent = 0 ) const override; - virtual void printShort( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; + virtual void printShort( std::ostream &os, Indenter indent = {} ) const override; protected: virtual std::string typeString() const = 0; @@ -355,6 +355,6 @@ virtual void accept( Visitor &v ) override { v.visit( this ); } virtual AsmDecl *acceptMutator( Mutator &m ) override { return m.mutate( this ); } - virtual void print( std::ostream &os, int indent = 0 ) const override; - virtual void printShort( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; + virtual void printShort( std::ostream &os, Indenter indent = {} ) const override; }; Index: src/SynTree/Expression.cc =================================================================== --- src/SynTree/Expression.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/Expression.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -44,17 +44,12 @@ } -void Expression::print( std::ostream &os, int indent ) const { +void Expression::print( std::ostream &os, Indenter indent ) const { if ( env ) { - os << std::string( indent, ' ' ) << "with environment:" << std::endl; - env->print( os, indent+2 ); + os << std::endl << indent << "... with environment:" << std::endl; + env->print( os, indent+1 ); } // if - if ( argName ) { - os << std::string( indent, ' ' ) << "with designator:"; - argName->print( os, indent+2 ); - } // if - if ( extension ) { - os << std::string( indent, ' ' ) << "with extension:"; + os << std::endl << indent << "... with extension:"; } // if } @@ -69,5 +64,5 @@ ConstantExpr::~ConstantExpr() {} -void ConstantExpr::print( std::ostream &os, int indent ) const { +void ConstantExpr::print( std::ostream &os, Indenter indent ) const { os << "constant expression " ; constant.print( os ); @@ -96,10 +91,7 @@ } -void VariableExpr::print( std::ostream &os, int indent ) const { +void VariableExpr::print( std::ostream &os, Indenter indent ) const { os << "Variable Expression: "; - - Declaration *decl = get_var(); - if ( decl != 0) decl->printShort(os, indent + 2); - os << std::endl; + var->printShort(os, indent); Expression::print( os, indent ); } @@ -124,13 +116,8 @@ } -void SizeofExpr::print( std::ostream &os, int indent) const { +void SizeofExpr::print( std::ostream &os, Indenter indent) const { os << "Sizeof Expression on: "; - - if (isType) - type->print(os, indent + 2); - else - expr->print(os, indent + 2); - - os << std::endl; + if (isType) type->print(os, indent+1); + else expr->print(os, indent+1); Expression::print( os, indent ); } @@ -155,18 +142,14 @@ } -void AlignofExpr::print( std::ostream &os, int indent) const { +void AlignofExpr::print( std::ostream &os, Indenter indent) const { os << "Alignof Expression on: "; - - if (isType) - type->print(os, indent + 2); - else - expr->print(os, indent + 2); - - os << std::endl; - Expression::print( os, indent ); -} - -UntypedOffsetofExpr::UntypedOffsetofExpr( Type *type_, const std::string &member_, Expression *_aname ) : - Expression( _aname ), type(type_), member(member_) { + if (isType) type->print(os, indent+1); + else expr->print(os, indent+1); + Expression::print( os, indent ); +} + +UntypedOffsetofExpr::UntypedOffsetofExpr( Type *type, const std::string &member, Expression *_aname ) : + Expression( _aname ), type(type), member(member) { + assert( type ); set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) ); } @@ -179,19 +162,14 @@ } -void UntypedOffsetofExpr::print( std::ostream &os, int indent) const { - os << std::string( indent, ' ' ) << "Untyped Offsetof Expression on member " << member << " of "; - - if ( type ) { - type->print(os, indent + 2); - } else { - os << ""; - } - - os << std::endl; - Expression::print( os, indent ); -} - -OffsetofExpr::OffsetofExpr( Type *type_, DeclarationWithType *member_, Expression *_aname ) : - Expression( _aname ), type(type_), member(member_) { +void UntypedOffsetofExpr::print( std::ostream &os, Indenter indent) const { + os << "Untyped Offsetof Expression on member " << member << " of "; + type->print(os, indent+1); + Expression::print( os, indent ); +} + +OffsetofExpr::OffsetofExpr( Type *type, DeclarationWithType *member, Expression *_aname ) : + Expression( _aname ), type(type), member(member) { + assert( member ); + assert( type ); set_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) ); } @@ -204,26 +182,12 @@ } -void OffsetofExpr::print( std::ostream &os, int indent) const { - os << std::string( indent, ' ' ) << "Offsetof Expression on member "; - - if ( member ) { - os << member->get_name(); - } else { - os << ""; - } - - os << " of "; - - if ( type ) { - type->print(os, indent + 2); - } else { - os << ""; - } - - os << std::endl; - Expression::print( os, indent ); -} - -OffsetPackExpr::OffsetPackExpr( StructInstType *type_, Expression *aname_ ) : Expression( aname_ ), type( type_ ) { +void OffsetofExpr::print( std::ostream &os, Indenter indent) const { + os << "Offsetof Expression on member " << member->name << " of "; + type->print(os, indent+1); + Expression::print( os, indent ); +} + +OffsetPackExpr::OffsetPackExpr( StructInstType *type, Expression *aname_ ) : Expression( aname_ ), type( type ) { + assert( type ); set_result( new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0, false, false ) ); } @@ -233,14 +197,7 @@ OffsetPackExpr::~OffsetPackExpr() { delete type; } -void OffsetPackExpr::print( std::ostream &os, int indent ) const { - os << std::string( indent, ' ' ) << "Offset pack expression on "; - - if ( type ) { - type->print(os, indent + 2); - } else { - os << ""; - } - - os << std::endl; +void OffsetPackExpr::print( std::ostream &os, Indenter indent ) const { + os << "Offset pack expression on "; + type->print(os, indent+1); Expression::print( os, indent ); } @@ -264,17 +221,12 @@ } -void AttrExpr::print( std::ostream &os, int indent) const { +void AttrExpr::print( std::ostream &os, Indenter indent) const { os << "Attr "; - attr->print( os, indent + 2 ); + attr->print( os, indent+1); if ( isType || expr ) { os << "applied to: "; - - if (isType) - type->print(os, indent + 2); - else - expr->print(os, indent + 2); + if (isType) type->print(os, indent+1); + else expr->print(os, indent+1); } // if - - os << std::endl; Expression::print( os, indent ); } @@ -295,15 +247,14 @@ } -void CastExpr::print( std::ostream &os, int indent ) const { - os << "Cast of:" << std::endl << std::string( indent+2, ' ' ); - arg->print(os, indent+2); - os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl; - os << std::string( indent+2, ' ' ); +void CastExpr::print( std::ostream &os, Indenter indent ) const { + os << "Cast of:" << std::endl << indent+1; + arg->print(os, indent+1); + os << std::endl << indent << "... to:"; if ( result->isVoid() ) { - os << "nothing"; + os << " nothing"; } else { - result->print( os, indent+2 ); + os << std::endl << indent+1; + result->print( os, indent+1 ); } // if - os << std::endl; Expression::print( os, indent ); } @@ -320,20 +271,21 @@ } -void VirtualCastExpr::print( std::ostream &os, int indent ) const { - os << "Virtual Cast of:" << std::endl << std::string( indent+2, ' ' ); - arg->print(os, indent+2); - os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl; - os << std::string( indent+2, ' ' ); +void VirtualCastExpr::print( std::ostream &os, Indenter indent ) const { + os << "Virtual Cast of:" << std::endl << indent+1; + arg->print(os, indent+1); + os << std::endl << indent << "... to:"; if ( ! result ) { - os << "unknown"; + os << " unknown"; } else { - result->print( os, indent+2 ); + os << std::endl << indent+1; + result->print( os, indent+1 ); } // if - os << std::endl; - Expression::print( os, indent ); -} - -UntypedMemberExpr::UntypedMemberExpr( Expression * _member, Expression *_aggregate, Expression *_aname ) : - Expression( _aname ), member(_member), aggregate(_aggregate) {} + Expression::print( os, indent ); +} + +UntypedMemberExpr::UntypedMemberExpr( Expression * member, Expression *aggregate, Expression *_aname ) : + Expression( _aname ), member(member), aggregate(aggregate) { + assert( aggregate ); +} UntypedMemberExpr::UntypedMemberExpr( const UntypedMemberExpr &other ) : @@ -346,17 +298,9 @@ } -void UntypedMemberExpr::print( std::ostream &os, int indent ) const { - os << "Untyped Member Expression, with field: " << std::endl; - os << std::string( indent+2, ' ' ); - get_member()->print(os, indent+4); - os << std::string( indent+2, ' ' ); - - Expression *agg = get_aggregate(); - os << "from aggregate: " << std::endl; - if (agg != 0) { - os << std::string( indent + 4, ' ' ); - agg->print(os, indent + 4); - } - os << std::string( indent+2, ' ' ); +void UntypedMemberExpr::print( std::ostream &os, Indenter indent ) const { + os << "Untyped Member Expression, with field: " << std::endl << indent+1; + member->print(os, indent+1 ); + os << indent << "... from aggregate: " << std::endl << indent+1; + aggregate->print(os, indent+1); Expression::print( os, indent ); } @@ -377,6 +321,8 @@ -MemberExpr::MemberExpr( DeclarationWithType *_member, Expression *_aggregate, Expression *_aname ) : - Expression( _aname ), member(_member), aggregate(_aggregate) { +MemberExpr::MemberExpr( DeclarationWithType *member, Expression *aggregate, Expression *_aname ) : + Expression( _aname ), member(member), aggregate(aggregate) { + assert( member ); + assert( aggregate ); TypeSubstitution sub( makeSub( aggregate->get_result() ) ); @@ -396,19 +342,10 @@ } -void MemberExpr::print( std::ostream &os, int indent ) const { +void MemberExpr::print( std::ostream &os, Indenter indent ) const { os << "Member Expression, with field: " << std::endl; - - assert( member ); - os << std::string( indent + 2, ' ' ); - member->print( os, indent + 2 ); - os << std::endl; - - Expression *agg = get_aggregate(); - os << std::string( indent, ' ' ) << "from aggregate: " << std::endl; - if (agg != 0) { - os << std::string( indent + 2, ' ' ); - agg->print(os, indent + 2); - } - os << std::string( indent+2, ' ' ); + os << indent+1; + member->print( os, indent+1 ); + os << std::endl << indent << "... from aggregate: " << std::endl << indent+1; + aggregate->print(os, indent + 1); Expression::print( os, indent ); } @@ -456,24 +393,16 @@ -void UntypedExpr::print( std::ostream &os, int indent ) const { +void UntypedExpr::print( std::ostream &os, Indenter indent ) const { os << "Applying untyped: " << std::endl; - os << std::string( indent+2, ' ' ); - function->print(os, indent + 2); - os << std::string( indent, ' ' ) << "...to: " << std::endl; - printAll(args, os, indent + 2); - Expression::print( os, indent ); -} - -void UntypedExpr::printArgs( std::ostream &os, int indent ) const { - std::list::const_iterator i; - for (i = args.begin(); i != args.end(); i++) { - os << std::string(indent, ' ' ); - (*i)->print(os, indent); - } -} - -NameExpr::NameExpr( std::string _name, Expression *_aname ) : Expression( _aname ), name(_name) { - assertf(_name != "0", "Zero is not a valid name\n"); - assertf(_name != "1", "One is not a valid name\n"); + os << indent+1; + function->print(os, indent+1); + os << std::endl << indent << "...to: " << std::endl; + printAll(args, os, indent+1); + Expression::print( os, indent ); +} + +NameExpr::NameExpr( std::string name, Expression *_aname ) : Expression( _aname ), name(name) { + assertf(name != "0", "Zero is not a valid name"); + assertf(name != "1", "One is not a valid name"); } @@ -483,6 +412,6 @@ NameExpr::~NameExpr() {} -void NameExpr::print( std::ostream &os, int indent ) const { - os << "Name: " << get_name() << std::endl; +void NameExpr::print( std::ostream &os, Indenter indent ) const { + os << "Name: " << get_name(); Expression::print( os, indent ); } @@ -502,15 +431,14 @@ } -void LogicalExpr::print( std::ostream &os, int indent )const { - os << "Short-circuited operation (" << (isAnd?"and":"or") << ") on: "; +void LogicalExpr::print( std::ostream &os, Indenter indent )const { + os << "Short-circuited operation (" << (isAnd ? "and" : "or") << ") on: "; arg1->print(os); os << " and "; arg2->print(os); - os << std::endl; - Expression::print( os, indent ); -} - -ConditionalExpr::ConditionalExpr( Expression *arg1_, Expression *arg2_, Expression *arg3_, Expression *_aname ) : - Expression( _aname ), arg1(arg1_), arg2(arg2_), arg3(arg3_) {} + Expression::print( os, indent ); +} + +ConditionalExpr::ConditionalExpr( Expression * arg1, Expression * arg2, Expression * arg3, Expression *_aname ) : + Expression( _aname ), arg1(arg1), arg2(arg2), arg3(arg3) {} ConditionalExpr::ConditionalExpr( const ConditionalExpr &other ) : @@ -524,15 +452,11 @@ } -void ConditionalExpr::print( std::ostream &os, int indent ) const { - os << "Conditional expression on: " << std::endl; - os << std::string( indent+2, ' ' ); - arg1->print( os, indent+2 ); - os << std::string( indent, ' ' ) << "First alternative:" << std::endl; - os << std::string( indent+2, ' ' ); - arg2->print( os, indent+2 ); - os << std::string( indent, ' ' ) << "Second alternative:" << std::endl; - os << std::string( indent+2, ' ' ); - arg3->print( os, indent+2 ); - os << std::endl; +void ConditionalExpr::print( std::ostream &os, Indenter indent ) const { + os << "Conditional expression on: " << std::endl << indent+1; + arg1->print( os, indent+1 ); + os << indent << "First alternative:" << std::endl << indent+1; + arg2->print( os, indent+1 ); + os << indent << "Second alternative:" << std::endl << indent+1; + arg3->print( os, indent+1 ); Expression::print( os, indent ); } @@ -541,9 +465,9 @@ -void AsmExpr::print( std::ostream &os, int indent ) const { +void AsmExpr::print( std::ostream &os, Indenter indent ) const { os << "Asm Expression: " << std::endl; - if ( inout ) inout->print( os, indent + 2 ); - if ( constraint ) constraint->print( os, indent + 2 ); - if ( operand ) operand->print( os, indent + 2 ); + if ( inout ) inout->print( os, indent+1 ); + if ( constraint ) constraint->print( os, indent+1 ); + if ( operand ) operand->print( os, indent+1 ); } @@ -551,5 +475,5 @@ ImplicitCopyCtorExpr::ImplicitCopyCtorExpr( ApplicationExpr * callExpr ) : callExpr( callExpr ) { assert( callExpr ); - assert( callExpr->has_result() ); + assert( callExpr->result ); set_result( callExpr->get_result()->clone() ); } @@ -569,13 +493,11 @@ } -void ImplicitCopyCtorExpr::print( std::ostream &os, int indent ) const { - os << "Implicit Copy Constructor Expression: " << std::endl; - assert( callExpr ); - os << std::string( indent+2, ' ' ); - callExpr->print( os, indent + 2 ); - os << std::endl << std::string( indent, ' ' ) << "with temporaries:" << std::endl; - printAll(tempDecls, os, indent+2); - os << std::endl << std::string( indent, ' ' ) << "with return temporaries:" << std::endl; - printAll(returnDecls, os, indent+2); +void ImplicitCopyCtorExpr::print( std::ostream &os, Indenter indent ) const { + os << "Implicit Copy Constructor Expression: " << std::endl << indent+1; + callExpr->print( os, indent+1 ); + os << std::endl << indent << "... with temporaries:" << std::endl; + printAll( tempDecls, os, indent+1 ); + os << std::endl << indent << "... with return temporaries:" << std::endl; + printAll( returnDecls, os, indent+1 ); Expression::print( os, indent ); } @@ -587,5 +509,5 @@ Expression * arg = InitTweak::getCallArg( callExpr, 0 ); assert( arg ); - set_result( maybeClone( arg->get_result() ) ); + set_result( maybeClone( arg->result ) ); } @@ -597,8 +519,6 @@ } -void ConstructorExpr::print( std::ostream &os, int indent ) const { - os << "Constructor Expression: " << std::endl; - assert( callExpr ); - os << std::string( indent+2, ' ' ); +void ConstructorExpr::print( std::ostream &os, Indenter indent ) const { + os << "Constructor Expression: " << std::endl << indent+1; callExpr->print( os, indent + 2 ); Expression::print( os, indent ); @@ -618,10 +538,9 @@ } -void CompoundLiteralExpr::print( std::ostream &os, int indent ) const { - os << "Compound Literal Expression: " << std::endl; - os << std::string( indent+2, ' ' ); - get_result()->print( os, indent + 2 ); - os << std::string( indent+2, ' ' ); - initializer->print( os, indent + 2 ); +void CompoundLiteralExpr::print( std::ostream &os, Indenter indent ) const { + os << "Compound Literal Expression: " << std::endl << indent+1; + result->print( os, indent+1 ); + os << indent+1; + initializer->print( os, indent+1 ); Expression::print( os, indent ); } @@ -629,5 +548,5 @@ RangeExpr::RangeExpr( Expression *low, Expression *high ) : low( low ), high( high ) {} RangeExpr::RangeExpr( const RangeExpr &other ) : Expression( other ), low( other.low->clone() ), high( other.high->clone() ) {} -void RangeExpr::print( std::ostream &os, int indent ) const { +void RangeExpr::print( std::ostream &os, Indenter indent ) const { os << "Range Expression: "; low->print( os, indent ); @@ -659,14 +578,14 @@ deleteAll( returnDecls ); } -void StmtExpr::print( std::ostream &os, int indent ) const { - os << "Statement Expression: " << std::endl << std::string( indent, ' ' ); - statements->print( os, indent+2 ); +void StmtExpr::print( std::ostream &os, Indenter indent ) const { + os << "Statement Expression: " << std::endl << indent+1; + statements->print( os, indent+1 ); if ( ! returnDecls.empty() ) { - os << std::string( indent+2, ' ' ) << "with returnDecls: "; - printAll( returnDecls, os, indent+2 ); + os << indent+1 << "... with returnDecls: "; + printAll( returnDecls, os, indent+1 ); } if ( ! dtors.empty() ) { - os << std::string( indent+2, ' ' ) << "with dtors: "; - printAll( dtors, os, indent+2 ); + os << indent+1 << "... with dtors: "; + printAll( dtors, os, indent+1 ); } Expression::print( os, indent ); @@ -690,10 +609,10 @@ delete var; } -void UniqueExpr::print( std::ostream &os, int indent ) const { - os << "Unique Expression with id:" << id << std::endl << std::string( indent+2, ' ' ); - get_expr()->print( os, indent+2 ); - if ( get_object() ) { - os << std::string( indent+2, ' ' ) << "with decl: "; - get_object()->printShort( os, indent+2 ); +void UniqueExpr::print( std::ostream &os, Indenter indent ) const { + os << "Unique Expression with id:" << id << std::endl << indent+1; + expr->print( os, indent+1 ); + if ( object ) { + os << indent << "... with decl: "; + get_object()->printShort( os, indent+1 ); } Expression::print( os, indent ); @@ -713,12 +632,12 @@ } -void UntypedInitExpr::print( std::ostream & os, int indent ) const { - os << "Untyped Init Expression" << std::endl << std::string( indent+2, ' ' ); - expr->print( os, indent+2 ); +void UntypedInitExpr::print( std::ostream & os, Indenter indent ) const { + os << "Untyped Init Expression" << std::endl << indent+1; + expr->print( os, indent+1 ); if ( ! initAlts.empty() ) { for ( const InitAlternative & alt : initAlts ) { - os << std::string( indent+2, ' ' ) << "InitAlternative: "; - alt.type->print( os, indent+2 ); - alt.designation->print( os, indent+2 ); + os << indent+1 << "InitAlternative: "; + alt.type->print( os, indent+1 ); + alt.designation->print( os, indent+1 ); } } @@ -734,9 +653,9 @@ } -void InitExpr::print( std::ostream & os, int indent ) const { - os << "Init Expression" << std::endl << std::string( indent+2, ' ' ); - expr->print( os, indent+2 ); - os << std::string( indent+2, ' ' ) << "with designation: "; - designation->print( os, indent+2 ); +void InitExpr::print( std::ostream & os, Indenter indent ) const { + os << "Init Expression" << std::endl << indent+1; + expr->print( os, indent+1 ); + os << indent+1 << "... with designation: "; + designation->print( os, indent+1 ); } Index: src/SynTree/Expression.h =================================================================== --- src/SynTree/Expression.h (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/Expression.h (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -58,5 +58,5 @@ virtual void accept( Visitor & v ) override = 0; virtual Expression * acceptMutator( Mutator & m ) override = 0; - virtual void print( std::ostream & os, int indent = 0 ) const override; + virtual void print( std::ostream & os, Indenter indent = {} ) const override; }; @@ -101,5 +101,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -119,5 +119,4 @@ void set_function( Expression * newValue ) { function = newValue; } - void set_args( std::list & listArgs ) { args = listArgs; } std::list::iterator begin_args() { return args.begin(); } std::list::iterator end_args() { return args.end(); } @@ -130,6 +129,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; - virtual void printArgs(std::ostream & os, int indent = 0) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -149,5 +147,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -170,5 +168,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -186,5 +184,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -205,5 +203,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -223,5 +221,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -244,5 +242,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -266,5 +264,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -287,5 +285,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -305,5 +303,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -330,5 +328,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -355,5 +353,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -376,5 +374,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -397,5 +395,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -415,5 +413,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -443,5 +441,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -465,5 +463,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; private: @@ -492,5 +490,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -513,5 +511,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -531,5 +529,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -557,5 +555,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; // https://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Machine-Constraints.html#Machine-Constraints @@ -585,5 +583,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -603,5 +601,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -621,5 +619,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -640,5 +638,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -657,5 +655,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -674,5 +672,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -695,5 +693,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -713,5 +711,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -736,5 +734,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -763,5 +761,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; private: @@ -797,5 +795,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; @@ -818,5 +816,5 @@ virtual void accept( Visitor & v ) { v.visit( this ); } virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); } - virtual void print( std::ostream & os, int indent = 0 ) const; + virtual void print( std::ostream & os, Indenter indent = {} ) const; }; Index: src/SynTree/FunctionDecl.cc =================================================================== --- src/SynTree/FunctionDecl.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/FunctionDecl.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -63,22 +63,22 @@ } -void FunctionDecl::print( std::ostream &os, int indent ) const { +void FunctionDecl::print( std::ostream &os, Indenter indent ) const { using std::endl; using std::string; - if ( get_name() != "" ) { - os << get_name() << ": "; + if ( name != "" ) { + os << name << ": "; } // if - if ( get_linkage() != LinkageSpec::Cforall ) { - os << LinkageSpec::linkageName( get_linkage() ) << " "; + if ( linkage != LinkageSpec::Cforall ) { + os << LinkageSpec::linkageName( linkage ) << " "; } // if - printAll( get_attributes(), os, indent ); + printAll( attributes, os, indent ); get_storageClasses().print( os ); get_funcSpec().print( os ); - if ( get_type() ) { - get_type()->print( os, indent ); + if ( type ) { + type->print( os, indent ); } else { os << "untyped entity "; @@ -86,25 +86,22 @@ if ( statements ) { - os << string( indent + 2, ' ' ) << "with body " << endl; - os << string( indent + 4, ' ' ); - statements->print( os, indent + 4 ); + os << indent << "... with body " << endl << indent+1; + statements->print( os, indent+1 ); } // if } -void FunctionDecl::printShort( std::ostream &os, int indent ) const { +void FunctionDecl::printShort( std::ostream &os, Indenter indent ) const { using std::endl; using std::string; - if ( get_name() != "" ) { - os << get_name() << ": "; + if ( name != "" ) { + os << name << ": "; } // if - - // xxx - should printShort print attributes? get_storageClasses().print( os ); get_funcSpec().print( os ); - if ( get_type() ) { - get_type()->print( os, indent ); + if ( type ) { + type->print( os, indent ); } else { os << "untyped entity "; Index: src/SynTree/FunctionType.cc =================================================================== --- src/SynTree/FunctionType.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/FunctionType.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -51,5 +51,5 @@ } -void FunctionType::print( std::ostream &os, int indent ) const { +void FunctionType::print( std::ostream &os, Indenter indent ) const { using std::string; using std::endl; @@ -58,18 +58,18 @@ os << "function" << endl; if ( ! parameters.empty() ) { - os << string( indent + 2, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent + 4 ); + os << indent << "... with parameters" << endl; + printAll( parameters, os, indent+1 ); if ( isVarArgs ) { - os << string( indent + 4, ' ' ) << "and a variable number of other arguments" << endl; + os << indent+1 << "and a variable number of other arguments" << endl; } // if } else if ( isVarArgs ) { - os << string( indent + 4, ' ' ) << "accepting unspecified arguments" << endl; + os << indent+1 << "accepting unspecified arguments" << endl; } // if - os << string( indent + 2, ' ' ) << "returning "; + os << indent << "... returning "; if ( returnVals.empty() ) { - os << endl << string( indent + 4, ' ' ) << "nothing " << endl; + os << "nothing " << endl; } else { os << endl; - printAll( returnVals, os, indent + 4 ); + printAll( returnVals, os, indent+1 ); } // if } Index: src/SynTree/Initializer.cc =================================================================== --- src/SynTree/Initializer.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/Initializer.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -38,12 +38,12 @@ } -void Designation::print( std::ostream &os, int indent ) const { +void Designation::print( std::ostream &os, Indenter indent ) const { if ( ! designators.empty() ) { - os << std::string(indent + 2, ' ' ) << "designated by: " << std::endl; - for ( std::list < Expression * >::const_iterator i = designators.begin(); i != designators.end(); i++ ) { - os << std::string(indent + 4, ' ' ); - ( *i )->print(os, indent + 4 ); + os << "... designated by: " << std::endl; + for ( const Expression * d : designators ) { + os << indent+1; + d->print(os, indent+1 ); + os << std::endl; } - os << std::endl; } // if } @@ -64,8 +64,7 @@ } -void SingleInit::print( std::ostream &os, int indent ) const { - os << std::string(indent, ' ' ) << "Simple Initializer: " << std::endl; - os << std::string(indent+4, ' ' ); - value->print( os, indent+4 ); +void SingleInit::print( std::ostream &os, Indenter indent ) const { + os << "Simple Initializer: "; + value->print( os, indent ); } @@ -93,13 +92,16 @@ } -void ListInit::print( std::ostream &os, int indent ) const { - os << std::string(indent, ' ') << "Compound initializer: " << std::endl; - for ( Designation * d : designations ) { - d->print( os, indent + 2 ); - } - - for ( const Initializer * init : initializers ) { - init->print( os, indent + 2 ); +void ListInit::print( std::ostream &os, Indenter indent ) const { + os << "Compound initializer: " << std::endl; + for ( auto p : group_iterate( designations, initializers ) ) { + const Designation * d = std::get<0>(p); + const Initializer * init = std::get<1>(p); + os << indent+1; + init->print( os, indent+1 ); os << std::endl; + if ( ! d->designators.empty() ) { + os << indent+1; + d->print( os, indent+1 ); + } } } @@ -116,22 +118,19 @@ } -void ConstructorInit::print( std::ostream &os, int indent ) const { - os << std::endl << std::string(indent, ' ') << "Constructor initializer: " << std::endl; +void ConstructorInit::print( std::ostream &os, Indenter indent ) const { + os << "Constructor initializer: " << std::endl; if ( ctor ) { - os << std::string(indent+2, ' '); - os << "initially constructed with "; - ctor->print( os, indent+4 ); + os << indent << "... initially constructed with "; + ctor->print( os, indent+1 ); } // if if ( dtor ) { - os << std::string(indent+2, ' '); - os << "destructed with "; - dtor->print( os, indent+4 ); + os << indent << "... destructed with "; + dtor->print( os, indent+1 ); } if ( init ) { - os << std::string(indent+2, ' '); - os << "with fallback C-style initializer: "; - init->print( os, indent+4 ); + os << indent << "... with fallback C-style initializer: "; + init->print( os, indent+1 ); } } Index: src/SynTree/Initializer.h =================================================================== --- src/SynTree/Initializer.h (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/Initializer.h (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -40,5 +40,5 @@ virtual void accept( Visitor &v ) override { v.visit( this ); } virtual Designation * acceptMutator( Mutator &m ) override { return m.mutate( this ); } - virtual void print( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; }; @@ -57,5 +57,5 @@ virtual void accept( Visitor &v ) override = 0; virtual Initializer *acceptMutator( Mutator &m ) override = 0; - virtual void print( std::ostream &os, int indent = 0 ) const override = 0; + virtual void print( std::ostream &os, Indenter indent = {} ) const override = 0; private: bool maybeConstructed; @@ -78,5 +78,5 @@ virtual void accept( Visitor &v ) override { v.visit( this ); } virtual Initializer *acceptMutator( Mutator &m ) override { return m.mutate( this ); } - virtual void print( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; }; @@ -106,5 +106,5 @@ virtual void accept( Visitor &v ) override { v.visit( this ); } virtual Initializer *acceptMutator( Mutator &m ) override { return m.mutate( this ); } - virtual void print( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; }; @@ -135,5 +135,5 @@ virtual void accept( Visitor &v ) override { v.visit( this ); } virtual Initializer *acceptMutator( Mutator &m ) override { return m.mutate( this ); } - virtual void print( std::ostream &os, int indent = 0 ) const override; + virtual void print( std::ostream &os, Indenter indent = {} ) const override; private: Index: src/SynTree/NamedTypeDecl.cc =================================================================== --- src/SynTree/NamedTypeDecl.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/NamedTypeDecl.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -38,12 +38,11 @@ } -void NamedTypeDecl::print( std::ostream &os, int indent ) const { +void NamedTypeDecl::print( std::ostream &os, Indenter indent ) const { using namespace std; - if ( get_name() != "" ) { - os << get_name() << ": "; - } // if - if ( get_linkage() != LinkageSpec::Cforall ) { - os << LinkageSpec::linkageName( get_linkage() ) << " "; + if ( name != "" ) os << name << ": "; + + if ( linkage != LinkageSpec::Cforall ) { + os << LinkageSpec::linkageName( linkage ) << " "; } // if get_storageClasses().print( os ); @@ -51,31 +50,29 @@ if ( base ) { os << " for "; - base->print( os, indent ); + base->print( os, indent+1 ); } // if if ( ! parameters.empty() ) { - os << endl << string( indent, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent+2 ); + os << endl << indent << "... with parameters" << endl; + printAll( parameters, os, indent+1 ); } // if if ( ! assertions.empty() ) { - os << endl << string( indent, ' ' ) << "with assertions" << endl; - printAll( assertions, os, indent+2 ); + os << endl << indent << "... with assertions" << endl; + printAll( assertions, os, indent+1 ); } // if } -void NamedTypeDecl::printShort( std::ostream &os, int indent ) const { +void NamedTypeDecl::printShort( std::ostream &os, Indenter indent ) const { using namespace std; - if ( get_name() != "" ) { - os << get_name() << ": "; - } // if + if ( name != "" ) os << name << ": "; get_storageClasses().print( os ); os << typeString(); if ( base ) { os << " for "; - base->print( os, indent ); + base->print( os, indent+1 ); } // if if ( ! parameters.empty() ) { - os << endl << string( indent, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent+2 ); + os << endl << indent << "... with parameters" << endl; + printAll( parameters, os, indent+1 ); } // if } Index: src/SynTree/ObjectDecl.cc =================================================================== --- src/SynTree/ObjectDecl.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/ObjectDecl.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -44,19 +44,15 @@ } -void ObjectDecl::print( std::ostream &os, int indent ) const { - if ( get_name() != "" ) { - os << get_name() << ": "; +void ObjectDecl::print( std::ostream &os, Indenter indent ) const { + if ( name != "" ) os << name << ": "; + + if ( linkage != LinkageSpec::Cforall ) { + os << LinkageSpec::linkageName( linkage ) << " "; } // if - - if ( get_linkage() != LinkageSpec::Cforall ) { - os << LinkageSpec::linkageName( get_linkage() ) << " "; - } // if - - printAll( get_attributes(), os, indent ); get_storageClasses().print( os ); - if ( get_type() ) { - get_type()->print( os, indent ); + if ( type ) { + type->print( os, indent ); } else { os << " untyped entity "; @@ -64,18 +60,21 @@ if ( init ) { - os << " with initializer " << std::endl; - init->print( os, indent+2 ); - os << std::endl << std::string(indent+2, ' '); - os << "maybeConstructed? " << init->get_maybeConstructed(); + os << " with initializer (" << (init->get_maybeConstructed() ? "maybe constructed" : "not constructed") << ")" << std::endl << indent+1; + init->print( os, indent+1 ); + os << std::endl; } // if + if ( ! attributes.empty() ) { + os << std::endl << indent << "... with attributes: " << std::endl; + printAll( attributes, os, indent+1 ); + } + if ( bitfieldWidth ) { - os << std::string(indent, ' '); - os << " with bitfield width "; + os << indent << " with bitfield width "; bitfieldWidth->print( os ); } // if } -void ObjectDecl::printShort( std::ostream &os, int indent ) const { +void ObjectDecl::printShort( std::ostream &os, Indenter indent ) const { #if 0 if ( get_mangleName() != "") { @@ -83,14 +82,10 @@ } else #endif - if ( get_name() != "" ) { - os << get_name() << ": "; - } // if - - // xxx - should printShort print attributes? + if ( name != "" ) os << name << ": "; get_storageClasses().print( os ); - if ( get_type() ) { - get_type()->print( os, indent ); + if ( type ) { + type->print( os, indent ); } else { os << "untyped entity "; Index: src/SynTree/PointerType.cc =================================================================== --- src/SynTree/PointerType.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/PointerType.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -41,5 +41,5 @@ } -void PointerType::print( std::ostream &os, int indent ) const { +void PointerType::print( std::ostream &os, Indenter indent ) const { Type::print( os, indent ); if ( ! is_array() ) { Index: src/SynTree/ReferenceToType.cc =================================================================== --- src/SynTree/ReferenceToType.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/ReferenceToType.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -14,5 +14,4 @@ // -#include // for NULL #include // for assert #include // for list, _List_const_iterator, list<>::cons... @@ -38,5 +37,5 @@ } -void ReferenceToType::print( std::ostream &os, int indent ) const { +void ReferenceToType::print( std::ostream &os, Indenter indent ) const { using std::endl; @@ -44,6 +43,6 @@ os << "instance of " << typeString() << " " << name << " "; if ( ! parameters.empty() ) { - os << endl << std::string( indent, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent+2 ); + os << endl << indent << "... with parameters" << endl; + printAll( parameters, os, indent+1 ); } // if } @@ -65,5 +64,5 @@ std::list* StructInstType::get_baseParameters() { - if ( ! baseStruct ) return NULL; + if ( ! baseStruct ) return nullptr; return &baseStruct->get_parameters(); } @@ -76,14 +75,14 @@ } -void StructInstType::print( std::ostream &os, int indent ) const { +void StructInstType::print( std::ostream &os, Indenter indent ) const { using std::endl; - if ( baseStruct == NULL ) ReferenceToType::print( os, indent ); + if ( baseStruct == nullptr ) ReferenceToType::print( os, indent ); else { Type::print( os, indent ); os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body() << " "; if ( ! parameters.empty() ) { - os << endl << std::string( indent, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent+2 ); + os << endl << indent << "... with parameters" << endl; + printAll( parameters, os, indent+1 ); } // if } // if @@ -97,5 +96,5 @@ std::list< TypeDecl * > * UnionInstType::get_baseParameters() { - if ( ! baseUnion ) return NULL; + if ( ! baseUnion ) return nullptr; return &baseUnion->get_parameters(); } @@ -108,14 +107,14 @@ } -void UnionInstType::print( std::ostream &os, int indent ) const { +void UnionInstType::print( std::ostream &os, Indenter indent ) const { using std::endl; - if ( baseUnion == NULL ) ReferenceToType::print( os, indent ); + if ( baseUnion == nullptr ) ReferenceToType::print( os, indent ); else { Type::print( os, indent ); os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body() << " "; if ( ! parameters.empty() ) { - os << endl << std::string( indent, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent+2 ); + os << endl << indent << "... with parameters" << endl; + printAll( parameters, os, indent+1 ); } // if } // if @@ -166,5 +165,5 @@ bool TypeInstType::isComplete() const { return baseType->isComplete(); } -void TypeInstType::print( std::ostream &os, int indent ) const { +void TypeInstType::print( std::ostream &os, Indenter indent ) const { using std::endl; @@ -172,6 +171,6 @@ os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type) "; if ( ! parameters.empty() ) { - os << endl << std::string( indent, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent+2 ); + os << endl << indent << "... with parameters" << endl; + printAll( parameters, os, indent+1 ); } // if } Index: src/SynTree/ReferenceType.cc =================================================================== --- src/SynTree/ReferenceType.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/ReferenceType.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -35,5 +35,5 @@ } -void ReferenceType::print( std::ostream &os, int indent ) const { +void ReferenceType::print( std::ostream &os, Indenter indent ) const { Type::print( os, indent ); os << "reference to "; Index: src/SynTree/Statement.cc =================================================================== --- src/SynTree/Statement.cc (revision a8555c532094670acc3904334e334db26b083dd0) +++ src/SynTree/Statement.cc (revision 50377a4f7ed2666db8f0a606e0e8573661478734) @@ -34,5 +34,13 @@ Statement::Statement( std::list