Merge remote-tracking branch 'origin/maintenance/MPS-2022.3'

# Conflicts: # code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps # code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps # code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps # code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps # code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps # code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl # code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/generator/template/[email protected] # code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd # gradle.lockfile
mbeddr · Oct 3, 2024 · c67ab6f · c67ab6f
2 parents 2ae73e8 + e385b6f
commit c67ab6f
Show file tree

Hide file tree

Showing 43 changed files with 10,002 additions and 3,990 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -444,6 +444,7 @@ tasks {
         maxHeapSize = "4G"
 
         excludeModuleMigration("de.itemis.mps.editor.diagram", 0)
+	excludeModuleMigration("jetbrains.mps.baseLanguage.javadoc", 0)
     }
 }
 

diff --git a/....fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps b/....fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
@@ -89,12 +89,12 @@
       <property role="TrG5h" value="ecu2" />
     </node>
     <node concept="2jnq7J" id="2gpUZARhwa8" role="2jnmDS">
-      <ref role="2jnmXU" node="2gpUZARh4BO" />
-      <ref role="2jnmXW" node="2gpUZARh4BT" />
+      <ref role="2jnmXU" node="2gpUZARh4BO" resolve="ecu1" />
+      <ref role="2jnmXW" node="2gpUZARh4BT" resolve="bus" />
     </node>
     <node concept="2jnq7J" id="2gpUZARhwaa" role="2jnmDS">
-      <ref role="2jnmXU" node="2gpUZARh4C9" />
-      <ref role="2jnmXW" node="2gpUZARh4BT" />
+      <ref role="2jnmXU" node="2gpUZARh4C9" resolve="ecu2" />
+      <ref role="2jnmXW" node="2gpUZARh4BT" resolve="bus" />
     </node>
   </node>
 </model>

diff --git a/...ymo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps b/...ymo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
@@ -76,15 +76,15 @@
       <property role="TrG5h" value="Sender" />
       <node concept="3USqFc" id="pk5lVrZWqi" role="3UVs02">
         <property role="TrG5h" value="data" />
-        <ref role="3US7yy" node="pk5lVrZWqd" />
+        <ref role="3US7yy" node="pk5lVrZWqd" resolve="Data" />
       </node>
     </node>
     <node concept="3UUxL_" id="pk5lVrZWqq" role="3UUxLy" />
     <node concept="3UVs0c" id="pk5lVrZWqB" role="3UUxLy">
       <property role="TrG5h" value="Receiver" />
       <node concept="3USqFc" id="pk5lVrZWqL" role="3UVs00">
         <property role="TrG5h" value="data" />
-        <ref role="3US7yy" node="pk5lVrZWqd" />
+        <ref role="3US7yy" node="pk5lVrZWqd" resolve="Data" />
       </node>
     </node>
     <node concept="3UUxL_" id="pk5lVrZWr9" role="3UUxLy" />
@@ -93,20 +93,20 @@
       <node concept="3UVpuM" id="pk5lVrZWrH" role="3UVWDc">
         <node concept="3UVpuK" id="pk5lVrZWrJ" role="3UVKbZ">
           <property role="TrG5h" value="s" />
-          <ref role="3UVpu6" node="6TLpWSY0gIt" />
+          <ref role="3UVpu6" node="6TLpWSY0gIt" resolve="Sender" />
         </node>
         <node concept="3UVpuK" id="pk5lVrZWrO" role="3UVKbZ">
           <property role="TrG5h" value="r" />
-          <ref role="3UVpu6" node="pk5lVrZWqB" />
+          <ref role="3UVpu6" node="pk5lVrZWqB" resolve="Receiver" />
         </node>
         <node concept="3UVptf" id="pk5lVrZWrW" role="3UVKbZ">
           <node concept="3UVgTP" id="pk5lVrZWs1" role="3UVptc">
-            <ref role="3UVgTb" node="pk5lVrZWrJ" />
-            <ref role="3UVgT4" node="pk5lVrZWqi" />
+            <ref role="3UVgTb" node="pk5lVrZWrJ" resolve="s" />
+            <ref role="3UVgT4" node="pk5lVrZWqi" resolve="data" />
           </node>
           <node concept="3UVgTP" id="pk5lVrZWs3" role="3UVpta">
