Index: src/AST/DeclReplacer.cpp =================================================================== --- src/AST/DeclReplacer.cpp (revision 2c63fa2fd6e5da8767768124941a556b5d239675) +++ src/AST/DeclReplacer.cpp (revision 79ee5b3cdc466388553b886527f3d4473a8b4386) @@ -9,109 +9,109 @@ // Author : Aaron B. Moss // Created On : Wed May 8 13:00:00 2019 -// Last Modified By : Aaron B. Moss -// Last Modified On : Wed May 8 13:00:00 2019 -// Update Count : 1 +// Last Modified By : Andrew Beach +// Last Modified On : Thr Sep 15 11:55:00 2022 +// Update Count : 2 // #include "DeclReplacer.hpp" + #include "Expr.hpp" +#include "Pass.hpp" #include "Type.hpp" - -#include "Pass.hpp" namespace ast { namespace DeclReplacer { - namespace { - struct DeclReplacer { - private: - const DeclMap & declMap; - const TypeMap & typeMap; - bool debug; - public: - DeclReplacer(const DeclMap & declMap, const TypeMap & typeMap, bool debug) - : declMap( declMap ), typeMap( typeMap ), debug( debug ) - {} +namespace { + struct DeclReplacer { + private: + const DeclMap & declMap; + const TypeMap & typeMap; + bool debug; - const ast::VariableExpr * previsit( const ast::VariableExpr * ); - const ast::TypeInstType * previsit( const ast::TypeInstType * ); - }; + public: + DeclReplacer( const DeclMap & declMap, const TypeMap & typeMap, bool debug ) + : declMap( declMap ), typeMap( typeMap ), debug( debug ) + {} - struct VarExprReplacer { - private: - const ExprMap & exprMap; - - public: - VarExprReplacer(const ExprMap & exprMap): exprMap (exprMap) {} + const ast::VariableExpr * previsit( const ast::VariableExpr * ); + const ast::TypeInstType * previsit( const ast::TypeInstType * ); + }; - const Expr * postvisit (const VariableExpr *); - }; + struct VarExprReplacer { + private: + const ExprMap & exprMap; + + public: + VarExprReplacer( const ExprMap & exprMap ) : exprMap( exprMap ) {} + + const Expr * postvisit( const VariableExpr * ); + }; +} // namespace + +const ast::Node * replace( const ast::Node * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug ) { + if(!node) return nullptr; + Pass replacer = { declMap, typeMap, debug }; + return node->accept( replacer ); +} + +const ast::Node * replace( const ast::Node * node, const DeclMap & declMap, bool debug ) { + TypeMap typeMap; + return replace( node, declMap, typeMap, debug ); +} + +const ast::Node * replace( const ast::Node * node, const TypeMap & typeMap, bool debug ) { + DeclMap declMap; + return replace( node, declMap, typeMap, debug ); +} + +const ast::Node * replace( const ast::Node * node, const ExprMap & exprMap ) { + Pass replacer = {exprMap}; + return node->accept( replacer ); +} + +namespace { + // replace variable with new node from decl map + const ast::VariableExpr * DeclReplacer::previsit( const VariableExpr * varExpr ) { + // xxx - assertions and parameters aren't accounted for in this... (i.e. they aren't inserted into the map when it's made, only DeclStmts are) + if ( !declMap.count( varExpr->var ) ) return varExpr; + + auto replacement = declMap.at( varExpr->var ); + if ( debug ) { + std::cerr << "replacing variable reference: " + << (void*)varExpr->var.get() << " " << varExpr->var + << " with " << (void*)replacement << " " << replacement + << std::endl; + } + auto nexpr = mutate(varExpr); + nexpr->var = replacement; + return nexpr; } - const ast::Node * replace( const ast::Node * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug ) { - if(!node) return nullptr; - Pass replacer = { declMap, typeMap, debug }; - return node->accept( replacer ); + const TypeInstType * DeclReplacer::previsit( const TypeInstType * inst ) { + if ( !typeMap.count( inst->base ) ) return inst; + + auto replacement = typeMap.at( inst->base ); + if ( debug ) { + std::cerr << "replacing type reference: " + << (void*)inst->base.get() << " " << inst->base + << " with " << (void*)replacement << " " << replacement + << std::endl; + } + auto ninst = mutate(inst); + ninst->base = replacement; + return ninst; } - const ast::Node * replace( const ast::Node * node, const DeclMap & declMap, bool debug ) { - TypeMap typeMap; - return replace( node, declMap, typeMap, debug ); + const Expr * VarExprReplacer::postvisit( const VariableExpr * expr ) { + if ( !exprMap.count( expr->var ) ) return expr; + return exprMap.at( expr->var ); } +} // namespace - const ast::Node * replace( const ast::Node * node, const TypeMap & typeMap, bool debug ) { - DeclMap declMap; - return replace( node, declMap, typeMap, debug ); - } +} // namespace DeclReplacer - const ast::Node * replace( const ast::Node * node, const ExprMap & exprMap) { - Pass replacer = {exprMap}; - return node->accept( replacer ); - } - - namespace { - // replace variable with new node from decl map - const ast::VariableExpr * DeclReplacer::previsit( const VariableExpr * varExpr ) { - // xxx - assertions and parameters aren't accounted for in this... (i.e. they aren't inserted into the map when it's made, only DeclStmts are) - if ( !declMap.count( varExpr->var ) ) return varExpr; - - auto replacement = declMap.at( varExpr->var ); - if ( debug ) { - std::cerr << "replacing variable reference: " - << (void*)varExpr->var.get() << " " << varExpr->var - << " with " << (void*)replacement << " " << replacement - << std::endl; - } - auto nexpr = mutate(varExpr); - nexpr->var = replacement; - return nexpr; - } - - const TypeInstType * DeclReplacer::previsit( const TypeInstType * inst ) { - if ( !typeMap.count( inst->base ) ) return inst; - - auto replacement = typeMap.at( inst->base ); - if ( debug ) { - std::cerr << "replacing type reference: " - << (void*)inst->base.get() << " " << inst->base - << " with " << (void*)replacement << " " << replacement - << std::endl; - } - auto ninst = mutate(inst); - ninst->base = replacement; - return ninst; - } - - const Expr * VarExprReplacer::postvisit( const VariableExpr * expr ) { - if (!exprMap.count(expr->var)) return expr; - - return exprMap.at(expr->var); - } - - } -} - -} +} // namespace ast // Local Variables: // Index: src/main.cc =================================================================== --- src/main.cc (revision 2c63fa2fd6e5da8767768124941a556b5d239675) +++ src/main.cc (revision 79ee5b3cdc466388553b886527f3d4473a8b4386) @@ -10,6 +10,6 @@ // Created On : Fri May 15 23:12:02 2015 // Last Modified By : Andrew Beach -// Last Modified On : Thu 11 12:18:00 2022 -// Update Count : 677 +// Last Modified On : Thu Sep 15 13:58:00 2022 +// Update Count : 678 // @@ -38,6 +38,4 @@ #include "CodeGen/Generate.h" // for generate #include "CodeGen/LinkOnce.h" // for translateLinkOnce -#include "CodeTools/DeclStats.h" // for printDeclStats -#include "CodeTools/ResolvProtoDump.h" // for dumpAsResolvProto #include "CodeTools/TrackLoc.h" // for fillLocations #include "Common/CodeLocationTools.hpp" // for forceFillCodeLocations @@ -45,7 +43,5 @@ #include "Common/DeclStats.hpp" // for printDeclStats #include "Common/ResolvProtoDump.hpp" // for dumpAsResolverProto -#include "Common/Stats.h" -#include "Common/PassVisitor.h" -#include "Common/SemanticError.h" // for SemanticError +#include "Common/Stats.h" // for Stats #include "Common/UnimplementedError.h" // for UnimplementedError #include "Common/utility.h" // for deleteAll, filter, printAll @@ -53,8 +49,7 @@ #include "Concurrency/Waitfor.h" // for generateWaitfor #include "ControlStruct/ExceptDecl.h" // for translateExcept -#include "ControlStruct/ExceptTranslate.h" // for translateEHM +#include "ControlStruct/ExceptTranslate.h" // for translateThrows, translat... #include "ControlStruct/FixLabels.hpp" // for fixLabels #include "ControlStruct/HoistControlDecls.hpp" // hoistControlDecls -#include "ControlStruct/Mutate.h" // for mutate #include "GenPoly/Box.h" // for box #include "GenPoly/InstantiateGeneric.h" // for instantiateGeneric @@ -66,12 +61,8 @@ #include "Parser/ParseNode.h" // for DeclarationNode, buildList #include "Parser/TypedefTable.h" // for TypedefTable -#include "ResolvExpr/AlternativePrinter.h" // for AlternativePrinter #include "ResolvExpr/CandidatePrinter.hpp" // for printCandidates #include "ResolvExpr/Resolver.h" // for resolve -#include "SymTab/Validate.h" // for validate -#include "SymTab/ValidateType.h" // for linkReferenceToTypes #include "SynTree/LinkageSpec.h" // for Spec, Cforall, Intrinsic #include "SynTree/Declaration.h" // for Declaration -#include "SynTree/Visitor.h" // for acceptAll #include "Tuples/Tuples.h" // for expandMemberTuples, expan... #include "Validate/Autogen.hpp" // for autogenerateRoutines @@ -330,214 +321,129 @@ Stats::Time::StopBlock(); - if( useNewAST ) { - if (Stats::Counters::enabled) { - ast::pass_visitor_stats.avg = Stats::Counters::build>("Average Depth - New"); - ast::pass_visitor_stats.max = Stats::Counters::build>("Max depth - New"); - } - auto transUnit = convert( move( translationUnit ) ); - - forceFillCodeLocations( transUnit ); - - PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) ); - if ( exdeclp ) { - dump( move( transUnit ) ); - return EXIT_SUCCESS; - } - - PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign( transUnit ) ); - PASS( "Hoist Type Decls", Validate::hoistTypeDecls( transUnit ) ); - // Hoist Type Decls pulls some declarations out of contexts where - // locations are not tracked. Perhaps they should be, but for now - // the full fill solves it. - forceFillCodeLocations( transUnit ); - - PASS( "Replace Typedefs", Validate::replaceTypedef( transUnit ) ); - PASS( "Fix Return Types", Validate::fixReturnTypes( transUnit ) ); - PASS( "Enum and Pointer Decay", Validate::decayEnumsAndPointers( transUnit ) ); - - PASS( "Link Reference To Types", Validate::linkReferenceToTypes( transUnit ) ); - - PASS( "Fix Qualified Types", Validate::fixQualifiedTypes( transUnit ) ); - PASS( "Hoist Struct", Validate::hoistStruct( transUnit ) ); - PASS( "Eliminate Typedef", Validate::eliminateTypedef( transUnit ) ); - PASS( "Validate Generic Parameters", Validate::fillGenericParameters( transUnit ) ); - PASS( "Translate Dimensions", Validate::translateDimensionParameters( transUnit ) ); - PASS( "Check Function Returns", Validate::checkReturnStatements( transUnit ) ); - PASS( "Fix Return Statements", InitTweak::fixReturnStatements( transUnit ) ); - PASS( "Implement Concurrent Keywords", Concurrency::implementKeywords( transUnit ) ); - PASS( "Forall Pointer Decay", Validate::decayForallPointers( transUnit ) ); - PASS( "Hoist Control Declarations", ControlStruct::hoistControlDecls( transUnit ) ); - - PASS( "Generate Autogen Routines", Validate::autogenerateRoutines( transUnit ) ); - - PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) ); - PASS( "Implement Thread Start", Concurrency::implementThreadStarter( transUnit ) ); - PASS( "Compound Literal", Validate::handleCompoundLiterals( transUnit ) ); - PASS( "Set Length From Initializer", Validate::setLengthFromInitializer( transUnit ) ); - PASS( "Find Global Decls", Validate::findGlobalDecls( transUnit ) ); - PASS( "Fix Label Address", Validate::fixLabelAddresses( transUnit ) ); - - if ( symtabp ) { - return EXIT_SUCCESS; - } // if - - if ( expraltp ) { - ResolvExpr::printCandidates( transUnit ); - return EXIT_SUCCESS; - } // if - - if ( validp ) { - dump( move( transUnit ) ); - return EXIT_SUCCESS; - } // if - - PASS( "Translate Throws", ControlStruct::translateThrows( transUnit ) ); - PASS( "Fix Labels", ControlStruct::fixLabels( transUnit ) ); - PASS( "Fix Names", CodeGen::fixNames( transUnit ) ); - PASS( "Gen Init", InitTweak::genInit( transUnit ) ); - PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( transUnit ) ); - - if ( libcfap ) { - // Generate the bodies of cfa library functions. - LibCfa::makeLibCfa( transUnit ); - } // if - - if ( declstatsp ) { - printDeclStats( transUnit ); - return EXIT_SUCCESS; - } // if - - if ( bresolvep ) { - dump( move( transUnit ) ); - return EXIT_SUCCESS; - } // if - - if ( resolvprotop ) { - dumpAsResolverProto( transUnit ); - return EXIT_SUCCESS; - } // if - - PASS( "Resolve", ResolvExpr::resolve( transUnit ) ); - if ( exprp ) { - dump( move( transUnit ) ); - return EXIT_SUCCESS; - } // if - - forceFillCodeLocations( transUnit ); - - PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary())); - - // fix ObjectDecl - replaces ConstructorInit nodes - if ( ctorinitp ) { - dump( move( transUnit ) ); - return EXIT_SUCCESS; - } // if - - // Currently not working due to unresolved issues with UniqueExpr - PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( transUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused - - PASS( "Translate Tries", ControlStruct::translateTries( transUnit ) ); - PASS( "Gen Waitfor", Concurrency::generateWaitFor( transUnit ) ); - - // Needs to happen before tuple types are expanded. - PASS( "Convert Specializations", GenPoly::convertSpecializations( transUnit ) ); - - PASS( "Expand Tuples", Tuples::expandTuples( transUnit ) ); - - if ( tuplep ) { - dump( move( transUnit ) ); - return EXIT_SUCCESS; - } // if - - // Must come after Translate Tries. - PASS( "Virtual Expand Casts", Virtual::expandCasts( transUnit ) ); - - PASS( "Instantiate Generics", GenPoly::instantiateGeneric( transUnit ) ); - - translationUnit = convert( move( transUnit ) ); - } else { - PASS( "Translate Exception Declarations", ControlStruct::translateExcept( translationUnit ) ); - if ( exdeclp ) { - dump( translationUnit ); - return EXIT_SUCCESS; - } // if - - // add the assignment statement after the initialization of a type parameter - PASS( "Validate", SymTab::validate( translationUnit ) ); - - if ( symtabp ) { - deleteAll( translationUnit ); - return EXIT_SUCCESS; - } // if - - if ( expraltp ) { - PassVisitor printer( cout ); - acceptAll( translationUnit, printer ); - return EXIT_SUCCESS; - } // if - - if ( validp ) { - dump( translationUnit ); - return EXIT_SUCCESS; - } // if - - PASS( "Translate Throws", ControlStruct::translateThrows( translationUnit ) ); - PASS( "Fix Labels", ControlStruct::fixLabels( translationUnit ) ); - PASS( "Fix Names", CodeGen::fixNames( translationUnit ) ); - PASS( "Gen Init", InitTweak::genInit( translationUnit ) ); - PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) ); - - if ( libcfap ) { - // Generate the bodies of cfa library functions. - LibCfa::makeLibCfa( translationUnit ); - } // if - - if ( declstatsp ) { - CodeTools::printDeclStats( translationUnit ); - deleteAll( translationUnit ); - return EXIT_SUCCESS; - } // if - - if ( bresolvep ) { - dump( translationUnit ); - return EXIT_SUCCESS; - } // if - - CodeTools::fillLocations( translationUnit ); - - if ( resolvprotop ) { - CodeTools::dumpAsResolvProto( translationUnit ); - return EXIT_SUCCESS; - } // if - - PASS( "Resolve", ResolvExpr::resolve( translationUnit ) ); - if ( exprp ) { - dump( translationUnit ); - return EXIT_SUCCESS; - } - - PASS( "Fix Init", InitTweak::fix( translationUnit, buildingLibrary() ) ); - - // fix ObjectDecl - replaces ConstructorInit nodes - if ( ctorinitp ) { - dump ( translationUnit ); - return EXIT_SUCCESS; - } // if - - PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused - PASS( "Translate Tries", ControlStruct::translateTries( translationUnit ) ); - PASS( "Gen Waitfor", Concurrency::generateWaitFor( translationUnit ) ); - PASS( "Convert Specializations", GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded - PASS( "Expand Tuples", Tuples::expandTuples( translationUnit ) ); // xxx - is this the right place for this? - - if ( tuplep ) { - dump( translationUnit ); - return EXIT_SUCCESS; - } // if - - PASS( "Virtual Expand Casts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM - - PASS( "Instantiate Generics", GenPoly::instantiateGeneric( translationUnit ) ); + if (Stats::Counters::enabled) { + ast::pass_visitor_stats.avg = Stats::Counters::build>("Average Depth - New"); + ast::pass_visitor_stats.max = Stats::Counters::build>("Max depth - New"); } + auto transUnit = convert( move( translationUnit ) ); + + forceFillCodeLocations( transUnit ); + + PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) ); + if ( exdeclp ) { + dump( move( transUnit ) ); + return EXIT_SUCCESS; + } + + PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign( transUnit ) ); + PASS( "Hoist Type Decls", Validate::hoistTypeDecls( transUnit ) ); + // Hoist Type Decls pulls some declarations out of contexts where + // locations are not tracked. Perhaps they should be, but for now + // the full fill solves it. + forceFillCodeLocations( transUnit ); + + PASS( "Replace Typedefs", Validate::replaceTypedef( transUnit ) ); + PASS( "Fix Return Types", Validate::fixReturnTypes( transUnit ) ); + PASS( "Enum and Pointer Decay", Validate::decayEnumsAndPointers( transUnit ) ); + + PASS( "Link Reference To Types", Validate::linkReferenceToTypes( transUnit ) ); + + PASS( "Fix Qualified Types", Validate::fixQualifiedTypes( transUnit ) ); + PASS( "Hoist Struct", Validate::hoistStruct( transUnit ) ); + PASS( "Eliminate Typedef", Validate::eliminateTypedef( transUnit ) ); + PASS( "Validate Generic Parameters", Validate::fillGenericParameters( transUnit ) ); + PASS( "Translate Dimensions", Validate::translateDimensionParameters( transUnit ) ); + PASS( "Check Function Returns", Validate::checkReturnStatements( transUnit ) ); + PASS( "Fix Return Statements", InitTweak::fixReturnStatements( transUnit ) ); + PASS( "Implement Concurrent Keywords", Concurrency::implementKeywords( transUnit ) ); + PASS( "Forall Pointer Decay", Validate::decayForallPointers( transUnit ) ); + PASS( "Hoist Control Declarations", ControlStruct::hoistControlDecls( transUnit ) ); + + PASS( "Generate Autogen Routines", Validate::autogenerateRoutines( transUnit ) ); + + PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) ); + PASS( "Implement Thread Start", Concurrency::implementThreadStarter( transUnit ) ); + PASS( "Compound Literal", Validate::handleCompoundLiterals( transUnit ) ); + PASS( "Set Length From Initializer", Validate::setLengthFromInitializer( transUnit ) ); + PASS( "Find Global Decls", Validate::findGlobalDecls( transUnit ) ); + PASS( "Fix Label Address", Validate::fixLabelAddresses( transUnit ) ); + + if ( symtabp ) { + return EXIT_SUCCESS; + } // if + + if ( expraltp ) { + ResolvExpr::printCandidates( transUnit ); + return EXIT_SUCCESS; + } // if + + if ( validp ) { + dump( move( transUnit ) ); + return EXIT_SUCCESS; + } // if + + PASS( "Translate Throws", ControlStruct::translateThrows( transUnit ) ); + PASS( "Fix Labels", ControlStruct::fixLabels( transUnit ) ); + PASS( "Fix Names", CodeGen::fixNames( transUnit ) ); + PASS( "Gen Init", InitTweak::genInit( transUnit ) ); + PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( transUnit ) ); + + if ( libcfap ) { + // Generate the bodies of cfa library functions. + LibCfa::makeLibCfa( transUnit ); + } // if + + if ( declstatsp ) { + printDeclStats( transUnit ); + return EXIT_SUCCESS; + } // if + + if ( bresolvep ) { + dump( move( transUnit ) ); + return EXIT_SUCCESS; + } // if + + if ( resolvprotop ) { + dumpAsResolverProto( transUnit ); + return EXIT_SUCCESS; + } // if + + PASS( "Resolve", ResolvExpr::resolve( transUnit ) ); + if ( exprp ) { + dump( move( transUnit ) ); + return EXIT_SUCCESS; + } // if + + forceFillCodeLocations( transUnit ); + + PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary())); + + // fix ObjectDecl - replaces ConstructorInit nodes + if ( ctorinitp ) { + dump( move( transUnit ) ); + return EXIT_SUCCESS; + } // if + + // Currently not working due to unresolved issues with UniqueExpr + PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( transUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused + + PASS( "Translate Tries", ControlStruct::translateTries( transUnit ) ); + PASS( "Gen Waitfor", Concurrency::generateWaitFor( transUnit ) ); + + // Needs to happen before tuple types are expanded. + PASS( "Convert Specializations", GenPoly::convertSpecializations( transUnit ) ); + + PASS( "Expand Tuples", Tuples::expandTuples( transUnit ) ); + + if ( tuplep ) { + dump( move( transUnit ) ); + return EXIT_SUCCESS; + } // if + + // Must come after Translate Tries. + PASS( "Virtual Expand Casts", Virtual::expandCasts( transUnit ) ); + + PASS( "Instantiate Generics", GenPoly::instantiateGeneric( transUnit ) ); + + translationUnit = convert( move( transUnit ) ); if ( genericsp ) {