diff --git a/src/main/java/de/tla2bAst/BAstCreator.java b/src/main/java/de/tla2bAst/BAstCreator.java index 796454bf6f004e5906d45d94fc18288e1d029e90..2bf34e08c5398dd1d03eed696f8943cdc4a774f0 100644 --- a/src/main/java/de/tla2bAst/BAstCreator.java +++ b/src/main/java/de/tla2bAst/BAstCreator.java @@ -327,18 +327,6 @@ public class BAstCreator extends BuiltInOPs implements TranslationGlobals, BBuil } } - public AIdentifierExpression createIdentifierNode(SymbolNode symbolNode) { - if (bMacroHandler.containsSymbolNode(symbolNode)) { - return createPositionedNode(createIdentifierNode(bMacroHandler.getNewName(symbolNode)), symbolNode); - } else { - return createPositionedNode(createIdentifierNode(symbolNode.getName().toString()), symbolNode); - } - } - - public static AIdentifierExpression createIdentifierNode(String name) { - return new AIdentifierExpression(createTIdentifierLiteral(name)); - } - private void createPropertyClause() { List<PPredicate> propertiesList = new ArrayList<>(); propertiesList.addAll(evalRecursiveDefinitions()); @@ -2182,6 +2170,20 @@ public class BAstCreator extends BuiltInOPs implements TranslationGlobals, BBuil } } + // HELPER METHODS + + public AIdentifierExpression createIdentifierNode(SymbolNode symbolNode) { + if (bMacroHandler.containsSymbolNode(symbolNode)) { + return createPositionedNode(createIdentifierNode(bMacroHandler.getNewName(symbolNode)), symbolNode); + } else { + return createPositionedNode(createIdentifierNode(symbolNode.getName().toString()), symbolNode); + } + } + + public static AIdentifierExpression createIdentifierNode(String name) { + return new AIdentifierExpression(createTIdentifierLiteral(name)); + } + public PPredicate createConjunction(List<PPredicate> list) { if (list.size() == 1) return list.get(0);