Class rename and cleaning up unneeded classes

avishek-sen-gupta · Nov 17, 2024 · 7d26c73 · 7d26c73
1 parent f891f00
commit 7d26c73
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 89 deletions.
diff --git a/.../main/java/org/smojol/common/transpiler/BuildImplicitInstructionControlFlowgraphTask.java b/.../main/java/org/smojol/common/transpiler/BuildImplicitInstructionControlFlowgraphTask.java
@@ -133,8 +133,6 @@ private TranspilerInstruction resolveNode(LocationNode locationNode, List<Transp
                     entry(nextLocation(instructions, currentAddress), transpilerNodeMap, instructions);
             case ExitIterationScopeLocationNode s ->
                     exit(iterationExit(currentAddress, instructions), transpilerNodeMap, instructions);
-            case IdLocationNode i ->
-                    instructions.stream().filter(instr -> instr.ref().id().equals(i.getDestination().id()) && instr.sentinel() == i.getSentinel()).findFirst().get();
             default -> TranspilerInstruction.NULL;
         };
     }

diff --git a/smojol-core/src/main/java/org/smojol/common/transpiler/BuildInstructionFlowgraphTask.java b/smojol-core/src/main/java/org/smojol/common/transpiler/BuildInstructionFlowgraphTask.java
@@ -131,8 +131,6 @@ private TranspilerInstruction resolveNode(LocationNode locationNode, List<Transp
                     entry(nextLocation(instructions, currentAddress), transpilerNodeMap, instructions);
             case ExitIterationScopeLocationNode s ->
                     exit(iterationExit(currentAddress, instructions), transpilerNodeMap, instructions);
-            case IdLocationNode i ->
-                    instructions.stream().filter(instr -> instr.ref().id().equals(i.getDestination().id()) && instr.sentinel() == i.getSentinel()).findFirst().get();
             default -> TranspilerInstruction.NULL;
         };
     }

diff --git a/smojol-core/src/main/java/org/smojol/common/transpiler/IdLocationNode.java b/smojol-core/src/main/java/org/smojol/common/transpiler/IdLocationNode.java
diff --git a/smojol-core/src/main/java/org/smojol/common/transpiler/InstructionLocationNode.java b/smojol-core/src/main/java/org/smojol/common/transpiler/InstructionLocationNode.java
diff --git a/smojol-core/src/main/java/org/smojol/common/transpiler/TranspilerCloneOperation.java b/smojol-core/src/main/java/org/smojol/common/transpiler/TranspilerCloneOperation.java
@@ -31,11 +31,9 @@ public static TranspilerNode clone(TranspilerNode original, List<TranspilerNode>
             case NestedConditionNode n -> new NestedConditionNode(n.getExpression());
             case NextLocationNode n -> new NextLocationNode();
             case NamedLocationNode n -> new NamedLocationNode(n.getName());
-            case InstructionLocationNode n -> new InstructionLocationNode(n.getNode());
             case ExitTranspilerNode n -> new ExitTranspilerNode();
             case ExitIterationScopeLocationNode n -> new ExitIterationScopeLocationNode();
             case ProgramTerminalLocationNode n -> new ProgramTerminalLocationNode();
-            case IdLocationNode n -> new IdLocationNode(n.getDestination(), n.getSentinel());
             case PrintTranspilerNode n -> new PrintTranspilerNode(n.getOperands());
             case SetTranspilerNode n -> new SetTranspilerNode(n.getSource(), n.getDestination());
             case LabelledTranspilerCodeBlockNode n ->

diff --git a/...re/src/main/java/org/smojol/common/transpiler/instruction/ConditionalJumpInstruction.java b/...re/src/main/java/org/smojol/common/transpiler/instruction/ConditionalJumpInstruction.java
diff --git a/smojol-core/src/main/java/org/smojol/common/transpiler/instruction/JumpInstruction.java b/smojol-core/src/main/java/org/smojol/common/transpiler/instruction/JumpInstruction.java
diff --git a/...sis/task/analysis/BuildSeedModelTask.java → ...sis/task/analysis/BuildBaseModelTask.java b/...sis/task/analysis/BuildSeedModelTask.java → ...sis/task/analysis/BuildBaseModelTask.java
@@ -19,11 +19,11 @@
 
 import java.io.IOException;
 
-public class BuildSeedModelTask implements AnalysisTask {
+public class BuildBaseModelTask implements AnalysisTask {
     private final ParsePipeline pipeline;
     private final IdProvider idProvider;
 
-    public BuildSeedModelTask(ParsePipeline pipeline, IdProvider idProvider) {
+    public BuildBaseModelTask(ParsePipeline pipeline, IdProvider idProvider) {
         this.pipeline = pipeline;
         this.idProvider = idProvider;
     }

diff --git a/smojol-toolkit/src/main/java/org/smojol/toolkit/task/SmojolTasks.java b/smojol-toolkit/src/main/java/org/smojol/toolkit/task/SmojolTasks.java
@@ -175,7 +175,7 @@ public AnalysisTaskResult run() {
     public AnalysisTask BUILD_BASE_ANALYSIS = new AnalysisTask() {
         @Override
         public AnalysisTaskResult run() {
-            AnalysisTaskResult result = new BuildSeedModelTask(pipeline, idProvider).run();
+            AnalysisTaskResult result = new BuildBaseModelTask(pipeline, idProvider).run();
             return switch (result) {
                 case AnalysisTaskResultOK o -> {
                     baseModel = o.getDetail();

diff --git a/...kit/src/test/java/org/smojol/toolkit/analysis/task/ExportToGraphMLTaskRegressionTest.java b/...kit/src/test/java/org/smojol/toolkit/analysis/task/ExportToGraphMLTaskRegressionTest.java
@@ -18,7 +18,7 @@
 import org.smojol.toolkit.analysis.pipeline.ParsePipeline;
 import org.smojol.toolkit.analysis.pipeline.config.GraphMLExportConfig;
 import org.smojol.toolkit.analysis.pipeline.config.SourceConfig;
-import org.smojol.toolkit.analysis.task.analysis.BuildSeedModelTask;
+import org.smojol.toolkit.analysis.task.analysis.BuildBaseModelTask;
 import org.smojol.toolkit.analysis.task.analysis.ExportToGraphMLTask;
 import org.smojol.toolkit.interpreter.structure.OccursIgnoringFormat1DataStructureBuilder;
 import org.smojol.toolkit.task.AnalysisTaskResult;
@@ -43,7 +43,7 @@ void canCreateDataStructures() {
                 new EntityNavigatorBuilder(), new UnresolvedReferenceThrowStrategy(),
                 new OccursIgnoringFormat1DataStructureBuilder(), new UUIDProvider(), resourceOperations);
         ParsePipeline pipeline = new ParsePipeline(sourceConfig, ops, LanguageDialect.COBOL);
-        AnalysisTaskResult buildSeedModelResult = new BuildSeedModelTask(pipeline, new UUIDProvider()).run();
+        AnalysisTaskResult buildSeedModelResult = new BuildBaseModelTask(pipeline, new UUIDProvider()).run();
         switch (buildSeedModelResult) {
             case AnalysisTaskResultOK o -> {
                 BaseAnalysisModel r = o.getDetail();