Index: src/SymTab/FixFunction.cc =================================================================== --- src/SymTab/FixFunction.cc (revision c6b4432f5c6c6679b981f5a6bded51ad30ac00d9) +++ src/SymTab/FixFunction.cc (revision 8d182b1ed853a31c8c46021c2f2a6be9c45ea31d) @@ -26,5 +26,5 @@ namespace { - struct FixFunction_new final : public ast::WithShortCircuiting { + struct FixFunction final : public ast::WithShortCircuiting { bool isVoid = false; @@ -70,5 +70,5 @@ const ast::DeclWithType * fixFunction( const ast::DeclWithType * dwt, bool & isVoid ) { - ast::Pass< FixFunction_new > fixer; + ast::Pass< FixFunction > fixer; dwt = dwt->accept( fixer ); isVoid |= fixer.core.isVoid; @@ -77,5 +77,5 @@ const ast::Type * fixFunction( const ast::Type * type, bool & isVoid ) { - ast::Pass< FixFunction_new > fixer; + ast::Pass< FixFunction > fixer; type = type->accept( fixer ); isVoid |= fixer.core.isVoid; Index: src/SymTab/GenImplicitCall.cpp =================================================================== --- src/SymTab/GenImplicitCall.cpp (revision c6b4432f5c6c6679b981f5a6bded51ad30ac00d9) +++ src/SymTab/GenImplicitCall.cpp (revision 8d182b1ed853a31c8c46021c2f2a6be9c45ea31d) @@ -32,5 +32,5 @@ template< typename OutIter > ast::ptr< ast::Stmt > genCall( - InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam, + InitTweak::InitExpander & srcParam, const ast::Expr * dstParam, const CodeLocation & loc, const std::string & fname, OutIter && out, const ast::Type * type, const ast::Type * addCast, LoopDirection forward = LoopForward ); @@ -42,5 +42,5 @@ template< typename OutIter > ast::ptr< ast::Stmt > genScalarCall( - InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam, + InitTweak::InitExpander & srcParam, const ast::Expr * dstParam, const CodeLocation & loc, std::string fname, OutIter && out, const ast::Type * type, const ast::Type * addCast = nullptr @@ -98,5 +98,5 @@ template< typename OutIter > void genArrayCall( - InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam, + InitTweak::InitExpander & srcParam, const ast::Expr * dstParam, const CodeLocation & loc, const std::string & fname, OutIter && out, const ast::ArrayType * array, const ast::Type * addCast = nullptr, @@ -167,5 +167,5 @@ template< typename OutIter > ast::ptr< ast::Stmt > genCall( - InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam, + InitTweak::InitExpander & srcParam, const ast::Expr * dstParam, const CodeLocation & loc, const std::string & fname, OutIter && out, const ast::Type * type, const ast::Type * addCast, LoopDirection forward @@ -185,5 +185,5 @@ ast::ptr< ast::Stmt > genImplicitCall( - InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam, + InitTweak::InitExpander & srcParam, const ast::Expr * dstParam, const CodeLocation & loc, const std::string & fname, const ast::ObjectDecl * obj, LoopDirection forward Index: src/SymTab/GenImplicitCall.hpp =================================================================== --- src/SymTab/GenImplicitCall.hpp (revision c6b4432f5c6c6679b981f5a6bded51ad30ac00d9) +++ src/SymTab/GenImplicitCall.hpp (revision 8d182b1ed853a31c8c46021c2f2a6be9c45ea31d) @@ -26,5 +26,5 @@ /// dstParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls. ast::ptr genImplicitCall( - InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam, + InitTweak::InitExpander & srcParam, const ast::Expr * dstParam, const CodeLocation & loc, const std::string & fname, const ast::ObjectDecl * obj, LoopDirection forward = LoopForward Index: src/SymTab/Mangler.cc =================================================================== --- src/SymTab/Mangler.cc (revision c6b4432f5c6c6679b981f5a6bded51ad30ac00d9) +++ src/SymTab/Mangler.cc (revision 8d182b1ed853a31c8c46021c2f2a6be9c45ea31d) @@ -30,7 +30,7 @@ namespace { /// Mangles names to a unique C identifier - struct Mangler_new : public ast::WithShortCircuiting, public ast::WithVisitorRef, public ast::WithGuards { - Mangler_new( Mangle::Mode mode ); - Mangler_new( const Mangler_new & ) = delete; + struct Mangler : public ast::WithShortCircuiting, public ast::WithVisitorRef, public ast::WithGuards { + Mangler( Mangle::Mode mode ); + Mangler( const Mangler & ) = delete; void previsit( const ast::Node * ) { visit_children = false; } @@ -72,7 +72,7 @@ private: - Mangler_new( bool mangleOverridable, bool typeMode, bool mangleGenericParams, + Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams, int nextVarNum, const VarMapType& varNums ); - friend class ast::Pass; + friend class ast::Pass; private: @@ -81,13 +81,13 @@ void printQualifiers( const ast::Type *type ); - }; // Mangler_new + }; // Mangler } // namespace std::string mangle( const ast::Node * decl, Mangle::Mode mode ) { - return ast::Pass::read( decl, mode ); + return ast::Pass::read( decl, mode ); } namespace { - Mangler_new::Mangler_new( Mangle::Mode mode ) + Mangler::Mangler( Mangle::Mode mode ) : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable ( ! mode.no_overrideable ), @@ -95,5 +95,5 @@ mangleGenericParams( ! mode.no_generic_params ) {} - Mangler_new::Mangler_new( bool mangleOverridable, bool typeMode, bool mangleGenericParams, + Mangler::Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams, int nextVarNum, const VarMapType& varNums ) : varNums( varNums ), nextVarNum( nextVarNum ), isTopLevel( false ), @@ -101,5 +101,5 @@ mangleGenericParams( mangleGenericParams ) {} - void Mangler_new::mangleDecl( const ast::DeclWithType * decl ) { + void Mangler::mangleDecl( const ast::DeclWithType * decl ) { bool wasTopLevel = isTopLevel; if ( isTopLevel ) { @@ -131,18 +131,18 @@ } - void Mangler_new::postvisit( const ast::ObjectDecl * decl ) { + void Mangler::postvisit( const ast::ObjectDecl * decl ) { mangleDecl( decl ); } - void Mangler_new::postvisit( const ast::FunctionDecl * decl ) { + void Mangler::postvisit( const ast::FunctionDecl * decl ) { mangleDecl( decl ); } - void Mangler_new::postvisit( const ast::VoidType * voidType ) { + void Mangler::postvisit( const ast::VoidType * voidType ) { printQualifiers( voidType ); mangleName += Encoding::void_t; } - void Mangler_new::postvisit( const ast::BasicType * basicType ) { + void Mangler::postvisit( const ast::BasicType * basicType ) { printQualifiers( basicType ); assertf( basicType->kind < ast::BasicType::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->kind ); @@ -150,5 +150,5 @@ } - void Mangler_new::postvisit( const ast::PointerType * pointerType ) { + void Mangler::postvisit( const ast::PointerType * pointerType ) { printQualifiers( pointerType ); // mangle void (*f)() and void f() to the same name to prevent overloading on functions and function pointers @@ -157,5 +157,5 @@ } - void Mangler_new::postvisit( const ast::ArrayType * arrayType ) { + void Mangler::postvisit( const ast::ArrayType * arrayType ) { // TODO: encode dimension printQualifiers( arrayType ); @@ -164,5 +164,5 @@ } - void Mangler_new::postvisit( const ast::ReferenceType * refType ) { + void Mangler::postvisit( const ast::ReferenceType * refType ) { // don't print prefix (e.g. 'R') for reference types so that references and non-references do not overload. // Further, do not print the qualifiers for a reference type (but do run printQualifers because of TypeDecls, etc.), @@ -174,5 +174,5 @@ } - void Mangler_new::postvisit( const ast::FunctionType * functionType ) { + void Mangler::postvisit( const ast::FunctionType * functionType ) { printQualifiers( functionType ); mangleName += Encoding::function; @@ -189,5 +189,5 @@ } - void Mangler_new::mangleRef( + void Mangler::mangleRef( const ast::BaseInstType * refType, const std::string & prefix ) { printQualifiers( refType ); @@ -206,17 +206,17 @@ } - void Mangler_new::postvisit( const ast::StructInstType * aggregateUseType ) { + void Mangler::postvisit( const ast::StructInstType * aggregateUseType ) { mangleRef( aggregateUseType, Encoding::struct_t ); } - void Mangler_new::postvisit( const ast::UnionInstType * aggregateUseType ) { + void Mangler::postvisit( const ast::UnionInstType * aggregateUseType ) { mangleRef( aggregateUseType, Encoding::union_t ); } - void Mangler_new::postvisit( const ast::EnumInstType * aggregateUseType ) { + void Mangler::postvisit( const ast::EnumInstType * aggregateUseType ) { mangleRef( aggregateUseType, Encoding::enum_t ); } - void Mangler_new::postvisit( const ast::TypeInstType * typeInst ) { + void Mangler::postvisit( const ast::TypeInstType * typeInst ) { VarMapType::iterator varNum = varNums.find( typeInst->name ); if ( varNum == varNums.end() ) { @@ -234,10 +234,10 @@ } - void Mangler_new::postvisit( const ast::TraitInstType * inst ) { + void Mangler::postvisit( const ast::TraitInstType * inst ) { printQualifiers( inst ); mangleName += std::to_string( inst->name.size() ) + inst->name; } - void Mangler_new::postvisit( const ast::TupleType * tupleType ) { + void Mangler::postvisit( const ast::TupleType * tupleType ) { printQualifiers( tupleType ); mangleName += Encoding::tuple + std::to_string( tupleType->types.size() ); @@ -245,5 +245,5 @@ } - void Mangler_new::postvisit( const ast::VarArgsType * varArgsType ) { + void Mangler::postvisit( const ast::VarArgsType * varArgsType ) { printQualifiers( varArgsType ); static const std::string vargs = "__builtin_va_list"; @@ -251,13 +251,13 @@ } - void Mangler_new::postvisit( const ast::ZeroType * ) { + void Mangler::postvisit( const ast::ZeroType * ) { mangleName += Encoding::zero; } - void Mangler_new::postvisit( const ast::OneType * ) { + void Mangler::postvisit( const ast::OneType * ) { mangleName += Encoding::one; } - void Mangler_new::postvisit( const ast::QualifiedType * qualType ) { + void Mangler::postvisit( const ast::QualifiedType * qualType ) { bool inqual = inQualifiedType; if ( !inqual ) { @@ -275,5 +275,5 @@ } - void Mangler_new::postvisit( const ast::TypeDecl * decl ) { + void Mangler::postvisit( const ast::TypeDecl * decl ) { // TODO: is there any case where mangling a TypeDecl makes sense? If so, this code needs to be // fixed to ensure that two TypeDecls mangle to the same name when they are the same type and vice versa. @@ -281,5 +281,5 @@ // and the case has not yet come up in practice. Alternatively, if not then this code can be removed // aside from the assert false. - assertf(false, "Mangler_new should not visit typedecl: %s", toCString(decl)); + assertf(false, "Mangler should not visit typedecl: %s", toCString(decl)); assertf( decl->kind < ast::TypeDecl::Kind::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind ); mangleName += Encoding::typeVariables[ decl->kind ] + std::to_string( decl->name.length() ) + decl->name; @@ -293,5 +293,5 @@ } - void Mangler_new::printQualifiers( const ast::Type * type ) { + void Mangler::printQualifiers( const ast::Type * type ) { // skip if not including qualifiers if ( typeMode ) return; @@ -318,5 +318,5 @@ } // for for ( auto & assert : funcType->assertions ) { - assertionNames.push_back( ast::Pass::read( + assertionNames.push_back( ast::Pass::read( assert->var.get(), mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums ) );