From f89d5e1c02acdd999885d24a84799322c8ad721a Mon Sep 17 00:00:00 2001 From: Jan Gruteser <jan.gruteser@hhu.de> Date: Fri, 20 Dec 2024 15:36:38 +0100 Subject: [PATCH] move helper methods --- src/main/java/de/tla2bAst/BAstCreator.java | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/tla2bAst/BAstCreator.java b/src/main/java/de/tla2bAst/BAstCreator.java index 796454b..2bf34e0 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); -- GitLab