Skip to content

Commit

Permalink
Merge branch 'maintenance/MPS-2023.2' into maintenance/MPS-2023.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielratiu
danielratiu authored Dec 5, 2024
2 parents 892b896 + bd1af14 commit 3cd7bb4
Show file tree
Hide file tree
Showing 3 changed files with 184 additions and 162 deletions.
67 changes: 57 additions & 10 deletions code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,13 @@
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" 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="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
<concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
Expand Down Expand Up @@ -574,6 +581,33 @@
</node>
</node>
</node>
<node concept="1X3_iC" id="7WmZZHgTW5S" role="lGtFl">
<property role="3V$3am" value="statement" />
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
<node concept="3clFbJ" id="7WmZZHgSVNg" role="8Wnug">
<node concept="3clFbS" id="7WmZZHgSVNi" role="3clFbx">
<node concept="3cpWs6" id="7WmZZHgT4D6" role="3cqZAp" />
</node>
<node concept="3fqX7Q" id="7WmZZHgT4Da" role="3clFbw">
<node concept="2OqwBi" id="7WmZZHgT4Dc" role="3fr31v">
<node concept="2OqwBi" id="7WmZZHgT4Dd" role="2Oq$k0">
<node concept="1YBJjd" id="7WmZZHgT4De" role="2Oq$k0">
<ref role="1YBMHb" node="1tkdAPw1fX2" resolve="componentDefinition" />
</node>
<node concept="3TrcHB" id="7WmZZHgT4Df" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="liA8E" id="7WmZZHgT4Dg" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="Xl_RD" id="7WmZZHgT4Dh" role="37wK5m">
<property role="Xl_RC" value="dsaf" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2Gpval" id="fm3v0WXL0n" role="3cqZAp">
<node concept="2GrKxI" id="fm3v0WXL0p" role="2Gsz3X">
<property role="TrG5h" value="currentSubComponent" />
Expand Down Expand Up @@ -1983,21 +2017,34 @@
<property role="3GE5qa" value="dependencies" />
<node concept="3clFbS" id="Te1zv$_r1i" role="18ibNy">
<node concept="3clFbJ" id="Te1zv$_sTw" role="3cqZAp">
<node concept="3fqX7Q" id="Te1zv$_tUj" role="3clFbw">
<node concept="2OqwBi" id="Te1zv$_tUl" role="3fr31v">
<node concept="2OqwBi" id="Te1zv$_tUm" role="2Oq$k0">
<node concept="1YBJjd" id="Te1zv$_tUn" role="2Oq$k0">
<ref role="1YBMHb" node="Te1zv$_r1k" resolve="singleComponentDependency" />
<node concept="1Wc70l" id="6mSn$bxiUvz" role="3clFbw">
<node concept="3fqX7Q" id="Te1zv$_tUj" role="3uHU7w">
<node concept="2OqwBi" id="Te1zv$_tUl" role="3fr31v">
<node concept="2OqwBi" id="Te1zv$_tUm" role="2Oq$k0">
<node concept="1YBJjd" id="Te1zv$_tUn" role="2Oq$k0">
<ref role="1YBMHb" node="Te1zv$_r1k" resolve="singleComponentDependency" />
</node>
<node concept="3TrcHB" id="Te1zv$_tUo" role="2OqNvi">
<ref role="3TsBF5" to="ryx8:Te1zv$_jA0" resolve="lock" />
</node>
</node>
<node concept="3TrcHB" id="Te1zv$_tUo" role="2OqNvi">
<ref role="3TsBF5" to="ryx8:Te1zv$_jA0" resolve="lock" />
<node concept="21noJN" id="Te1zv$_tUp" role="2OqNvi">
<node concept="21nZrQ" id="Te1zv$_tUq" role="21noJM">
<ref role="21nZrZ" to="ryx8:Te1zv$_mML" resolve="NO_LOCK" />
</node>
</node>
</node>
<node concept="21noJN" id="Te1zv$_tUp" role="2OqNvi">
<node concept="21nZrQ" id="Te1zv$_tUq" role="21noJM">
<ref role="21nZrZ" to="ryx8:Te1zv$_mML" resolve="NO_LOCK" />
</node>
<node concept="2OqwBi" id="6mSn$bxiWvQ" role="3uHU7B">
<node concept="2OqwBi" id="6mSn$bxiVkr" role="2Oq$k0">
<node concept="1YBJjd" id="6mSn$bxiVks" role="2Oq$k0">
<ref role="1YBMHb" node="Te1zv$_r1k" resolve="singleComponentDependency" />
</node>
<node concept="3TrcHB" id="6mSn$bxiVkt" role="2OqNvi">
<ref role="3TsBF5" to="ryx8:Te1zv$_jA0" resolve="lock" />
</node>
</node>
<node concept="3x8VRR" id="6mSn$bxiXxQ" role="2OqNvi" />
</node>
</node>
<node concept="3clFbS" id="Te1zv$_sTy" role="3clFbx">
Expand Down
47 changes: 34 additions & 13 deletions code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
<concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
<concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
Expand Down Expand Up @@ -623,25 +624,45 @@
</node>
<node concept="2OqwBi" id="1XeVdf8j9YC" role="33vP2m">
<node concept="2OqwBi" id="1XeVdf8j9YD" role="2Oq$k0">
<node concept="2OqwBi" id="3w9G5d4WDLB" role="2Oq$k0">
<node concept="37vLTw" id="1XeVdf8j9YF" role="2Oq$k0">
<ref role="3cqZAo" node="1XeVdf8iUjD" resolve="referencedNodes" />
<node concept="2OqwBi" id="1pfo1CnLw8n" role="2Oq$k0">
<node concept="2OqwBi" id="3w9G5d4WDLB" role="2Oq$k0">
<node concept="37vLTw" id="1XeVdf8j9YF" role="2Oq$k0">
<ref role="3cqZAo" node="1XeVdf8iUjD" resolve="referencedNodes" />
</node>
<node concept="3$u5V9" id="1XeVdf8j9YG" role="2OqNvi">
<node concept="1bVj0M" id="1XeVdf8j9YH" role="23t8la">
<node concept="3clFbS" id="1XeVdf8j9YI" role="1bW5cS">
<node concept="3clFbF" id="1XeVdf8j9YJ" role="3cqZAp">
<node concept="2OqwBi" id="1XeVdf8j9YK" role="3clFbG">
<node concept="37vLTw" id="1XeVdf8j9YL" role="2Oq$k0">
<ref role="3cqZAo" node="4KwcbYpCIKG" resolve="it" />
</node>
<node concept="I4A8Y" id="1XeVdf8j9YM" role="2OqNvi" />
</node>
</node>
</node>
<node concept="gl6BB" id="4KwcbYpCIKG" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="4KwcbYpCIKH" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="3$u5V9" id="1XeVdf8j9YG" role="2OqNvi">
<node concept="1bVj0M" id="1XeVdf8j9YH" role="23t8la">
<node concept="3clFbS" id="1XeVdf8j9YI" role="1bW5cS">
<node concept="3clFbF" id="1XeVdf8j9YJ" role="3cqZAp">
<node concept="2OqwBi" id="1XeVdf8j9YK" role="3clFbG">
<node concept="37vLTw" id="1XeVdf8j9YL" role="2Oq$k0">
<ref role="3cqZAo" node="4KwcbYpCIKG" resolve="it" />
<node concept="3zZkjj" id="1pfo1CnLyWd" role="2OqNvi">
<node concept="1bVj0M" id="1pfo1CnLyWf" role="23t8la">
<node concept="3clFbS" id="1pfo1CnLyWg" role="1bW5cS">
<node concept="3clFbF" id="1pfo1CnLIDk" role="3cqZAp">
<node concept="3y3z36" id="1pfo1CnLLgY" role="3clFbG">
<node concept="10Nm6u" id="1pfo1CnLLM_" role="3uHU7w" />
<node concept="37vLTw" id="1pfo1CnLIDj" role="3uHU7B">
<ref role="3cqZAo" node="1pfo1CnLyWh" resolve="it" />
</node>
<node concept="I4A8Y" id="1XeVdf8j9YM" role="2OqNvi" />
</node>
</node>
</node>
<node concept="gl6BB" id="4KwcbYpCIKG" role="1bW2Oz">
<node concept="gl6BB" id="1pfo1CnLyWh" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="4KwcbYpCIKH" role="1tU5fm" />
<node concept="2jxLKc" id="1pfo1CnLyWi" role="1tU5fm" />
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit 3cd7bb4

Please sign in to comment.