Rename OneTimeRewriter to IncrementalRewriter

sgizler · sgizler · commit 15ed7dfcd970 · 2026-03-17T17:07:39.000+01:00
Speculative reduction scheme made previous name misleading
diff --git a/source/BindRemover.cpp b/source/BindRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class BindRemover : public OneTimeRewriter<BindRemover> {
+class BindRemover : public IncrementalRewriter<BindRemover> {
    public:
     ShouldVisitChildren handle(const BindDirectiveSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/BodyPartsRemover.cpp b/source/BodyPartsRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class BodyPartsRemover : public OneTimeRewriter<BodyPartsRemover> {
+class BodyPartsRemover : public IncrementalRewriter<BodyPartsRemover> {
    public:
     ShouldVisitChildren handle(const LoopGenerateSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/BodyRemover.cpp b/source/BodyRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class BodyRemover : public OneTimeRewriter<BodyRemover> {
+class BodyRemover : public IncrementalRewriter<BodyRemover> {
    public:
     ShouldVisitChildren handle(const ClassDeclarationSyntax& node, bool isNodeRemovable) {
         removeChildList(node, node.items);
diff --git a/source/ContAssignRemover.cpp b/source/ContAssignRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class ContAssignRemover : public OneTimeRewriter<ContAssignRemover> {
+class ContAssignRemover : public IncrementalRewriter<ContAssignRemover> {
    public:
     ShouldVisitChildren handle(const ContinuousAssignSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/DeclRemover.cpp b/source/DeclRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class DeclRemover : public OneTimeRewriter<DeclRemover> {
+class DeclRemover : public IncrementalRewriter<DeclRemover> {
    public:
     ShouldVisitChildren handle(const FunctionDeclarationSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/ImportsRemover.cpp b/source/ImportsRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class ImportsRemover : public OneTimeRewriter<ImportsRemover> {
+class ImportsRemover : public IncrementalRewriter<ImportsRemover> {
    public:
     ShouldVisitChildren handle(const PackageImportDeclarationSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/IncrementalRewriter.hpp b/source/IncrementalRewriter.hpp
@@ -18,7 +18,7 @@ struct CheckPoint {
 };
 
 template <typename TDerived>
-class OneTimeRewriter : public SyntaxRewriter<TDerived> {
+class IncrementalRewriter : public SyntaxRewriter<TDerived> {
     // Incremental node rewriter - each transform() yields n rewrites at most
    public:
     enum State {
@@ -241,7 +241,7 @@ enum class RewriteResult {
 };
 
 template <typename TDerived>
-RewriteResult rewrite(OneTimeRewriter<TDerived>& rewriter,
+RewriteResult rewrite(IncrementalRewriter<TDerived>& rewriter,
                       std::shared_ptr<SyntaxTree>& tree,
                       std::string stageName,
                       std::string passIdx,
@@ -263,7 +263,7 @@ RewriteResult rewrite(OneTimeRewriter<TDerived>& rewriter,
 }
 
 template <typename TDerived>
-size_t rewriteBisectFailed(OneTimeRewriter<TDerived>& rewriter,
+size_t rewriteBisectFailed(IncrementalRewriter<TDerived>& rewriter,
                            std::shared_ptr<SyntaxTree>& tree,
                            std::string stageName,
                            std::string passIdx,
@@ -288,7 +288,7 @@ size_t rewriteBisectFailed(OneTimeRewriter<TDerived>& rewriter,
 }
 
 template <typename TDerived>
-size_t rewriteBisect(OneTimeRewriter<TDerived>& rewriter,
+size_t rewriteBisect(IncrementalRewriter<TDerived>& rewriter,
                      std::shared_ptr<SyntaxTree>& tree,
                      std::string stageName,
                      std::string passIdx,
@@ -326,7 +326,7 @@ bool rewriteLoop(std::shared_ptr<SyntaxTree>& tree,
                  std::string passIdx,
                  SvBugpoint* svBugpoint) {
     using enum RewriteResult;
-    OneTimeRewriter<TDerived> rewriter;
+    IncrementalRewriter<TDerived> rewriter;
     bool committed = false;
     size_t rewriteLimit = svBugpoint->n_at_once;
     while (!rewriter.traversalDone) {
diff --git a/source/IncrementalRewritersFwd.hpp b/source/IncrementalRewritersFwd.hpp
diff --git a/source/InstantationRemover.cpp b/source/InstantationRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class InstantationRemover : public OneTimeRewriter<InstantationRemover> {
+class InstantationRemover : public IncrementalRewriter<InstantationRemover> {
    public:
     ShouldVisitChildren handle(const HierarchyInstantiationSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/LabelRemover.cpp b/source/LabelRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class LabelRemover : public OneTimeRewriter<LabelRemover> {
+class LabelRemover : public IncrementalRewriter<LabelRemover> {
    public:
     ShouldVisitChildren handle(const NamedBlockClauseSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/MemberRemover.cpp b/source/MemberRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class MemberRemover : public OneTimeRewriter<MemberRemover> {
+class MemberRemover : public IncrementalRewriter<MemberRemover> {
    public:
     ShouldVisitChildren handle(const DataDeclarationSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/ModportRemover.cpp b/source/ModportRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class ModportRemover : public OneTimeRewriter<ModportRemover> {
+class ModportRemover : public IncrementalRewriter<ModportRemover> {
    public:
     ShouldVisitChildren handle(const ModportDeclarationSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/ModuleRemover.cpp b/source/ModuleRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class ModuleRemover : public OneTimeRewriter<ModuleRemover> {
+class ModuleRemover : public IncrementalRewriter<ModuleRemover> {
    public:
     ShouldVisitChildren handle(const ModuleDeclarationSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/ParamAssignRemover.cpp b/source/ParamAssignRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class ParamAssignRemover : public OneTimeRewriter<ParamAssignRemover> {
+class ParamAssignRemover : public IncrementalRewriter<ParamAssignRemover> {
    public:
     ShouldVisitChildren handle(const ParameterValueAssignmentSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/StatementsRemover.cpp b/source/StatementsRemover.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
-class StatementsRemover : public OneTimeRewriter<StatementsRemover> {
+class StatementsRemover : public IncrementalRewriter<StatementsRemover> {
    public:
     ShouldVisitChildren handle(const ProceduralBlockSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
diff --git a/source/SvBugpoint.cpp b/source/SvBugpoint.cpp
@@ -9,7 +9,7 @@
 #include <filesystem>
 #include <fstream>
 #include <iostream>
-#include "OneTimeRewritersFwd.hpp"
+#include "IncrementalRewritersFwd.hpp"
 #include "SetRemovers.hpp"
 #include "Utils.hpp"
 
diff --git a/source/SvBugpoint.hpp b/source/SvBugpoint.hpp
@@ -103,7 +103,7 @@ class SvBugpoint {
 
     // Speculatively merge up to n minimization attempts into
     // single one to reduce check script calls.
-    // Currently it only applies to OneTimeRewriters.
+    // Currently it only applies to IncrementalRewriters.
     int n_at_once = 32;
 
    private:
diff --git a/source/TypeSimplifier.cpp b/source/TypeSimplifier.cpp
@@ -1,4 +1,4 @@
-#include "OneTimeRewriter.hpp"
+#include "IncrementalRewriter.hpp"
 
 class IsPrimitive : public SyntaxVisitor<IsPrimitive> {
    public:
@@ -18,7 +18,7 @@ class IsPrimitive : public SyntaxVisitor<IsPrimitive> {
     void handle(const ImplicitTypeSyntax& t) { isPrimitive = true; }
 };
 
-class TypeSimplifier : public OneTimeRewriter<TypeSimplifier> {
+class TypeSimplifier : public IncrementalRewriter<TypeSimplifier> {
     // replace references to user-defined types with int
    public:
     bool canSimplify(not_null<const DataTypeSyntax*> node) {
