Changeset ed96731

Timestamp:

Nov 18, 2024, 3:43:38 PM (4 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

29075d1

Parents:

0dffe91

Message:

With{Stmts,Decls}ToAdd? how has an -X version like WithSymbolTableX. Although these -X versions might be useful can could possibly be removed in the future. (This is a therapy commit.)

Location:

src

Files:

• AST/Pass.hpp (modified) (1 diff)
• Concurrency/Actors.cpp (modified) (2 diffs)
• Concurrency/Corun.cpp (modified) (1 diff)
• Concurrency/Keywords.cpp (modified) (3 diffs)
• Concurrency/Waituntil.cpp (modified) (1 diff)
• ControlStruct/ExceptDecl.cpp (modified) (1 diff)
• GenPoly/Box.cpp (modified) (3 diffs)
• GenPoly/InstantiateGeneric.cpp (modified) (2 diffs)
• GenPoly/Lvalue.cpp (modified) (1 diff)
• GenPoly/Specialize.cpp (modified) (1 diff)
• InitTweak/FixInit.cpp (modified) (4 diffs)
• InitTweak/GenInit.cpp (modified) (2 diffs)
• ResolvExpr/Resolver.cpp (modified) (1 diff)
• Tuples/TupleExpansion.cpp (modified) (2 diffs)
• Validate/Autogen.cpp (modified) (1 diff)
• Validate/CompoundLiteral.cpp (modified) (1 diff)
• Validate/HoistStruct.cpp (modified) (1 diff)
• Validate/HoistTypeDecls.cpp (modified) (1 diff)
• Validate/ImplementEnumFunc.cpp (modified) (1 diff)
• Validate/LinkInstanceTypes.cpp (modified) (1 diff)
• Validate/ReplaceTypedef.cpp (modified) (1 diff)
• Virtual/VirtualDtor.cpp (modified) (2 diffs)

src/AST/Pass.hpp ¶

@@ -327 +327 @@
 /// The Pass template handles what *before* and *after* means automatically
 template< template<class...> class container_t = std::list >
-struct WithStmtsToAdd {
+struct WithStmtsToAddX {
         container_t< ptr<Stmt> > stmtsToAddBefore;
         container_t< ptr<Stmt> > stmtsToAddAfter;
 };
+
+struct WithStmtsToAdd : public WithStmtsToAddX<> {};
 
 /// Used if visitor requires added declarations before or after the current node.
 /// The Pass template handles what *before* and *after* means automatically
 template< template<class...> class container_t = std::list >
-struct WithDeclsToAdd {
+struct WithDeclsToAddX {
         container_t< ptr<Decl> > declsToAddBefore;
         container_t< ptr<Decl> > declsToAddAfter;
 };
+
+struct WithDeclsToAdd : public WithDeclsToAddX<> {};
 
 /// Use if visitation should stop at certain levels

src/Concurrency/Actors.cpp ¶

@@ -194 +194 @@
 // collects data needed for next pass that does the circular defn resolution
 //     for message send operators (via table above)
-struct GenFuncsCreateTables : public ast::WithDeclsToAdd<> {
+struct GenFuncsCreateTables : public ast::WithDeclsToAdd {
         unordered_set<const StructDecl *> & actorStructDecls;
         unordered_set<const StructDecl *>  & messageStructDecls;
@@ -451 +451 @@
 // separate pass is needed since this pass resolves circular defn issues
 // generates the forward declarations of the send operator for actor routines
-struct FwdDeclOperator : public ast::WithDeclsToAdd<> {
+struct FwdDeclOperator : public ast::WithDeclsToAdd {
         unordered_set<const StructDecl *> & actorStructDecls;
         unordered_set<const StructDecl *>  & messageStructDecls;

src/Concurrency/Corun.cpp ¶

@@ -25 +25 @@
 namespace Concurrency {
 
-struct CorunKeyword : public WithDeclsToAdd<>, public WithStmtsToAdd<> {
+struct CorunKeyword : public WithDeclsToAdd, public WithStmtsToAdd {
         UniqueName CorunFnNamer = "__CFA_corun_lambda_"s;
         UniqueName CoforFnNamer = "__CFA_cofor_lambda_"s;

src/Concurrency/Keywords.cpp ¶

@@ -117 +117 @@
 
 // --------------------------------------------------------------------------
-struct ConcurrentSueKeyword : public ast::WithDeclsToAdd<> {
+struct ConcurrentSueKeyword : public ast::WithDeclsToAdd {
         ConcurrentSueKeyword(
                 std::string&& type_name, std::string&& field_name,
@@ -639 +639 @@
 // --------------------------------------------------------------------------
 struct SuspendKeyword final :
-                public ast::WithStmtsToAdd<>, public ast::WithGuards {
+                public ast::WithStmtsToAdd, public ast::WithGuards {
         SuspendKeyword() = default;
         virtual ~SuspendKeyword() = default;
@@ -860 +860 @@
 
 // --------------------------------------------------------------------------
-struct MutexKeyword final : public ast::WithDeclsToAdd<> {
+struct MutexKeyword final : public ast::WithDeclsToAdd {
         const ast::FunctionDecl * postvisit( const ast::FunctionDecl * decl );
         void postvisit( const ast::StructDecl * decl );

src/Concurrency/Waituntil.cpp ¶

@@ -1398 +1398 @@
 // To add the predicates at global scope we need to do it in a second pass
 // Predicates are added after "struct select_node { ... };"
-class AddPredicateDecls final : public WithDeclsToAdd<> {
+class AddPredicateDecls final : public WithDeclsToAdd {
         vector<FunctionDecl *> & satFns;
         const StructDecl * selectNodeDecl = nullptr;

src/ControlStruct/ExceptDecl.cpp ¶

@@ -401 +401 @@
 }
 
-struct ExceptDeclCore : public ast::WithDeclsToAdd<> {
+struct ExceptDeclCore : public ast::WithDeclsToAdd {
         ast::StructDecl const * transformExcept( ast::StructDecl const * decl );
         ast::ObjectDecl const * transformVTable(

src/GenPoly/Box.cpp ¶

@@ -55 +55 @@
 /// Adds layout-generation functions to polymorphic types.
 struct LayoutFunctionBuilder final :
-                public ast::WithDeclsToAdd<>,
+                public ast::WithDeclsToAdd,
                 public ast::WithShortCircuiting,
                 public ast::WithVisitorRef<LayoutFunctionBuilder> {
@@ -344 +344 @@
                 public ast::WithGuards,
                 public ast::WithShortCircuiting,
-                public ast::WithStmtsToAdd<>,
+                public ast::WithStmtsToAdd,
                 public ast::WithVisitorRef<CallAdapter> {
         CallAdapter();
@@ -1575 +1575 @@
 struct PolyGenericCalculator final :
                 public ast::WithConstTypeSubstitution,
-                public ast::WithDeclsToAdd<>,
+                public ast::WithDeclsToAdd,
                 public ast::WithGuards,
-                public ast::WithStmtsToAdd<>,
+                public ast::WithStmtsToAdd,
                 public ast::WithVisitorRef<PolyGenericCalculator> {
         PolyGenericCalculator();

src/GenPoly/InstantiateGeneric.cpp ¶

@@ -277 +277 @@
                 public ast::WithVisitorRef<FixDtypeStatic>,
                 public ast::WithShortCircuiting,
-                public ast::WithStmtsToAdd<> {
+                public ast::WithStmtsToAdd {
         ast::ApplicationExpr const * previsit( ast::ApplicationExpr const * expr );
         void previsit( ast::AddressExpr const * expr );
@@ -421 +421 @@
                 public ast::WithCodeLocation,
                 public ast::WithConstTypeSubstitution,
-                public ast::WithDeclsToAdd<>,
+                public ast::WithDeclsToAdd,
                 public ast::WithGuards,
                 public ast::WithVisitorRef<GenericInstantiator>

src/GenPoly/Lvalue.cpp ¶

@@ -85 +85 @@
 struct ReferenceConversions final :
                 public ast::WithConstTranslationUnit,
-                public ast::WithGuards, public ast::WithStmtsToAdd<> {
+                public ast::WithGuards, public ast::WithStmtsToAdd {
         ast::Expr const * postvisit( ast::CastExpr const * expr );
         ast::Expr const * postvisit( ast::AddressExpr const * expr );

src/GenPoly/Specialize.cpp ¶

@@ -30 +30 @@
 struct SpecializeCore final :
                 public ast::WithConstTypeSubstitution,
-                public ast::WithDeclsToAdd<>,
+                public ast::WithDeclsToAdd,
                 public ast::WithVisitorRef<SpecializeCore> {
         std::string paramPrefix = "_p";

src/InitTweak/FixInit.cpp ¶

@@ -105 +105 @@
 /// generate/resolve copy construction expressions for each, and generate/resolve destructors for both
 /// arguments and return value temporaries
-struct ResolveCopyCtors final : public ast::WithGuards, public ast::WithStmtsToAdd<>, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithVisitorRef<ResolveCopyCtors>, public ast::WithConstTranslationUnit {
+struct ResolveCopyCtors final : public ast::WithGuards, public ast::WithStmtsToAdd, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithVisitorRef<ResolveCopyCtors>, public ast::WithConstTranslationUnit {
         const ast::Expr * postvisit( const ast::ImplicitCopyCtorExpr * impCpCtorExpr );
         const ast::StmtExpr * previsit( const ast::StmtExpr * stmtExpr );
@@ -177 +177 @@
 /// insert destructor calls at the appropriate places.  must happen before CtorInit nodes are removed
 /// (currently by FixInit)
-struct InsertDtors final : public ObjDeclCollector, public ast::WithStmtsToAdd<> {
+struct InsertDtors final : public ObjDeclCollector, public ast::WithStmtsToAdd {
         InsertDtors( ast::Pass<LabelFinder> & finder ) : finder( finder ), labelVars( finder.core.vars ) {}
 
@@ -194 +194 @@
 
 /// expand each object declaration to use its constructor after it is declared.
-struct FixInit : public ast::WithStmtsToAdd<> {
+struct FixInit : public ast::WithStmtsToAdd {
         static void fixInitializers( ast::TranslationUnit &translationUnit );
 
@@ -230 +230 @@
 
 /// expands ConstructorExpr nodes into comma expressions, using a temporary for the first argument
-struct FixCtorExprs final : public ast::WithDeclsToAdd<>, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithConstTranslationUnit {
+struct FixCtorExprs final : public ast::WithDeclsToAdd, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithConstTranslationUnit {
         const ast::Expr * postvisit( const ast::ConstructorExpr * ctorExpr );
 };

src/InitTweak/GenInit.cpp ¶

@@ -46 +46 @@
         // Outer pass finds declarations, for their type could wrap a type that needs hoisting
         struct HoistArrayDimension_NoResolve final :
-                        public ast::WithDeclsToAdd<>, public ast::WithShortCircuiting,
+                        public ast::WithDeclsToAdd, public ast::WithShortCircuiting,
                         public ast::WithGuards, public ast::WithConstTranslationUnit,
                         public ast::WithVisitorRef<HoistArrayDimension_NoResolve>,
@@ -205 +205 @@
 
         struct ReturnFixer final :
-                        public ast::WithStmtsToAdd<>, ast::WithGuards, ast::WithShortCircuiting {
+                        public ast::WithStmtsToAdd, ast::WithGuards, ast::WithShortCircuiting {
                 void previsit( const ast::FunctionDecl * decl );
                 const ast::ReturnStmt * previsit( const ast::ReturnStmt * stmt );

src/ResolvExpr/Resolver.cpp ¶

@@ -375 +375 @@
 : public ast::WithSymbolTable, public ast::WithGuards,
   public ast::WithVisitorRef<Resolver>, public ast::WithShortCircuiting,
-  public ast::WithStmtsToAdd<> {
+  public ast::WithStmtsToAdd {
 
         ast::ptr< ast::Type > functionReturn = nullptr;

src/Tuples/TupleExpansion.cpp ¶

@@ -28 +28 @@
 };
 
-struct UniqueExprExpander final : public ast::WithDeclsToAdd<> {
+struct UniqueExprExpander final : public ast::WithDeclsToAdd {
         const ast::Expr * postvisit( const ast::UniqueExpr * unqExpr );
         // Not a vector, because they may not be adding in increasing order.
@@ -37 +37 @@
 struct TupleMainExpander final :
                 public ast::WithCodeLocation,
-                public ast::WithDeclsToAdd<>,
+                public ast::WithDeclsToAdd,
                 public ast::WithGuards,
                 public ast::WithVisitorRef<TupleMainExpander> {

src/Validate/Autogen.cpp ¶

@@ -50 +50 @@
 // --------------------------------------------------------------------------
 struct AutogenerateRoutines final :
-                public ast::WithDeclsToAdd<>,
+                public ast::WithDeclsToAdd,
                 public ast::WithShortCircuiting {
         void previsit( const ast::EnumDecl * enumDecl );

src/Validate/CompoundLiteral.cpp ¶

@@ -27 +27 @@
 
 struct CompoundLiteral final :
-                public ast::WithDeclsToAdd<> {
+                public ast::WithDeclsToAdd {
         ast::Storage::Classes storageClasses;
 

src/Validate/HoistStruct.cpp ¶

@@ -68 +68 @@
  */
 struct HoistStructCore final :
-                public ast::WithDeclsToAdd<>, public ast::WithGuards {
+                public ast::WithDeclsToAdd, public ast::WithGuards {
         ast::StructDecl const * previsit( ast::StructDecl const * decl );
         ast::StructDecl const * postvisit( ast::StructDecl const * decl );

src/Validate/HoistTypeDecls.cpp ¶

@@ -22 +22 @@
 namespace {
 
-struct HoistTypeDecls final : public ast::WithDeclsToAdd<> {
+struct HoistTypeDecls final : public ast::WithDeclsToAdd {
         void previsit( ast::SizeofExpr const * );
         void previsit( ast::AlignofExpr const * );

src/Validate/ImplementEnumFunc.cpp ¶

@@ -472 +472 @@
 
 struct ImplementEnumFunc final :
-                public ast::WithDeclsToAdd<>, public ast::WithShortCircuiting {
+                public ast::WithDeclsToAdd, public ast::WithShortCircuiting {
         void previsit(const ast::EnumDecl* enumDecl);
         void previsit(const ast::FunctionDecl* functionDecl);

src/Validate/LinkInstanceTypes.cpp ¶

@@ -27 +27 @@
 struct LinkTypesCore : public WithNoIdSymbolTable,
                 public ast::WithCodeLocation,
-                public ast::WithDeclsToAdd<>,
+                public ast::WithDeclsToAdd,
                 public ast::WithGuards,
                 public ast::WithShortCircuiting,

src/Validate/ReplaceTypedef.cpp ¶

@@ -28 +28 @@
 struct ReplaceTypedefCore final :
                 public ast::WithCodeLocation,
-                public ast::WithDeclsToAdd<>,
+                public ast::WithDeclsToAdd,
                 public ast::WithGuards,
                 public ast::WithShortCircuiting,

src/Virtual/VirtualDtor.cpp ¶

@@ -119 +119 @@
 // collects data needed for next pass that does the circular defn resolution
 //     for dtor setters and delete fns (via table above)
-struct GenFuncsCreateTables : public ast::WithDeclsToAdd<> {
+struct GenFuncsCreateTables : public ast::WithDeclsToAdd {
         unordered_map<const StructDecl *, CtorDtor> & structDecls;
         CtorDtorTable & torDecls;
@@ -351 +351 @@
 // separate pass is needed since  __CFA_set_dtor needs to be defined after
 //   the last dtor defn which is found in prior pass
-struct GenSetDtor : public ast::WithDeclsToAdd<> {
+struct GenSetDtor : public ast::WithDeclsToAdd {
         unordered_map<const StructDecl *, CtorDtor> & structDecls; // set of decls that inherit from virt dtor
         CtorDtorTable & torDecls;