From fd3128201ec592e185544bdd4419ecbd5d6bda6f Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Thu, 27 Apr 2023 23:00:05 +0200
Subject: [PATCH] Use Utils.isProBSpecialDefinitionName instead of hardcoding
the names
---
.../transformation/DefinitionsEliminator.java | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/main/java/de/tlc4b/analysis/transformation/DefinitionsEliminator.java b/src/main/java/de/tlc4b/analysis/transformation/DefinitionsEliminator.java
index 3831ade..c872e28 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);
--
GitLab