Fix some warnings and errors

mbeddr · Dec 15, 2023 · a271c8c · a271c8c
1 parent 7ff1718
commit a271c8c
Show file tree

Hide file tree

Showing 19 changed files with 135 additions and 385 deletions.
diff --git a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl
@@ -11,53 +11,10 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.fasten.symo.hw#01" uuid="2905aa5f-3c50-472e-bc4a-7f980662bb27">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="c2f3ae03-6a71-4e2a-88c9-c9e6eb4e20fa(com.fasten.symo.hw)" version="0" />
-        <module reference="2905aa5f-3c50-472e-bc4a-7f980662bb27(com.fasten.symo.hw#01)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <sourcePath />
   <dependencies>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
-    <dependency reexport="false">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
+    <dependency reexport="true">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />

diff --git a/...uages/com.fasten.symo/languages/com.fasten.symo.hw/generator/templates/[email protected] b/...uages/com.fasten.symo/languages/com.fasten.symo.hw/generator/templates/[email protected]
diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl
@@ -11,49 +11,6 @@
     </facet>
   </facets>
   <accessoryModels />
-  <generators>
-    <generator alias="main" namespace="com.symo.sysml.ibd#2217399625956132788" uuid="99172f12-e309-48b0-90da-8e6426acae09">
-      <models>
-        <modelRoot contentPath="${module}/generator" type="default">
-          <sourceRoot location="templates" />
-        </modelRoot>
-      </models>
-      <facets>
-        <facet type="java" compile="mps" classes="mps" ext="no">
-          <classes generated="true" path="${module}/generator/classes_gen" />
-        </facet>
-      </facets>
-      <external-templates />
-      <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-        <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-        <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
-        <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-        <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-        <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
-        <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
-        <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-        <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
-        <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-      </languageVersions>
-      <dependencyVersions>
-        <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-        <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-        <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-        <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-        <module reference="d7ce0776-e180-44b6-8b3f-a274ad438311(com.symo.sysml.ibd)" version="0" />
-        <module reference="99172f12-e309-48b0-90da-8e6426acae09(com.symo.sysml.ibd#2217399625956132788)" version="0" />
-        <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-      </dependencyVersions>
-      <mapping-priorities />
-    </generator>
-  </generators>
   <sourcePath />
   <dependencies>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>

diff --git a/...uages/com.fasten.symo/languages/com.symo.sysml.ibd/generator/templates/[email protected] b/...uages/com.fasten.symo/languages/com.symo.sysml.ibd/generator/templates/[email protected]
diff --git a/...m.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd b/...m.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd
@@ -12,7 +12,7 @@
   </facets>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
+    <dependency reexport="true">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>

diff --git a/...languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps b/...languages/com.mbeddr.formal.base.tabular/models/com.mbeddr.formal.base.tabular.editor.mps
@@ -15,8 +15,8 @@
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="oghc" ref="r:356c0504-b4a3-4458-9604-13fbb48838d7(de.slisson.mps.tables.runtime.style)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="reoo" ref="r:1e59a084-7ebe-4e95-89ab-c58a7e396583(de.slisson.mps.tables.editor)" implicit="true" />
     <import index="ehqg" ref="r:2c1724e1-8ed6-4fe4-9e44-fae13cd2a5ac(com.mbeddr.formal.base.expressions.structure)" implicit="true" />
     <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" implicit="true" />
@@ -240,18 +240,6 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells">
-      <concept id="6856661361479784881" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem_Param_node" flags="ng" index="130tyv" />
-      <concept id="6856661361479784527" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem" flags="ng" index="130t_x">
-        <property id="1139535298778" name="actionId" index="1hAc7j" />
-        <child id="6856661361479798753" name="execute" index="130oVf" />
-      </concept>
-      <concept id="6856661361479784534" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapItem_ExecuteFunction" flags="ig" index="130t_S" />
-      <concept id="6856661361479732075" name="com.mbeddr.mpsutil.grammarcells.structure.InlineActionMapCell" flags="ng" index="130CD5">
-        <child id="6856661361479798957" name="actions" index="130p63" />
-        <child id="6856661361479732085" name="cell" index="130CDr" />
-      </concept>
-    </language>
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
       <concept id="767145758118872828" name="jetbrains.mps.lang.actions.structure.NF_Node_ReplaceWithNewOperation" flags="nn" index="2DeJnW" />
     </language>
