Skip to content

Commit

Permalink
Merge pull request #2610 from mbeddr/merge/mps20232
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20232 into maintenance/mps20241
  • Loading branch information
@sergej-koscejev
sergej-koscejev authored Nov 20, 2024
2 parents 5f8bb65 + 3f9bbc2 commit 6bc9ed3
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 38 deletions.
102 changes: 66 additions & 36 deletions ...ges/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/typesystem.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,56 +287,86 @@
<property role="TrG5h" value="typeof_AreEqualExpression" />
<property role="18ip37" value="true" />
<node concept="3clFbS" id="1_DWnhqnLJy" role="18ibNy">
<node concept="1Z5TYs" id="1_DWnhqnLLK" role="3cqZAp">
<node concept="mw_s8" id="1_DWnhqnLLL" role="1ZfhKB">
<node concept="2c44tf" id="1_DWnhqnLLM" role="mwGJk">
<node concept="_YKpA" id="1_DWnhqnLLN" role="2c44tc">
<node concept="3uibUv" id="1_DWnhqnLLO" role="_ZDj9">
<ref role="3uigEE" to="mqum:DYlgnBstFb" resolve="IgnoredProperty" />
<node concept="3clFbJ" id="5ktnDmVWVUo" role="3cqZAp">
<node concept="3clFbS" id="5ktnDmVWVUq" role="3clFbx">
<node concept="1Z5TYs" id="1_DWnhqnLLK" role="3cqZAp">
<node concept="mw_s8" id="1_DWnhqnLLL" role="1ZfhKB">
<node concept="2c44tf" id="1_DWnhqnLLM" role="mwGJk">
<node concept="_YKpA" id="1_DWnhqnLLN" role="2c44tc">
<node concept="3uibUv" id="1_DWnhqnLLO" role="_ZDj9">
<ref role="3uigEE" to="mqum:DYlgnBstFb" resolve="IgnoredProperty" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="mw_s8" id="1_DWnhqnLLP" role="1ZfhK$">
<node concept="1Z2H0r" id="1_DWnhqnLLQ" role="mwGJk">
<node concept="2OqwBi" id="1_DWnhqnLLR" role="1Z2MuG">
<node concept="1YBJjd" id="1_DWnhqnMcx" role="2Oq$k0">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
</node>
<node concept="3TrEf2" id="1_DWnhqnMW6" role="2OqNvi">
<ref role="3Tt5mk" to="8do3:1_DWnhqnLaj" resolve="ignoredProperties" />
<node concept="mw_s8" id="1_DWnhqnLLP" role="1ZfhK$">
<node concept="1Z2H0r" id="1_DWnhqnLLQ" role="mwGJk">
<node concept="2OqwBi" id="1_DWnhqnLLR" role="1Z2MuG">
<node concept="1YBJjd" id="1_DWnhqnMcx" role="2Oq$k0">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
</node>
<node concept="3TrEf2" id="1_DWnhqnMW6" role="2OqNvi">
<ref role="3Tt5mk" to="8do3:1_DWnhqnLaj" resolve="ignoredProperties" />
</node>
</node>
</node>
</node>
<node concept="1YBJjd" id="77BxNvs6v4$" role="1ZmcU8">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
</node>
</node>
</node>
<node concept="1YBJjd" id="77BxNvs6v4$" role="1ZmcU8">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
</node>
</node>
<node concept="1Z5TYs" id="3qPjHtY$at_" role="3cqZAp">
<node concept="mw_s8" id="3qPjHtY$atA" role="1ZfhKB">
<node concept="2c44tf" id="3qPjHtY$atB" role="mwGJk">
<node concept="_YKpA" id="3qPjHtY$atC" role="2c44tc">
<node concept="3uibUv" id="1c$j_OGo8u9" role="_ZDj9">
<ref role="3uigEE" to="mqum:2mzdNw3ouFX" resolve="IgnoredReference" />
</node>
<node concept="2OqwBi" id="5ktnDmVWW7z" role="3clFbw">
<node concept="2OqwBi" id="5ktnDmVWWJs" role="2Oq$k0">
<node concept="1YBJjd" id="5ktnDmVWVUz" role="2Oq$k0">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
</node>
<node concept="3TrEf2" id="5ktnDmVWXqr" role="2OqNvi">
<ref role="3Tt5mk" to="8do3:1_DWnhqnLaj" resolve="ignoredProperties" />
</node>
</node>
<node concept="3x8VRR" id="5ktnDmVWWtL" role="2OqNvi" />
</node>
<node concept="mw_s8" id="3qPjHtY$atE" role="1ZfhK$">
<node concept="1Z2H0r" id="3qPjHtY$atF" role="mwGJk">
<node concept="2OqwBi" id="3qPjHtY$atG" role="1Z2MuG">
<node concept="1YBJjd" id="3qPjHtY$atH" role="2Oq$k0">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
</node>
<node concept="3clFbJ" id="5ktnDmVWW$G" role="3cqZAp">
<node concept="3clFbS" id="5ktnDmVWW$I" role="3clFbx">
<node concept="1Z5TYs" id="3qPjHtY$at_" role="3cqZAp">
<node concept="mw_s8" id="3qPjHtY$atA" role="1ZfhKB">
<node concept="2c44tf" id="3qPjHtY$atB" role="mwGJk">
<node concept="_YKpA" id="3qPjHtY$atC" role="2c44tc">
<node concept="3uibUv" id="1c$j_OGo8u9" role="_ZDj9">
<ref role="3uigEE" to="mqum:2mzdNw3ouFX" resolve="IgnoredReference" />
</node>
</node>
</node>
<node concept="3TrEf2" id="3qPjHtY$aIY" role="2OqNvi">
<ref role="3Tt5mk" to="8do3:3qPjHtY$alZ" resolve="ignoredReferences" />
</node>
<node concept="mw_s8" id="3qPjHtY$atE" role="1ZfhK$">
<node concept="1Z2H0r" id="3qPjHtY$atF" role="mwGJk">
<node concept="2OqwBi" id="3qPjHtY$atG" role="1Z2MuG">
<node concept="1YBJjd" id="3qPjHtY$atH" role="2Oq$k0">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
</node>
<node concept="3TrEf2" id="3qPjHtY$aIY" role="2OqNvi">
<ref role="3Tt5mk" to="8do3:3qPjHtY$alZ" resolve="ignoredReferences" />
</node>
</node>
</node>
</node>
<node concept="1YBJjd" id="77BxNvs6v4x" role="1ZmcU8">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
</node>
</node>
</node>
<node concept="1YBJjd" id="77BxNvs6v4x" role="1ZmcU8">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
<node concept="2OqwBi" id="5ktnDmVWXOT" role="3clFbw">
<node concept="2OqwBi" id="5ktnDmVWXyY" role="2Oq$k0">
<node concept="1YBJjd" id="5ktnDmVWXws" role="2Oq$k0">
<ref role="1YBMHb" node="1_DWnhqnLJ$" resolve="areEqualExpression" />
</node>
<node concept="3TrEf2" id="5ktnDmVWXBY" role="2OqNvi">
<ref role="3Tt5mk" to="8do3:3qPjHtY$alZ" resolve="ignoredReferences" />
</node>
</node>
<node concept="3x8VRR" id="5ktnDmVWY73" role="2OqNvi" />
</node>
</node>
<node concept="1ZobV4" id="1_DWnhqnLLU" role="3cqZAp">
Expand Down
40 changes: 38 additions & 2 deletions ...tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,10 +836,10 @@
</node>
<node concept="1lH9Xt" id="5ktnDmVWo_W">
<property role="3DII0k" value="2hh8MJdVwqX/command" />
<property role="TrG5h" value="AssertNodeEquals" />
<property role="TrG5h" value="ValidationCheck" />
<node concept="1qefOq" id="5ktnDmVWo_X" role="1SKRRt">
<node concept="312cEu" id="5ktnDmVWo_Z" role="1qenE9">
<property role="TrG5h" value="MyClass" />
<property role="TrG5h" value="AssertNodeEquals" />
<node concept="2YIFZL" id="5ktnDmVWoBq" role="jymVt">
<property role="TrG5h" value="x" />
<node concept="3clFbS" id="5ktnDmVWoBt" role="3clF47">
Expand Down Expand Up @@ -871,6 +871,42 @@
<node concept="3Tm1VV" id="5ktnDmVWoA0" role="1B3o_S" />
</node>
</node>
<node concept="1qefOq" id="5ktnDmVWUZS" role="1SKRRt">
<node concept="312cEu" id="5ktnDmVWUZT" role="1qenE9">
<property role="TrG5h" value="AreEqualExpression" />
<node concept="2YIFZL" id="5ktnDmVWUZU" role="jymVt">
<property role="TrG5h" value="x" />
<node concept="3clFbS" id="5ktnDmVWUZV" role="3clF47">
<node concept="3clFbF" id="5ktnDmVWV1y" role="3cqZAp">
<node concept="13dIca" id="5ktnDmVWVnq" role="3clFbG">
<node concept="37vLTw" id="5ktnDmVWVoj" role="3uHU7w">
<ref role="3cqZAo" node="5ktnDmVWV05" resolve="b" />
</node>
<node concept="37vLTw" id="5ktnDmVWV1w" role="3uHU7B">
<ref role="3cqZAo" node="5ktnDmVWV03" resolve="a" />
</node>
<node concept="7CXmI" id="5ktnDmVWV_V" role="lGtFl">
<node concept="7OXhh" id="5ktnDmVWVAq" role="7EUXB">
<property role="GvXf4" value="true" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="5ktnDmVWV01" role="1B3o_S" />
<node concept="3cqZAl" id="5ktnDmVWV02" role="3clF45" />
<node concept="37vLTG" id="5ktnDmVWV03" role="3clF46">
<property role="TrG5h" value="a" />
<node concept="3Tqbb2" id="5ktnDmVWV04" role="1tU5fm" />
</node>
<node concept="37vLTG" id="5ktnDmVWV05" role="3clF46">
<property role="TrG5h" value="b" />
<node concept="3Tqbb2" id="5ktnDmVWV06" role="1tU5fm" />
</node>
</node>
<node concept="3Tm1VV" id="5ktnDmVWV07" role="1B3o_S" />
</node>
</node>
</node>
</model>

0 comments on commit 6bc9ed3

Please sign in to comment.