From ab0dd38b53ab1f2c4fc9214abc0302c50ff85786 Mon Sep 17 00:00:00 2001
From: Jan Gruteser <jan.gruteser@hhu.de>
Date: Mon, 13 Jan 2025 09:51:22 +0100
Subject: [PATCH] minor simplifications
---
src/main/java/de/tla2b/TLA2B.java | 5 ++--
.../java/de/tla2b/analysis/BOperation.java | 23 ++++---------------
src/main/java/de/tla2bAst/Translator.java | 5 ++--
3 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/src/main/java/de/tla2b/TLA2B.java b/src/main/java/de/tla2b/TLA2B.java
index 73d1a8e..8571015 100644
--- a/src/main/java/de/tla2b/TLA2B.java
+++ b/src/main/java/de/tla2b/TLA2B.java
@@ -3,12 +3,13 @@ package de.tla2b;
import de.tla2b.exceptions.TLA2BFrontEndException;
import de.tla2b.exceptions.NotImplementedException;
import de.tla2b.exceptions.TLA2BException;
-import de.tla2b.global.TranslationGlobals;
import de.tla2bAst.Translator;
import org.apache.commons.cli.*;
import de.tla2b.util.DebugUtils;
-public class TLA2B implements TranslationGlobals {
+import static de.tla2b.global.TranslationGlobals.VERSION_NUMBER;
+
+public class TLA2B {
public final static String VERSION = "version";
public final static String VERBOSE = "verbose";
diff --git a/src/main/java/de/tla2b/analysis/BOperation.java b/src/main/java/de/tla2b/analysis/BOperation.java
index 87c49dd..de3bbdb 100644
--- a/src/main/java/de/tla2b/analysis/BOperation.java
+++ b/src/main/java/de/tla2b/analysis/BOperation.java
@@ -342,27 +342,14 @@ class PrimedVariablesFinder extends AbstractASTVisitor {
public PrimedVariablesFinder(List<ExprOrOpArgNode> list) {
this.all = new HashSet<>();
this.twiceUsedVariables = new HashSet<>();
-
- for (ExprOrOpArgNode exprOrOpArgNode : list) {
- findPrimedVariables(exprOrOpArgNode);
- }
- }
-
- public void findPrimedVariables(ExprOrOpArgNode n) {
- this.visitExprOrOpArgNode(n);
+ list.forEach(this::visitExprOrOpArgNode); // findPrimedVariables
}
public void visitBuiltInNode(OpApplNode n) {
- if (getOpCode(n.getOperator().getName()) == OPCODE_prime) { // prime
- if (n.getArgs()[0] instanceof OpApplNode) {
- OpApplNode varNode = (OpApplNode) n.getArgs()[0];
- SymbolNode var = varNode.getOperator();
-
- if (all.contains(var)) {
- twiceUsedVariables.add(var);
- } else {
- all.add(var);
- }
+ if (getOpCode(n.getOperator().getName()) == OPCODE_prime && n.getArgs()[0] instanceof OpApplNode) {
+ SymbolNode var = ((OpApplNode) n.getArgs()[0]).getOperator();
+ if (!all.add(var)) {
+ twiceUsedVariables.add(var);
}
}
super.visitBuiltInNode(n);
diff --git a/src/main/java/de/tla2bAst/Translator.java b/src/main/java/de/tla2bAst/Translator.java
index 80046ca..555fcdd 100644
--- a/src/main/java/de/tla2bAst/Translator.java
+++ b/src/main/java/de/tla2bAst/Translator.java
@@ -16,7 +16,6 @@ import de.tla2b.config.ConfigfileEvaluator;
import de.tla2b.config.ModuleOverrider;
import de.tla2b.exceptions.TLA2BFrontEndException;
import de.tla2b.exceptions.TLA2BException;
-import de.tla2b.global.TranslationGlobals;
import de.tla2b.output.TlaTypePrinter;
import de.tla2b.types.TLAType;
import de.tla2b.util.FileUtils;
@@ -36,7 +35,9 @@ import java.util.Map;
import java.util.List;
import java.util.stream.Collectors;
-public class Translator implements TranslationGlobals {
+import static de.tla2b.global.TranslationGlobals.VERSION_NUMBER;
+
+public class Translator {
private static final String GENERATED_BY_TLA2B_HEADER = "/*@ generated by TLA2B ";
private String parentPath;
--
GitLab