diff --git a/src/main/java/de/tlc4b/analysis/transformation/DefinitionsEliminator.java b/src/main/java/de/tlc4b/analysis/transformation/DefinitionsEliminator.java index 3831adefc9894707cb2605d5c0d5a5e8aa45a5ce..c872e28c92bc150f52e2291f1e6dab64daf54a0c 100644 --- a/src/main/java/de/tlc4b/analysis/transformation/DefinitionsEliminator.java +++ b/src/main/java/de/tlc4b/analysis/transformation/DefinitionsEliminator.java @@ -81,12 +81,7 @@ public class DefinitionsEliminator extends DepthFirstAdapter { if (e instanceof AExpressionDefinitionDefinition) { String name = ((AExpressionDefinitionDefinition) e).getName() .getText().toString(); - if (name.startsWith("ASSERT_LTL") - || name.startsWith("scope_") - || name.startsWith("SET_PREF_") - || name.equals("VISB_JSON_FILE") - || name.startsWith("ANIMATION_FUNCTION") - || name.startsWith("ANIMATION_IMG")) + if (Utils.isProBSpecialDefinitionName(name)) continue; } e.apply(this); @@ -100,12 +95,7 @@ public class DefinitionsEliminator extends DepthFirstAdapter { String name = ((AExpressionDefinitionDefinition) e).getName() .getText().toString(); - if (name.startsWith("ASSERT_LTL") - || name.startsWith("scope_") - || name.startsWith("SET_PREF_") - || name.equals("VISB_JSON_FILE") - || name.startsWith("ANIMATION_FUNCTION") - || name.startsWith("ANIMATION_IMG") + if (Utils.isProBSpecialDefinitionName(name) || StandardMadules .isKeywordInModuleExternalFunctions(name)) { @@ -114,7 +104,7 @@ public class DefinitionsEliminator extends DepthFirstAdapter { } else if (e instanceof APredicateDefinitionDefinition) { String name = ((APredicateDefinitionDefinition) e).getName() .getText().toString(); - if (name.equals("GOAL") + if (Utils.isProBSpecialDefinitionName(name) || StandardMadules .isKeywordInModuleExternalFunctions(name)) { newDefinitionsList.add(e);