Blacklist redundant nusmv expressions

Some OCRA expressions are redundant to nusmv expressions as they use a different editor "textual projection". To not use both, this commit introduces a blacklist of (redundant) nusmv expressions that can't be used in ocra models, e.g., globally, historically, and, or, ... mbeddr#54 Signed-off-by: Arne Nordmann (CR/AEA2) <[email protected]>
boschresearch · Oct 20, 2020 · 08ae23b · 08ae23b
1 parent 7bfe83c
commit 08ae23b
Show file tree

Hide file tree

Showing 6 changed files with 321 additions and 146 deletions.
diff --git a/code/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl b/code/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl
@@ -17,8 +17,8 @@
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
+    <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="1" />

diff --git a/code/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.behavior.mps b/code/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.behavior.mps
@@ -787,7 +787,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="404$BAz8LqS">
-    <property role="3GE5qa" value="constraints.relational" />
+    <property role="3GE5qa" value="operators" />
     <ref role="13h7C2" to="hqls:404$BAz792M" resolve="LessOrEqualThanOperator" />
     <node concept="13hLZK" id="404$BAz8LqT" role="13h7CW">
       <node concept="3clFbS" id="404$BAz8LqU" role="2VODD2" />
@@ -807,7 +807,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="404$BAz8OVO">
-    <property role="3GE5qa" value="constraints.relational" />
+    <property role="3GE5qa" value="operators" />
     <ref role="13h7C2" to="hqls:404$BAz78Ye" resolve="EqualsOperator" />
     <node concept="13i0hz" id="404$BAz8OWb" role="13h7CS">
       <property role="TrG5h" value="getPresentation" />
@@ -827,7 +827,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="404$BAz8P1M">
-    <property role="3GE5qa" value="constraints.relational" />
+    <property role="3GE5qa" value="operators" />
     <ref role="13h7C2" to="hqls:404$BAz793V" resolve="GreaterOrEqualThanOperator" />
     <node concept="13i0hz" id="404$BAz8P29" role="13h7CS">
       <property role="TrG5h" value="getPresentation" />
@@ -847,7 +847,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="404$BAz8P4D">
-    <property role="3GE5qa" value="constraints.relational" />
+    <property role="3GE5qa" value="operators" />
     <ref role="13h7C2" to="hqls:404$BAz791D" resolve="GreaterThanOperator" />
     <node concept="13i0hz" id="404$BAz8P50" role="13h7CS">
       <property role="TrG5h" value="getPresentation" />
@@ -867,7 +867,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="404$BAz8P78">
-    <property role="3GE5qa" value="constraints.relational" />
+    <property role="3GE5qa" value="operators" />
     <ref role="13h7C2" to="hqls:404$BAz790w" resolve="LessThanOperator" />
     <node concept="13i0hz" id="404$BAz8P7v" role="13h7CS">
       <property role="TrG5h" value="getPresentation" />
@@ -887,7 +887,7 @@
     </node>
   </node>
   <node concept="13h7C7" id="404$BAz8Pd6">
-    <property role="3GE5qa" value="constraints.relational" />
+    <property role="3GE5qa" value="operators" />
     <ref role="13h7C2" to="hqls:404$BAz78Zn" resolve="NotEqualOperator" />
     <node concept="13i0hz" id="404$BAz8Pdt" role="13h7CS">
       <property role="TrG5h" value="getPresentation" />