Skip to content

Commit

Permalink
Merge pull request #110 from mbeddr/merge/2022_2_into_2022_3
Browse files Browse the repository at this point in the history 
merge/maintenance_2022_2_into_maintenance_2022_3
  • Loading branch information
@danielratiu
danielratiu authored Sep 5, 2024
2 parents d9ea15b + 6f28810 commit 66bf2e5
Show file tree
Hide file tree
Showing 23 changed files with 1,754 additions and 771 deletions.
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ tasks {
maxHeapSize = "4G"

excludeModuleMigration("de.itemis.mps.editor.diagram", 0)
excludeModuleMigration("jetbrains.mps.baseLanguage.javadoc", 0)
}
}

Expand Down
8 changes: 4 additions & 4 deletions ....fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions ...ymo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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">
Expand Down
1 change: 1 addition & 0 deletions ...eddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/test.com.mbeddr.formal.cbmc.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<sourcePath />
<dependencies>
Expand Down
66 changes: 33 additions & 33 deletions ...ism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<node concept="112hEE" id="ZaBFheNc6A" role="112hEJ">
<node concept="113wzp" id="ZaBFheNc6B" role="113wzu">
<node concept="112hFX" id="ZaBFheNc72" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="ZaBFheNc78" role="113wz4">
<property role="2IPVms" value="1" />
Expand All @@ -168,7 +168,7 @@
<node concept="112hEE" id="1rXrB7iRZXF" role="112hEJ">
<node concept="113wzp" id="1rXrB7iRZXG" role="113wzu">
<node concept="112hFX" id="1rXrB7iShfw" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShfA" role="113wz4">
<property role="2IPVms" value="2" />
Expand All @@ -183,15 +183,15 @@
<property role="2IPVms" value="0" />
</node>
<node concept="112hFX" id="ZaBFheNc7c" role="2H9Iav">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
</node>
</node>
<node concept="112hEy" id="1rXrB7iShgI" role="112_Wh">
<node concept="112hEE" id="1rXrB7iShgJ" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShgK" role="113wzu">
<node concept="112hFX" id="1rXrB7iShgL" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShgM" role="113wz4">
<property role="2IPVms" value="3" />
Expand All @@ -204,7 +204,7 @@
<node concept="112hEE" id="1rXrB7iShgO" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShgP" role="113wzu">
<node concept="112hFX" id="1rXrB7iShgQ" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShgR" role="113wz4">
<property role="2IPVms" value="4" />
Expand All @@ -219,15 +219,15 @@
<property role="2IPVms" value="1" />
</node>
<node concept="112hFX" id="1rXrB7iShgV" role="2H9Iav">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
</node>
</node>
<node concept="112hEy" id="1rXrB7iShhR" role="112_Wh">
<node concept="112hEE" id="1rXrB7iShhS" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShhT" role="113wzu">
<node concept="112hFX" id="1rXrB7iShhU" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShhV" role="113wz4">
<property role="2IPVms" value="5" />
Expand All @@ -240,7 +240,7 @@
<node concept="112hEE" id="1rXrB7iShhX" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShhY" role="113wzu">
<node concept="112hFX" id="1rXrB7iShhZ" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShi0" role="113wz4">
<property role="2IPVms" value="6" />
Expand All @@ -255,15 +255,15 @@
<property role="2IPVms" value="2" />
</node>
<node concept="112hFX" id="1rXrB7iShi4" role="2H9Iav">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
</node>
</node>
<node concept="112hEy" id="1rXrB7iShj2" role="112_Wh">
<node concept="112hEE" id="1rXrB7iShj3" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShj4" role="113wzu">
<node concept="112hFX" id="1rXrB7iShj5" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShj6" role="113wz4">
<property role="2IPVms" value="1" />
Expand All @@ -276,15 +276,15 @@
<node concept="112hEE" id="1rXrB7iShj8" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShj9" role="113wzu">
<node concept="112hFX" id="1rXrB7iShja" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShjb" role="113wz4">
<property role="2IPVms" value="7" />
</node>
</node>
<node concept="113wzp" id="1rXrB7iShkr" role="113wzu">
<node concept="112hFX" id="1rXrB7iShk$" role="113wzq">
<ref role="112hCK" node="ZaBFheMfar" />
<ref role="112hCK" node="ZaBFheMfar" resolve="d" />
</node>
<node concept="2IPVmt" id="1rXrB7iShkF" role="113wz4">
<property role="2IPVms" value="1" />
Expand All @@ -299,23 +299,23 @@
<property role="2IPVms" value="3" />
</node>
<node concept="112hFX" id="1rXrB7iShjf" role="2H9Iav">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
</node>
</node>
<node concept="112hEy" id="1rXrB7iShkH" role="112_Wh">
<node concept="112hEE" id="1rXrB7iShkI" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShkJ" role="113wzu">
<node concept="112hFX" id="1rXrB7iShkK" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShkL" role="113wz4">
<property role="2IPVms" value="7" />
</node>
</node>
<node concept="113wzp" id="1rXrB7iShmt" role="113wzu">
<node concept="112hFX" id="1rXrB7iShmA" role="113wzq">
<ref role="112hCK" node="ZaBFheMfar" />
<ref role="112hCK" node="ZaBFheMfar" resolve="d" />
</node>
<node concept="2IPVmt" id="1rXrB7iShmH" role="113wz4">
<property role="2IPVms" value="2" />
Expand All @@ -328,15 +328,15 @@
<node concept="112hEE" id="1rXrB7iShkN" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShkO" role="113wzu">
<node concept="112hFX" id="1rXrB7iShkP" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShkQ" role="113wz4">
<property role="2IPVms" value="7" />
</node>
</node>
<node concept="113wzp" id="1rXrB7iShkR" role="113wzu">
<node concept="112hFX" id="1rXrB7iShkS" role="113wzq">
<ref role="112hCK" node="ZaBFheMfar" />
<ref role="112hCK" node="ZaBFheMfar" resolve="d" />
</node>
<node concept="2IPVmt" id="1rXrB7iShkT" role="113wz4">
<property role="2IPVms" value="3" />
Expand All @@ -351,23 +351,23 @@
<property role="2IPVms" value="4" />
</node>
<node concept="112hFX" id="1rXrB7iShkX" role="2H9Iav">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
</node>
</node>
<node concept="112hEy" id="1rXrB7iShnj" role="112_Wh">
<node concept="112hEE" id="1rXrB7iShnk" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShnl" role="113wzu">
<node concept="112hFX" id="1rXrB7iShnm" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShnn" role="113wz4">
<property role="2IPVms" value="7" />
</node>
</node>
<node concept="113wzp" id="1rXrB7iShno" role="113wzu">
<node concept="112hFX" id="1rXrB7iShnp" role="113wzq">
<ref role="112hCK" node="ZaBFheMfar" />
<ref role="112hCK" node="ZaBFheMfar" resolve="d" />
</node>
<node concept="2IPVmt" id="1rXrB7iShnq" role="113wz4">
<property role="2IPVms" value="4" />
Expand All @@ -380,15 +380,15 @@
<node concept="112hEE" id="1rXrB7iShns" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShnt" role="113wzu">
<node concept="112hFX" id="1rXrB7iShnu" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShnv" role="113wz4">
<property role="2IPVms" value="7" />
</node>
</node>
<node concept="113wzp" id="1rXrB7iShnw" role="113wzu">
<node concept="112hFX" id="1rXrB7iShnx" role="113wzq">
<ref role="112hCK" node="ZaBFheMfar" />
<ref role="112hCK" node="ZaBFheMfar" resolve="d" />
</node>
<node concept="2IPVmt" id="1rXrB7iShny" role="113wz4">
<property role="2IPVms" value="5" />
Expand All @@ -403,15 +403,15 @@
<property role="2IPVms" value="5" />
</node>
<node concept="112hFX" id="1rXrB7iShnA" role="2H9Iav">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
</node>
</node>
<node concept="112hEy" id="1rXrB7iShpt" role="112_Wh">
<node concept="112hEE" id="1rXrB7iShpu" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShpv" role="113wzu">
<node concept="112hFX" id="1rXrB7iShpw" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShpx" role="113wz4">
<property role="2IPVms" value="2" />
Expand All @@ -424,15 +424,15 @@
<node concept="112hEE" id="1rXrB7iShpA" role="112hEJ">
<node concept="113wzp" id="1rXrB7iShpB" role="113wzu">
<node concept="112hFX" id="1rXrB7iShpC" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iShpD" role="113wz4">
<property role="2IPVms" value="7" />
</node>
</node>
<node concept="113wzp" id="1rXrB7iShpE" role="113wzu">
<node concept="112hFX" id="1rXrB7iShpF" role="113wzq">
<ref role="112hCK" node="ZaBFheMfar" />
<ref role="112hCK" node="ZaBFheMfar" resolve="d" />
</node>
<node concept="2IPVmt" id="1rXrB7iShpG" role="113wz4">
<property role="2IPVms" value="6" />
Expand All @@ -447,15 +447,15 @@
<property role="2IPVms" value="6" />
</node>
<node concept="112hFX" id="1rXrB7iShpK" role="2H9Iav">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
</node>
</node>
<node concept="112hEy" id="1rXrB7iSySo" role="112_Wh">
<node concept="112hEE" id="1rXrB7iSySp" role="112hEJ">
<node concept="113wzp" id="1rXrB7iSySq" role="113wzu">
<node concept="112hFX" id="1rXrB7iSyUS" role="113wzq">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1rXrB7iSyUY" role="113wz4">
<property role="2IPVms" value="7" />
Expand All @@ -467,7 +467,7 @@
<property role="2IPVms" value="7" />
</node>
<node concept="112hFX" id="1rXrB7iSyUB" role="2H9Iav">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
</node>
</node>
Expand All @@ -476,7 +476,7 @@
</node>
<node concept="2oyOwK" id="1xpXAu0Q0D5">
<property role="TrG5h" value="_010_die_spec" />
<ref role="2oGCQt" node="ZaBFheK9QZ" />
<ref role="2oGCQt" node="ZaBFheK9QZ" resolve="_010_die" />
<node concept="2ozijr" id="1xpXAu0Q0D6" role="2oyNpA">
<property role="TrG5h" value="x" />
<node concept="2owvKH" id="1xpXAu0QqIZ" role="112KhV" />
Expand All @@ -491,18 +491,18 @@
<node concept="2oJwby" id="1xpXAu0X$cy" role="32OYtT">
<node concept="110AQS" id="1xpXAu0X$cz" role="2H9Iav">
<node concept="112hFX" id="1xpXAu0X$c$" role="2H9Iav">
<ref role="112hCK" node="ZaBFheM00U" />
<ref role="112hCK" node="ZaBFheM00U" resolve="s" />
</node>
<node concept="2IPVmt" id="1xpXAu0X$c_" role="2H9Ial">
<property role="2IPVms" value="7" />
</node>
</node>
<node concept="110AQS" id="1xpXAu0X$cA" role="2H9Ial">
<node concept="112hFX" id="1xpXAu0X$cB" role="2H9Ial">
<ref role="112hCK" node="1xpXAu0Q0D6" />
<ref role="112hCK" node="1xpXAu0Q0D6" resolve="x" />
</node>
<node concept="112hFX" id="1xpXAu0X$cC" role="2H9Iav">
<ref role="112hCK" node="ZaBFheMfar" />
<ref role="112hCK" node="ZaBFheMfar" resolve="d" />
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit 66bf2e5

Please sign in to comment.