-            <ref role="3UVgTb" node="pk5lVrZWrO" />
-            <ref role="3UVgT4" node="pk5lVrZWqL" />
+            <ref role="3UVgTb" node="pk5lVrZWrO" resolve="r" />
+            <ref role="3UVgT4" node="pk5lVrZWqL" resolve="data" />
           </node>
         </node>
         <node concept="37mRI7" id="pk5lVrZWs6" role="lGtFl">

diff --git a/...eddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/test.com.mbeddr.formal.cbmc.msd b/...eddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/test.com.mbeddr.formal.cbmc.msd
@@ -9,6 +9,7 @@
     <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
+    <facet type="tests" />
   </facets>
   <dependencies>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>

diff --git a/.../languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps b/.../languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
@@ -172,7 +172,6 @@
         <child id="3937244445246642781" name="nodeToReport" index="1urrMF" />
       </concept>
       <concept id="1210784285454" name="jetbrains.mps.lang.typesystem.structure.TypesystemIntention" flags="ng" index="3Cnw8n">
-        <property id="1216127910019" name="applyImmediately" index="ARO6o" />
         <reference id="1216388525179" name="quickFix" index="QpYPw" />
         <child id="1210784493590" name="actualArgument" index="3Coj4f" />
       </concept>
@@ -405,7 +404,7 @@
     </node>
   </node>
   <node concept="Q5z_Y" id="3f8ZVRYftjp">
-    <property role="TrG5h" value="fix_GoalStructureElementsNames_basedOnPrefix" />
+    <property role="TrG5h" value="fix_EntitiesNames_basedOnPrefix" />
     <node concept="Q6JDH" id="3f8ZVRYftxu" role="Q6Id_">
       <property role="TrG5h" value="nodeWithPrefixedName" />
       <node concept="3Tqbb2" id="3f8ZVRYftx$" role="Q6QK4">
@@ -599,7 +598,7 @@
                     <ref role="3cqZAo" node="84ljAGCXdv" resolve="nodeUsingPrefix" />
                   </node>
                   <node concept="3Cnw8n" id="3f8ZVRYf_jS" role="1urrFz">
-                    <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                    <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                     <node concept="3CnSsL" id="3f8ZVRYf_oM" role="3Coj4f">
                       <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                       <node concept="37vLTw" id="84ljAGDg3E" role="3CoRuB">
@@ -673,8 +672,7 @@
                 <node concept="3clFbS" id="3f8ZVRYdTFI" role="3eOfB_">
                   <node concept="2MkqsV" id="3f8ZVRYdVlx" role="3cqZAp">
                     <node concept="3Cnw8n" id="3f8ZVRYfC5W" role="1urrFz">
-                      <property role="ARO6o" value="true" />
-                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                       <node concept="3CnSsL" id="3f8ZVRYfC5X" role="3Coj4f">
                         <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                         <node concept="37vLTw" id="84ljAGDg6L" role="3CoRuB">
@@ -721,8 +719,7 @@
                       <node concept="3clFbS" id="3f8ZVRYe6LF" role="1zc67A">
                         <node concept="2MkqsV" id="3f8ZVRYe6X3" role="3cqZAp">
                           <node concept="3Cnw8n" id="3f8ZVRYfCbF" role="1urrFz">
-                            <property role="ARO6o" value="true" />
-                            <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                            <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                             <node concept="3CnSsL" id="3f8ZVRYfCbG" role="3Coj4f">
                               <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                               <node concept="37vLTw" id="84ljAGDg9S" role="3CoRuB">
@@ -801,7 +798,7 @@
                   </node>
                   <node concept="2Mj0R9" id="3f8ZVRYe7X$" role="3cqZAp">
                     <node concept="3Cnw8n" id="3f8ZVRYfD01" role="1urrFz">
-                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                       <node concept="3CnSsL" id="3f8ZVRYfD02" role="3Coj4f">
                         <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                         <node concept="37vLTw" id="84ljAGDgbq" role="3CoRuB">
-Original file line number
+Diff line change
@@ Expand Up / @@ -444,6 +444,7 @@ tasks { @@
             maxHeapSize = "4G"
             excludeModuleMigration("de.itemis.mps.editor.diagram", 0)
+    	excludeModuleMigration("jetbrains.mps.baseLanguage.javadoc", 0)
         }
     }
@@ Expand Down @@