diff --git a/src/main/java/de/tla2b/analysis/SpecAnalyser.java b/src/main/java/de/tla2b/analysis/SpecAnalyser.java index e1f9e58490445eb6b37875fa02d241d7317189bd..3d2c28594d1988847fa100f17cd709aa1221389a 100644 --- a/src/main/java/de/tla2b/analysis/SpecAnalyser.java +++ b/src/main/java/de/tla2b/analysis/SpecAnalyser.java @@ -147,12 +147,10 @@ public class SpecAnalyser extends BuiltInOPs { } findRecursiveConstructs(); - for (OpDeclNode var : moduleNode.getVariableDecls()) { - namingMap.put(var.getName().toString(), var); - } + namingMap.putAll(TlaUtils.getDeclarationsMap(moduleNode.getVariableDecls())); DebugUtils.printMsg("Number of variables detected: " + moduleNode.getVariableDecls().length); - namingMap.putAll(TlaUtils.getConstantsMap(moduleNode.getConstantDecls())); + namingMap.putAll(TlaUtils.getDeclarationsMap(moduleNode.getConstantDecls())); DebugUtils.printMsg("Number of constants detected: " + moduleNode.getConstantDecls().length); namingMap.putAll(TlaUtils.getOpDefsMap(usedDefinitions.toArray(new OpDefNode[0]))); diff --git a/src/main/java/de/tla2b/config/ConfigfileEvaluator.java b/src/main/java/de/tla2b/config/ConfigfileEvaluator.java index 511200457754a0e6ba2a638e9896983b30e41f13..1d3d8f7223ac622dc248e97a1761cb9ce915a547 100644 --- a/src/main/java/de/tla2b/config/ConfigfileEvaluator.java +++ b/src/main/java/de/tla2b/config/ConfigfileEvaluator.java @@ -58,7 +58,7 @@ public class ConfigfileEvaluator { this.configAst = configAst; this.moduleNode = moduleNode; this.definitions = TlaUtils.getOpDefsMap(moduleNode.getOpDefs()); - this.constants = TlaUtils.getConstantsMap(moduleNode.getConstantDecls()); + this.constants = TlaUtils.getDeclarationsMap(moduleNode.getConstantDecls()); this.bConstantList.addAll(constants.values()); this.nextNode = evalPredicate(configAst.getNext(), "next state"); // check if NEXT declaration is a valid definition diff --git a/src/main/java/de/tla2b/util/TlaUtils.java b/src/main/java/de/tla2b/util/TlaUtils.java index 44d0275791b3e21de252414755b22ce3fffc1b24..030ae1257f76171363143351ddbacd35060e59b6 100644 --- a/src/main/java/de/tla2b/util/TlaUtils.java +++ b/src/main/java/de/tla2b/util/TlaUtils.java @@ -8,12 +8,12 @@ import java.util.Map; public class TlaUtils { - public static Map<String, OpDeclNode> getConstantsMap(OpDeclNode[] constantNodes) { - Map<String, OpDeclNode> constants = new HashMap<>(); - for (OpDeclNode con : constantNodes) { - constants.put(con.getName().toString(), con); + public static Map<String, OpDeclNode> getDeclarationsMap(OpDeclNode[] declNodes) { + Map<String, OpDeclNode> decl = new HashMap<>(); + for (OpDeclNode con : declNodes) { + decl.put(con.getName().toString(), con); } - return constants; + return decl; } public static Map<String, OpDefNode> getOpDefsMap(OpDefNode[] opDefNodes) {