From 859941e27860f7a799ebed1395b26cc0485b5724 Mon Sep 17 00:00:00 2001 From: Jan Gruteser <jan.gruteser@hhu.de> Date: Thu, 24 Oct 2024 19:38:32 +0200 Subject: [PATCH] minor formatting --- .../java/de/tla2b/analysis/UsedExternalFunctions.java | 7 +------ src/main/java/de/tla2b/global/OperatorTypes.java | 5 +++-- .../java/de/tla2b/output/TypeVisitorInterface.java | 1 - src/main/java/de/tla2b/types/AbstractHasFollowers.java | 10 ++++------ src/main/java/de/tla2b/types/AbstractSymbol.java | 1 - 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/de/tla2b/analysis/UsedExternalFunctions.java b/src/main/java/de/tla2b/analysis/UsedExternalFunctions.java index af6bb2e..6ee67e0 100644 --- a/src/main/java/de/tla2b/analysis/UsedExternalFunctions.java +++ b/src/main/java/de/tla2b/analysis/UsedExternalFunctions.java @@ -19,16 +19,13 @@ public class UsedExternalFunctions extends AbstractASTVisitor implements BBuildI return usedExternalFunctions; } - public UsedExternalFunctions(ModuleNode moduleNode, - SpecAnalyser specAnalyser) { + public UsedExternalFunctions(ModuleNode moduleNode, SpecAnalyser specAnalyser) { usedExternalFunctions = new HashSet<>(); - visitAssumptions(moduleNode.getAssumptions()); for (OpDefNode def : specAnalyser.getUsedDefinitions()) { visitDefinition(def); } - } @Override @@ -62,7 +59,6 @@ public class UsedExternalFunctions extends AbstractASTVisitor implements BBuildI usedExternalFunctions.add(EXTERNAL_FUNCTIONS.ASSERT); } - ExprNode[] in = n.getBdedQuantBounds(); for (ExprNode exprNode : in) { visitExprNode(exprNode); @@ -73,5 +69,4 @@ public class UsedExternalFunctions extends AbstractASTVisitor implements BBuildI visitExprOrOpArgNode(exprOrOpArgNode); } } - } diff --git a/src/main/java/de/tla2b/global/OperatorTypes.java b/src/main/java/de/tla2b/global/OperatorTypes.java index 619a5c0..8d8c797 100644 --- a/src/main/java/de/tla2b/global/OperatorTypes.java +++ b/src/main/java/de/tla2b/global/OperatorTypes.java @@ -3,10 +3,11 @@ package de.tla2b.global; import tlc2.tool.ToolGlobals; import java.util.HashSet; +import java.util.Set; public class OperatorTypes implements ToolGlobals, BBuildIns { - private static final HashSet<Integer> TLA_Predicate_Operators; - private static final HashSet<Integer> BBuiltIn_Predicate_Operators; + private static final Set<Integer> TLA_Predicate_Operators; + private static final Set<Integer> BBuiltIn_Predicate_Operators; static { TLA_Predicate_Operators = new HashSet<>(); diff --git a/src/main/java/de/tla2b/output/TypeVisitorInterface.java b/src/main/java/de/tla2b/output/TypeVisitorInterface.java index 01ad7af..9c42f4b 100644 --- a/src/main/java/de/tla2b/output/TypeVisitorInterface.java +++ b/src/main/java/de/tla2b/output/TypeVisitorInterface.java @@ -2,7 +2,6 @@ package de.tla2b.output; import de.tla2b.types.*; - public interface TypeVisitorInterface { void caseIntegerType(IntType type); diff --git a/src/main/java/de/tla2b/types/AbstractHasFollowers.java b/src/main/java/de/tla2b/types/AbstractHasFollowers.java index ef6e146..5a91851 100644 --- a/src/main/java/de/tla2b/types/AbstractHasFollowers.java +++ b/src/main/java/de/tla2b/types/AbstractHasFollowers.java @@ -3,17 +3,18 @@ package de.tla2b.types; import tla2sany.semantic.SemanticNode; import java.util.ArrayList; +import java.util.List; public abstract class AbstractHasFollowers extends TLAType { - public ArrayList<Object> followers; + public List<Object> followers; public AbstractHasFollowers(int t) { super(t); followers = new ArrayList<>(); } - public ArrayList<Object> getFollowers() { + public List<Object> getFollowers() { return followers; } @@ -26,7 +27,6 @@ public abstract class AbstractHasFollowers extends TLAType { } followers.add(o); } - } public void deleteFollower(Object o) { @@ -69,7 +69,6 @@ public abstract class AbstractHasFollowers extends TLAType { if (pair.getSecond() == this) { pair.setSecond(newType); } - } else if (follower instanceof FunctionType) { ((FunctionType) follower).update(this, newType); } else if (follower instanceof StructType) { @@ -79,8 +78,7 @@ public abstract class AbstractHasFollowers extends TLAType { } else if (follower instanceof TupleOrFunction) { ((TupleOrFunction) follower).setNewType(this, newType); } else { - throw new RuntimeException("Unknown follower type: " - + follower.getClass()); + throw new RuntimeException("Unknown follower type: " + follower.getClass()); } }); } diff --git a/src/main/java/de/tla2b/types/AbstractSymbol.java b/src/main/java/de/tla2b/types/AbstractSymbol.java index 8b9e3bf..027cb69 100644 --- a/src/main/java/de/tla2b/types/AbstractSymbol.java +++ b/src/main/java/de/tla2b/types/AbstractSymbol.java @@ -12,7 +12,6 @@ public abstract class AbstractSymbol { return type; } - protected void setType(TLAType t) { this.type = t; if (type instanceof AbstractHasFollowers) { -- GitLab