Index: translator/SynTree/FunctionType.cc =================================================================== --- translator/SynTree/FunctionType.cc (revision 51b734528489f81a5af985bfee9aa3b6625b9774) +++ translator/SynTree/FunctionType.cc (revision 3b7728921d8d801c10ec7481d0d72e3cecaf2f0d) @@ -1,9 +1,2 @@ -/* - * This file is part of the Cforall project - * - * $Id: FunctionType.cc,v 1.8 2005/08/29 20:59:25 rcbilson Exp $ - * - */ - #include @@ -13,25 +6,18 @@ -FunctionType::FunctionType( const Type::Qualifiers &tq, bool isVarArgs ) - : Type( tq ), isVarArgs( isVarArgs ) -{ +FunctionType::FunctionType( const Type::Qualifiers &tq, bool isVarArgs ) : Type( tq ), isVarArgs( isVarArgs ) { } -FunctionType::FunctionType( const FunctionType &other ) - : Type( other ), isVarArgs( other.isVarArgs ) -{ +FunctionType::FunctionType( const FunctionType &other ) : Type( other ), isVarArgs( other.isVarArgs ) { cloneAll( other.returnVals, returnVals ); cloneAll( other.parameters, parameters ); } -FunctionType::~FunctionType() -{ +FunctionType::~FunctionType() { deleteAll( returnVals ); deleteAll( parameters ); } -void -FunctionType::print( std::ostream &os, int indent ) const -{ +void FunctionType::print( std::ostream &os, int indent ) const { using std::string; using std::endl; @@ -39,21 +25,20 @@ Type::print( os, indent ); os << "function" << endl; - if( !parameters.empty() ) { - os << string( indent+2, ' ' ) << "with parameters" << endl; - printAll( parameters, os, indent+4 ); - if( isVarArgs ) { - os << string( indent+4, ' ' ) << "and a variable number of other arguments" << endl; + if ( ! parameters.empty() ) { + os << string( indent + 2, ' ' ) << "with parameters" << endl; + printAll( parameters, os, indent + 4 ); + if ( isVarArgs ) { + os << string( indent + 4, ' ' ) << "and a variable number of other arguments" << endl; } - } else if( isVarArgs ) { - os << string( indent+4, ' ' ) << "accepting unspecified arguments" << endl; + } else if ( isVarArgs ) { + os << string( indent + 4, ' ' ) << "accepting unspecified arguments" << endl; } - os << string( indent+2, ' ' ) << "returning "; - if( returnVals.empty() ) { - os << endl << string( indent+4, ' ' ) << "nothing " << endl; + os << string( indent + 2, ' ' ) << "returning "; + if ( returnVals.empty() ) { + os << endl << string( indent + 4, ' ' ) << "nothing " << endl; } else { os << endl; - printAll( returnVals, os, indent+4 ); + printAll( returnVals, os, indent + 4 ); } - } Index: translator/SynTree/Type.h =================================================================== --- translator/SynTree/Type.h (revision 51b734528489f81a5af985bfee9aa3b6625b9774) +++ translator/SynTree/Type.h (revision 3b7728921d8d801c10ec7481d0d72e3cecaf2f0d) @@ -1,9 +1,2 @@ -/* - * This file is part of the Cforall project - * - * $Id: Type.h,v 1.30 2005/08/29 20:59:26 rcbilson Exp $ - * - */ - #ifndef TYPE_H #define TYPE_H @@ -14,17 +7,15 @@ -class Type -{ -public: - struct Qualifiers - { - Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ) {} - Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ) {} +class Type { + public: + struct Qualifiers { + Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ) {} + Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ) {} - Qualifiers &operator+=( const Qualifiers &other); - Qualifiers &operator-=( const Qualifiers &other); + Qualifiers &operator+=( const Qualifiers &other ); + Qualifiers &operator-=( const Qualifiers &other ); Qualifiers operator+( const Type::Qualifiers &other ); - bool operator==( const Qualifiers &other); - bool operator!=( const Qualifiers &other); + bool operator==( const Qualifiers &other ); + bool operator!=( const Qualifiers &other ); bool operator<=( const Qualifiers &other ); bool operator>=( const Qualifiers &other ); @@ -57,13 +48,11 @@ virtual Type *acceptMutator( Mutator &m ) = 0; virtual void print( std::ostream &os, int indent = 0 ) const; - -private: + private: Qualifiers tq; std::list forall; }; -class VoidType : public Type -{ -public: +class VoidType : public Type { + public: VoidType( const Type::Qualifiers &tq ); @@ -74,32 +63,30 @@ }; -class BasicType : public Type -{ -public: - enum Kind - { - Bool, - Char, - SignedChar, - UnsignedChar, - ShortSignedInt, - ShortUnsignedInt, - SignedInt, - UnsignedInt, - LongSignedInt, - LongUnsignedInt, - LongLongSignedInt, - LongLongUnsignedInt, - Float, - Double, - LongDouble, - FloatComplex, - DoubleComplex, - LongDoubleComplex, - FloatImaginary, - DoubleImaginary, - LongDoubleImaginary, - NUMBER_OF_BASIC_TYPES - }; +class BasicType : public Type { + public: + enum Kind { + Bool, + Char, + SignedChar, + UnsignedChar, + ShortSignedInt, + ShortUnsignedInt, + SignedInt, + UnsignedInt, + LongSignedInt, + LongUnsignedInt, + LongLongSignedInt, + LongLongUnsignedInt, + Float, + Double, + LongDouble, + FloatComplex, + DoubleComplex, + LongDoubleComplex, + FloatImaginary, + DoubleImaginary, + LongDoubleImaginary, + NUMBER_OF_BASIC_TYPES + }; BasicType( const Type::Qualifiers &tq, Kind bt ); @@ -114,12 +101,10 @@ bool isInteger() const; - -private: + private: Kind kind; }; -class PointerType : public Type -{ -public: +class PointerType : public Type { + public: PointerType( const Type::Qualifiers &tq, Type *base ); PointerType( const Type::Qualifiers &tq, Type *base, Expression *dimension, bool isVarLen, bool isStatic ); @@ -140,10 +125,8 @@ virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } virtual void print( std::ostream &os, int indent = 0 ) const; - -private: + private: Type *base; - // in C99, pointer types can be qualified in many ways - // e.g., int f( int a[ static 3 ] ) + // In C99, pointer types can be qualified in many ways e.g., int f( int a[ static 3 ] ) Expression *dimension; bool isVarLen; @@ -151,7 +134,6 @@ }; -class ArrayType : public Type -{ -public: +class ArrayType : public Type { + public: ArrayType( const Type::Qualifiers &tq, Type *base, Expression *dimension, bool isVarLen, bool isStatic ); ArrayType( const ArrayType& ); @@ -171,6 +153,5 @@ virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } virtual void print( std::ostream &os, int indent = 0 ) const; - -private: + private: Type *base; Expression *dimension; @@ -179,7 +160,6 @@ }; -class FunctionType : public Type -{ -public: +class FunctionType : public Type { + public: FunctionType( const Type::Qualifiers &tq, bool isVarArgs ); FunctionType( const FunctionType& ); @@ -195,6 +175,5 @@ virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } virtual void print( std::ostream &os, int indent = 0 ) const; - -private: + private: std::list returnVals; std::list parameters; @@ -207,7 +186,6 @@ }; -class ReferenceToType : public Type -{ -public: +class ReferenceToType : public Type { + public: ReferenceToType( const Type::Qualifiers &tq, const std::string &name ); ReferenceToType( const ReferenceToType &other ); @@ -222,19 +200,14 @@ virtual Type *acceptMutator( Mutator &m ) = 0; virtual void print( std::ostream &os, int indent = 0 ) const; - -protected: + protected: virtual std::string typeString() const = 0; std::list< Expression* > parameters; - -private: + private: std::string name; - -}; - -class StructInstType : public ReferenceToType -{ +}; + +class StructInstType : public ReferenceToType { typedef ReferenceToType Parent; - -public: + public: StructInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ), baseStruct( 0 ) {} StructInstType( const StructInstType &other ) : Parent( other ), baseStruct( other.baseStruct ) {} @@ -250,5 +223,5 @@ virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } -private: + private: virtual std::string typeString() const; @@ -258,9 +231,7 @@ }; -class UnionInstType : public ReferenceToType -{ +class UnionInstType : public ReferenceToType { typedef ReferenceToType Parent; - -public: + public: UnionInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ), baseUnion( 0 ) {} UnionInstType( const UnionInstType &other ) : Parent( other ), baseUnion( other.baseUnion ) {} @@ -275,6 +246,5 @@ virtual void accept( Visitor &v ) { v.visit( this ); } virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } - -private: + private: virtual std::string typeString() const; @@ -284,9 +254,7 @@ }; -class EnumInstType : public ReferenceToType -{ +class EnumInstType : public ReferenceToType { typedef ReferenceToType Parent; - -public: + public: EnumInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ) {} EnumInstType( const EnumInstType &other ) : Parent( other ) {} @@ -296,13 +264,11 @@ virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } -private: + private: virtual std::string typeString() const; }; -class ContextInstType : public ReferenceToType -{ +class ContextInstType : public ReferenceToType { typedef ReferenceToType Parent; - -public: + public: ContextInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ) {} ContextInstType( const ContextInstType &other ); @@ -314,6 +280,5 @@ virtual void accept( Visitor &v ) { v.visit( this ); } virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } - -private: + private: virtual std::string typeString() const; @@ -323,9 +288,7 @@ }; -class TypeInstType : public ReferenceToType -{ +class TypeInstType : public ReferenceToType { typedef ReferenceToType Parent; - -public: + public: TypeInstType( const Type::Qualifiers &tq, const std::string &name, TypeDecl *baseType ); TypeInstType( const Type::Qualifiers &tq, const std::string &name, bool isFtype ); @@ -341,8 +304,6 @@ virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } virtual void print( std::ostream &os, int indent = 0 ) const; - -private: + private: virtual std::string typeString() const; - // this decl is not "owned" by the type inst; it is merely a pointer to elsewhere in the tree, // where the type used here is actually defined @@ -351,7 +312,6 @@ }; -class TupleType : public Type -{ -public: +class TupleType : public Type { + public: TupleType( const Type::Qualifiers &tq ); TupleType( const TupleType& ); @@ -364,12 +324,10 @@ virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } virtual void print( std::ostream &os, int indent = 0 ) const; - -private: + private: std::list types; }; -class TypeofType : public Type -{ -public: +class TypeofType : public Type { + public: TypeofType( const Type::Qualifiers &tq, Expression *expr ); TypeofType( const TypeofType& ); @@ -383,12 +341,10 @@ virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); } virtual void print( std::ostream &os, int indent = 0 ) const; - -private: + private: Expression *expr; }; -class AttrType : public Type -{ -public: +class AttrType : public Type { + public: AttrType( const Type::Qualifiers &tq, const std::string &name, Expression *expr ); AttrType( const Type::Qualifiers &tq, const std::string &name, Type *type ); @@ -410,5 +366,5 @@ virtual void print( std::ostream &os, int indent = 0 ) const; -private: + private: std::string name; Expression *expr; @@ -417,7 +373,5 @@ }; -inline Type::Qualifiers & -Type::Qualifiers::operator+=( const Type::Qualifiers &other ) -{ +inline Type::Qualifiers &Type::Qualifiers::operator+=( const Type::Qualifiers &other ) { isConst |= other.isConst; isVolatile |= other.isVolatile; @@ -427,16 +381,12 @@ } -inline Type::Qualifiers & -Type::Qualifiers::operator-=( const Type::Qualifiers &other ) -{ - if( other.isConst ) isConst = 0; - if( other.isVolatile ) isVolatile = 0; - if( other.isRestrict ) isRestrict = 0; +inline Type::Qualifiers &Type::Qualifiers::operator-=( const Type::Qualifiers &other ) { + if ( other.isConst ) isConst = 0; + if ( other.isVolatile ) isVolatile = 0; + if ( other.isRestrict ) isRestrict = 0; return *this; } -inline Type::Qualifiers -Type::Qualifiers::operator+( const Type::Qualifiers &other ) -{ +inline Type::Qualifiers Type::Qualifiers::operator+( const Type::Qualifiers &other ) { Qualifiers q = other; q += *this; @@ -444,16 +394,12 @@ } -inline bool -Type::Qualifiers::operator==( const Qualifiers &other) -{ +inline bool Type::Qualifiers::operator==( const Qualifiers &other ) { return isConst == other.isConst - && isVolatile == other.isVolatile - && isRestrict == other.isRestrict; + && isVolatile == other.isVolatile + && isRestrict == other.isRestrict; /// && isLvalue == other.isLvalue; } -inline bool -Type::Qualifiers::operator!=( const Qualifiers &other) -{ +inline bool Type::Qualifiers::operator!=( const Qualifiers &other ) { return isConst != other.isConst || isVolatile != other.isVolatile @@ -462,7 +408,5 @@ } -inline bool -Type::Qualifiers::operator<=( const Type::Qualifiers &other ) -{ +inline bool Type::Qualifiers::operator<=( const Type::Qualifiers &other ) { return isConst <= other.isConst && isVolatile <= other.isVolatile @@ -471,7 +415,5 @@ } -inline bool -Type::Qualifiers::operator>=( const Type::Qualifiers &other ) -{ +inline bool Type::Qualifiers::operator>=( const Type::Qualifiers &other ) { return isConst >= other.isConst && isVolatile >= other.isVolatile @@ -480,16 +422,11 @@ } -inline bool -Type::Qualifiers::operator<( const Type::Qualifiers &other ) -{ +inline bool Type::Qualifiers::operator<( const Type::Qualifiers &other ) { return operator!=( other ) && operator<=( other ); } -inline bool -Type::Qualifiers::operator>( const Type::Qualifiers &other ) -{ +inline bool Type::Qualifiers::operator>( const Type::Qualifiers &other ) { return operator!=( other ) && operator>=( other ); } - -#endif /* #ifndef TYPE_H */ +#endif // TYPE_H