Skip to content
Snippets Groups Projects
Commit ab0dd38b authored by Jan Gruteser's avatar Jan Gruteser
Browse files

minor simplifications

parent 9939815f
Branches
Tags
No related merge requests found
Pipeline #149217 passed
...@@ -3,12 +3,13 @@ package de.tla2b; ...@@ -3,12 +3,13 @@ package de.tla2b;
import de.tla2b.exceptions.TLA2BFrontEndException; import de.tla2b.exceptions.TLA2BFrontEndException;
import de.tla2b.exceptions.NotImplementedException; import de.tla2b.exceptions.NotImplementedException;
import de.tla2b.exceptions.TLA2BException; import de.tla2b.exceptions.TLA2BException;
import de.tla2b.global.TranslationGlobals;
import de.tla2bAst.Translator; import de.tla2bAst.Translator;
import org.apache.commons.cli.*; import org.apache.commons.cli.*;
import de.tla2b.util.DebugUtils; 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 VERSION = "version";
public final static String VERBOSE = "verbose"; public final static String VERBOSE = "verbose";
......
...@@ -342,27 +342,14 @@ class PrimedVariablesFinder extends AbstractASTVisitor { ...@@ -342,27 +342,14 @@ class PrimedVariablesFinder extends AbstractASTVisitor {
public PrimedVariablesFinder(List<ExprOrOpArgNode> list) { public PrimedVariablesFinder(List<ExprOrOpArgNode> list) {
this.all = new HashSet<>(); this.all = new HashSet<>();
this.twiceUsedVariables = new HashSet<>(); this.twiceUsedVariables = new HashSet<>();
list.forEach(this::visitExprOrOpArgNode); // findPrimedVariables
for (ExprOrOpArgNode exprOrOpArgNode : list) {
findPrimedVariables(exprOrOpArgNode);
}
}
public void findPrimedVariables(ExprOrOpArgNode n) {
this.visitExprOrOpArgNode(n);
} }
public void visitBuiltInNode(OpApplNode n) { public void visitBuiltInNode(OpApplNode n) {
if (getOpCode(n.getOperator().getName()) == OPCODE_prime) { // prime if (getOpCode(n.getOperator().getName()) == OPCODE_prime && n.getArgs()[0] instanceof OpApplNode) {
if (n.getArgs()[0] instanceof OpApplNode) { SymbolNode var = ((OpApplNode) n.getArgs()[0]).getOperator();
OpApplNode varNode = (OpApplNode) n.getArgs()[0]; if (!all.add(var)) {
SymbolNode var = varNode.getOperator();
if (all.contains(var)) {
twiceUsedVariables.add(var); twiceUsedVariables.add(var);
} else {
all.add(var);
}
} }
} }
super.visitBuiltInNode(n); super.visitBuiltInNode(n);
......
...@@ -16,7 +16,6 @@ import de.tla2b.config.ConfigfileEvaluator; ...@@ -16,7 +16,6 @@ import de.tla2b.config.ConfigfileEvaluator;
import de.tla2b.config.ModuleOverrider; import de.tla2b.config.ModuleOverrider;
import de.tla2b.exceptions.TLA2BFrontEndException; import de.tla2b.exceptions.TLA2BFrontEndException;
import de.tla2b.exceptions.TLA2BException; import de.tla2b.exceptions.TLA2BException;
import de.tla2b.global.TranslationGlobals;
import de.tla2b.output.TlaTypePrinter; import de.tla2b.output.TlaTypePrinter;
import de.tla2b.types.TLAType; import de.tla2b.types.TLAType;
import de.tla2b.util.FileUtils; import de.tla2b.util.FileUtils;
...@@ -36,7 +35,9 @@ import java.util.Map; ...@@ -36,7 +35,9 @@ import java.util.Map;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; 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 static final String GENERATED_BY_TLA2B_HEADER = "/*@ generated by TLA2B ";
private String parentPath; private String parentPath;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment