Run migrations after merge

mbeddr · Nov 6, 2023 · ec0f158 · ec0f158
1 parent 0970ff1
commit ec0f158
Show file tree

Hide file tree

Showing 17 changed files with 266 additions and 266 deletions.
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
@@ -231,9 +231,6 @@
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.findUsages.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.behavior.api.jar" />
-      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.context.jar" />
-      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.legacy-constraints.jar" />
-      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rt.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.migration.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.refactoring.runtime.jar" />

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
@@ -75,15 +75,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" />
@@ -92,20 +92,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/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml b/code/languages/com.mbeddr.formal.cprover/.mps/migration.xml
@@ -3,5 +3,6 @@
   <component name="MigrationProperties">
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="project.baseline.version" value="213" />
+    <entry key="project.migrated.version" value="222" />
   </component>
 </project>
diff --git a/...rmal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.run.mps b/...rmal.cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.run.mps
@@ -230,7 +230,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6mvxENQDoy9" role="3clF45">
-        <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunResult" />
+        <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunner.ToolRunResult" />
       </node>
       <node concept="37vLTG" id="6mvxENQDoya" role="3clF46">
         <property role="TrG5h" value="files" />
@@ -266,10 +266,10 @@
           <node concept="3cpWsn" id="6mvxENQHf9I" role="3cpWs9">
             <property role="TrG5h" value="res" />
             <node concept="3uibUv" id="6mvxENQHf3d" role="1tU5fm">
-              <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunResult" />
+              <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunner.ToolRunResult" />
             </node>
             <node concept="1rXfSq" id="6mvxENQHf9J" role="33vP2m">
-              <ref role="37wK5l" node="6mvxENQDoy5" resolve="doRun" />
+              <ref role="37wK5l" node="6mvxENQDoy5" resolve="runTool" />
               <node concept="37vLTw" id="6mvxENQHf9K" role="37wK5m">
                 <ref role="3cqZAo" node="6mvxENQFlZ8" resolve="files" />
               </node>
@@ -339,14 +339,14 @@
     <node concept="312cEg" id="6mvxENQFno4" role="jymVt">
       <property role="TrG5h" value="res" />
       <node concept="3uibUv" id="6mvxENQFnlC" role="1tU5fm">
-        <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunResult" />
+        <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunner.ToolRunResult" />
       </node>
       <node concept="3Tm1VV" id="6mvxENQFGoI" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="6mvxENQEDRM" role="jymVt">
       <property role="TrG5h" value="status" />
       <node concept="3uibUv" id="6mvxENQEDQF" role="1tU5fm">
-        <ref role="3uigEE" node="6mvxENQECsY" resolve="RAW_RESULT_STATE" />
+        <ref role="3uigEE" node="6mvxENQECsY" resolve="RawResult.RAW_RESULT_STATE" />
       </node>
       <node concept="3Tm1VV" id="6mvxENQFGpx" role="1B3o_S" />
     </node>
@@ -400,7 +400,7 @@
       <node concept="37vLTG" id="6mvxENQFo7p" role="3clF46">
         <property role="TrG5h" value="res" />
         <node concept="3uibUv" id="6mvxENQFo7o" role="1tU5fm">
-          <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunResult" />
+          <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunner.ToolRunResult" />
         </node>
       </node>
     </node>
@@ -418,15 +418,15 @@
       </node>
       <node concept="QsSxf" id="6mvxENQECzH" role="Qtgdg">
         <property role="TrG5h" value="CBMC_ERROR" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
       </node>
       <node concept="QsSxf" id="6mvxENQEDSU" role="Qtgdg">
         <property role="TrG5h" value="PARSE_ERROR" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
       </node>
       <node concept="QsSxf" id="6mvxENQEE3m" role="Qtgdg">
         <property role="TrG5h" value="RESULT_PARSED_OK" />
-        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
       </node>
       <node concept="3Tm1VV" id="6mvxENQECsZ" role="1B3o_S" />
       <node concept="2tJIrI" id="6mvxENQEDMC" role="jymVt" />
@@ -491,7 +491,7 @@
       <property role="TrG5h" value="res" />
       <node concept="3Tm6S6" id="6mvxENQFsjY" role="1B3o_S" />
       <node concept="3uibUv" id="6mvxENQFsPp" role="1tU5fm">
-        <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunResult" />
+        <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunner.ToolRunResult" />
       </node>
     </node>
     <node concept="2tJIrI" id="6mvxENQFrIP" role="jymVt" />
@@ -516,7 +516,7 @@
       <node concept="37vLTG" id="6mvxENQFr3T" role="3clF46">
         <property role="TrG5h" value="res" />
         <node concept="3uibUv" id="6mvxENQFr3S" role="1tU5fm">
-          <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunResult" />
+          <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunner.ToolRunResult" />
         </node>
       </node>
     </node>
@@ -593,7 +593,7 @@
                 <node concept="3K4zz7" id="529Qsa9JQPV" role="37vLTx">
                   <node concept="Rm8GO" id="529Qsa9JSQO" role="3K4E3e">
                     <ref role="Rm8GQ" node="529Qsa9JJpn" resolve="SUCCESS" />
-                    <ref role="1Px2BO" node="6mvxENQECsY" resolve="RAW_RESULT_STATE" />
+                    <ref role="1Px2BO" node="6mvxENQECsY" resolve="RawResult.RAW_RESULT_STATE" />
                   </node>
                   <node concept="2OqwBi" id="529Qsa9JNmm" role="3K4Cdx">
                     <node concept="2OqwBi" id="529Qsa9JKq$" role="2Oq$k0">
@@ -616,7 +616,7 @@
                   </node>
                   <node concept="Rm8GO" id="529Qsa9JUh8" role="3K4GZi">
                     <ref role="Rm8GQ" node="529Qsa9JJ_M" resolve="FAILURE" />
-                    <ref role="1Px2BO" node="6mvxENQECsY" resolve="RAW_RESULT_STATE" />
+                    <ref role="1Px2BO" node="6mvxENQECsY" resolve="RawResult.RAW_RESULT_STATE" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="529Qsa9JKqC" role="37vLTJ">
@@ -1026,7 +1026,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="6mvxENQEFl6" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="6mvxENQEQ9D" role="jymVt" />
@@ -1313,7 +1313,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="6mvxENQEQ_o" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="529Qsa9KK2j" role="jymVt" />
@@ -1366,7 +1366,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="529Qsa9KM$H" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="6mvxENQEFdF" role="jymVt" />
@@ -1501,7 +1501,7 @@
                 </node>
                 <node concept="2OqwBi" id="6mvxENQEwEJ" role="33vP2m">
                   <node concept="37vLTw" id="6mvxENQEwq9" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6mvxENQEwf0" resolve="fabrique" />
+                    <ref role="3cqZAo" node="6mvxENQEwf0" resolve="factory" />
                   </node>
                   <node concept="liA8E" id="6mvxENQEwEK" role="2OqNvi">
                     <ref role="37wK5l" to="vpqd:~SAXParserFactory.newSAXParser()" resolve="newSAXParser" />
@@ -1513,8 +1513,8 @@
             <node concept="3clFbF" id="6mvxENQHmtu" role="3cqZAp">
               <node concept="2OqwBi" id="6mvxENQHmtr" role="3clFbG">
                 <node concept="10M0yZ" id="6mvxENQHmts" role="2Oq$k0">
-                  <ref role="1PxDUh" to="wyt6:~System" />
-                  <ref role="3cqZAo" to="wyt6:~System.err" />
+                  <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                  <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                 </node>
                 <node concept="liA8E" id="6mvxENQHmtt" role="2OqNvi">
                   <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
@@ -1624,7 +1624,7 @@
       <node concept="37vLTG" id="1ZsZb$iSBkE" role="3clF46">
         <property role="TrG5h" value="res" />
         <node concept="3uibUv" id="1ZsZb$iWHjn" role="1tU5fm">
-          <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunResult" />
+          <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunner.ToolRunResult" />
         </node>
       </node>
     </node>

diff --git a/....cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.testing.mps b/....cprover/solutions/com.mbeddr.formal.cbmc.rt/models/com.mbeddr.formal.cbmc.rt.testing.mps
@@ -150,7 +150,7 @@
         <node concept="3clFbF" id="6mvxENQDKAL" role="3cqZAp">
           <node concept="2OqwBi" id="6mvxENQDL5a" role="3clFbG">
             <node concept="37vLTw" id="6mvxENQDKAJ" role="2Oq$k0">
-              <ref role="3cqZAo" node="6mvxENQDKmS" resolve="list" />
+              <ref role="3cqZAo" node="6mvxENQDKmS" resolve="allArgs" />
             </node>
             <node concept="X8dFx" id="6mvxENQDM3m" role="2OqNvi">
               <node concept="37vLTw" id="6mvxENQDMg1" role="25WWJ7">
@@ -165,7 +165,7 @@
               <ref role="3cqZAo" node="6mvxENQDCc3" resolve="runner" />
             </node>
             <node concept="liA8E" id="6mvxENQDCv1" role="2OqNvi">
-              <ref role="37wK5l" to="2xjj:6mvxENQDoy5" resolve="run" />
+              <ref role="37wK5l" to="2xjj:6mvxENQDoy5" resolve="runTool" />
               <node concept="2ShNRf" id="6mvxENQDC$7" role="37wK5m">
                 <node concept="Tc6Ow" id="6mvxENQDDgR" role="2ShVmc">
                   <node concept="17QB3L" id="6mvxENQDDJ4" role="HW$YZ" />
@@ -175,7 +175,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="6mvxENQDKmX" role="37wK5m">
-                <ref role="3cqZAo" node="6mvxENQDKmS" resolve="list" />
+                <ref role="3cqZAo" node="6mvxENQDKmS" resolve="allArgs" />
               </node>
               <node concept="2ShNRf" id="6mvxENQDGM4" role="37wK5m">
                 <node concept="1pGfFk" id="6mvxENQDHoS" role="2ShVmc">
@@ -211,7 +211,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6mvxENQDoy9" role="3clF45">
-        <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunResult" />
+        <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunner.ToolRunResult" />
       </node>
       <node concept="3Tm1VV" id="6mvxENQDoy8" role="1B3o_S" />
     </node>
@@ -279,7 +279,7 @@
               <ref role="3cqZAo" node="6mvxENQFzWe" resolve="runner" />
             </node>
             <node concept="liA8E" id="6mvxENQFzWz" role="2OqNvi">
-              <ref role="37wK5l" to="2xjj:6mvxENQFlYW" resolve="run" />
+              <ref role="37wK5l" to="2xjj:6mvxENQFlYW" resolve="runAndBuildRawResults" />
               <node concept="2ShNRf" id="6mvxENQFzW$" role="37wK5m">
                 <node concept="Tc6Ow" id="6mvxENQFzW_" role="2ShVmc">
                   <node concept="17QB3L" id="6mvxENQFzWA" role="HW$YZ" />