@@ -370,18 +358,10 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -571,75 +551,6 @@
                   </node>
                 </node>
               </node>
-              <node concept="1X3_iC" id="7Z6$Wo5NxQa" role="lGtFl">
-                <property role="3V$3am" value="statement" />
-                <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                <node concept="3cpWs6" id="5MukRfupUR$" role="8Wnug">
-                  <node concept="2OqwBi" id="5MukRfupVmT" role="3cqZAk">
-                    <node concept="1frAZD" id="5MukRfupV7X" role="2Oq$k0" />
-                    <node concept="2CJim2" id="5MukRfupVIH" role="2OqNvi">
-                      <node concept="2CJsh3" id="5MukRfupVIJ" role="2CJshi">
-                        <node concept="130CD5" id="2vWNQYdz_SM" role="2wV5jI">
-                          <node concept="130t_x" id="2vWNQYdz_U2" role="130p63">
-                            <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
-                            <node concept="130t_S" id="2vWNQYdz_U3" role="130oVf">
-                              <node concept="3clFbS" id="2vWNQYdz_U4" role="2VODD2">
-                                <node concept="3clFbF" id="7Z6$Wo5MBaH" role="3cqZAp">
-                                  <node concept="2YIFZM" id="7Z6$Wo5MBAO" role="3clFbG">
-                                    <ref role="37wK5l" node="7Z6$Wo5M$fD" resolve="removeColumn" />
-                                    <ref role="1Pybhc" node="7Z6$Wo5M$dV" resolve="TableEditorUtils_old" />
-                                    <node concept="1PxgMI" id="7Z6$Wo5Ndi0" role="37wK5m">
-                                      <node concept="chp4Y" id="7Z6$Wo5Ndj8" role="3oSUPX">
-                                        <ref role="cht4Q" to="vlrt:3JhRrgbktEe" resolve="IFunctionValueContent" />
-                                      </node>
-                                      <node concept="130tyv" id="7Z6$Wo5MBEN" role="1m5AlR" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="130t_x" id="7Z6$Wo5MCj0" role="130p63">
-                            <property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
-                            <node concept="130t_S" id="7Z6$Wo5MCj1" role="130oVf">
-                              <node concept="3clFbS" id="7Z6$Wo5MCj2" role="2VODD2">
-                                <node concept="3clFbF" id="7Z6$Wo5MCK_" role="3cqZAp">
-                                  <node concept="2YIFZM" id="7Z6$Wo5MCKA" role="3clFbG">
-                                    <ref role="1Pybhc" node="7Z6$Wo5M$dV" resolve="TableEditorUtils_old" />
-                                    <ref role="37wK5l" node="7Z6$Wo5M$fD" resolve="removeColumn" />
-                                    <node concept="1PxgMI" id="7Z6$Wo5NdsX" role="37wK5m">
-                                      <node concept="chp4Y" id="7Z6$Wo5Ndu5" role="3oSUPX">
-                                        <ref role="cht4Q" to="vlrt:3JhRrgbktEe" resolve="IFunctionValueContent" />
-                                      </node>
-                                      <node concept="130tyv" id="7Z6$Wo5MCKB" role="1m5AlR" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3F0A7n" id="5MukRfuqRUY" role="130CDr">
-                            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="2CFqY3vmO5P" role="2CJshu">
-                        <node concept="2OqwBi" id="2CFqY3vmL6T" role="2Oq$k0">
-                          <node concept="37vLTw" id="2CFqY3vmKX6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2CFqY3vmKiz" resolve="t" />
-                          </node>
-                          <node concept="3Tsc0h" id="2CFqY3vmLub" role="2OqNvi">
-                            <ref role="3TtcxE" to="vlrt:2CFqY3vlYN$" resolve="outputVariables" />
-                          </node>
-                        </node>
-                        <node concept="34jXtK" id="2CFqY3vmSz_" role="2OqNvi">
-                          <node concept="2rSBBp" id="2CFqY3vmSDz" role="25WWJ7" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
               <node concept="3cpWs8" id="1V$lRyj5woF" role="3cqZAp">
                 <node concept="3cpWsn" id="1V$lRyj5woG" role="3cpWs9">
                   <property role="TrG5h" value="n" />

diff --git a/...languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/plugin.mps b/...languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/plugin.mps
@@ -7,6 +7,7 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
+    <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>