Skip to content

Commit

Permalink
Merge pull request #1124 from IETS3/merge/mps20222
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20222 into maintenance/mps20223
  • Loading branch information
@arimer
arimer authored Nov 14, 2024
2 parents 56143b7 + 1d9a7ba commit b69997a
Show file tree
Hide file tree
Showing 10 changed files with 1,043 additions and 930 deletions.
10 changes: 1 addition & 9 deletions code/languages/org.iets3.opensource/.mps/vcs.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GithubSharedProjectSettings">
<option name="branchProtectionPatterns">
<list>
<option value="master" />
<option value="maintenance\/.*" />
</list>
</option>
</component>
<component name="IssueNavigationConfiguration">
<option name="links">
<list>
Expand All @@ -19,6 +11,6 @@
</option>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
<mapping directory="$iets3.github.opensource.home$" vcs="Git" />
</component>
</project>
166 changes: 83 additions & 83 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25276,7 +25276,7 @@
</node>
</node>
<node concept="13h7C7" id="2ufoZQIKHLk">
<ref role="13h7C2" to="hm2y:2ufoZQIKHqp" resolve="SimpleExpressionValueInspector" />
<ref role="13h7C2" to="hm2y:2ufoZQIKHqp" resolve="SimpleValueInspector" />
<node concept="13hLZK" id="2ufoZQIKHLl" role="13h7CW">
<node concept="3clFbS" id="2ufoZQIKHLm" role="2VODD2" />
</node>
Expand Down Expand Up @@ -28279,30 +28279,82 @@
</node>
</node>
</node>
<node concept="13h7C7" id="41vYFO2_l64">
<property role="3GE5qa" value="nix" />
<ref role="13h7C2" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
<node concept="13hLZK" id="41vYFO2_l65" role="13h7CW">
<node concept="3clFbS" id="41vYFO2_l66" role="2VODD2" />
<node concept="13h7C7" id="41vYFO2Jfdi">
<property role="3GE5qa" value="option" />
<ref role="13h7C2" to="hm2y:2rOWEwsEji_" resolve="NoneType" />
<node concept="13hLZK" id="41vYFO2Jfdj" role="13h7CW">
<node concept="3clFbS" id="41vYFO2Jfdk" role="2VODD2" />
</node>
<node concept="13i0hz" id="41vYFO2_l6n" role="13h7CS">
<node concept="13i0hz" id="41vYFO2Jfd_" role="13h7CS">
<property role="TrG5h" value="createDefaultVarExpr" />
<ref role="13i0hy" node="60Qa1k_nI2O" resolve="createDefaultVarExpr" />
<node concept="3Tm1VV" id="41vYFO2_l6o" role="1B3o_S" />
<node concept="3clFbS" id="41vYFO2_l6r" role="3clF47">
<node concept="3clFbF" id="41vYFO2_l81" role="3cqZAp">
<node concept="2pJPEk" id="41vYFO2_l7Z" role="3clFbG">
<node concept="2pJPED" id="41vYFO2_l80" role="2pJPEn">
<ref role="2pJxaS" to="hm2y:3nVyItrZBN9" resolve="EmptyValue" />
<node concept="3Tm1VV" id="41vYFO2JfdA" role="1B3o_S" />
<node concept="3clFbS" id="41vYFO2JfdD" role="3clF47">
<node concept="3clFbF" id="41vYFO2Jfff" role="3cqZAp">
<node concept="2pJPEk" id="41vYFO2Jffd" role="3clFbG">
<node concept="2pJPED" id="41vYFO2Jffe" role="2pJPEn">
<ref role="2pJxaS" to="hm2y:2rOWEwsFyNP" resolve="NoneLiteral" />
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="41vYFO2_l6s" role="3clF45">
<node concept="3Tqbb2" id="41vYFO2JfdE" role="3clF45">
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
</node>
</node>
</node>
<node concept="13h7C7" id="3eH6BL31ey3">
<ref role="13h7C2" to="hm2y:3eH6BL2TJIw" resolve="IAssignable" />
<node concept="13i0hz" id="3eH6BL31eym" role="13h7CS">
<property role="13i0iv" value="true" />
<property role="13i0it" value="true" />
<property role="TrG5h" value="getInitExpression" />
<node concept="3Tm1VV" id="3eH6BL31eyn" role="1B3o_S" />
<node concept="3Tqbb2" id="3eH6BL31eD4" role="3clF45" />
<node concept="3clFbS" id="3eH6BL31eyp" role="3clF47" />
</node>
<node concept="13i0hz" id="3eH6BL3bMI8" role="13h7CS">
<property role="13i0it" value="true" />
<property role="TrG5h" value="getName" />
<node concept="3Tm1VV" id="3eH6BL3bMI9" role="1B3o_S" />
<node concept="17QB3L" id="3eH6BL3bMQ8" role="3clF45" />
<node concept="3clFbS" id="3eH6BL3bMIb" role="3clF47">
<node concept="Jncv_" id="3eH6BL3bNjE" role="3cqZAp">
<ref role="JncvD" to="tpck:h0TrEE$" resolve="INamedConcept" />
<node concept="13iPFW" id="3eH6BL3bNka" role="JncvB" />
<node concept="3clFbS" id="3eH6BL3bNjG" role="Jncv$">
<node concept="3cpWs6" id="3eH6BL3bNtp" role="3cqZAp">
<node concept="2OqwBi" id="3eH6BL3bNBV" role="3cqZAk">
<node concept="Jnkvi" id="3eH6BL3bNtX" role="2Oq$k0">
<ref role="1M0zk5" node="3eH6BL3bNjH" resolve="namedNode" />
</node>
<node concept="3TrcHB" id="3eH6BL3bNMH" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
<node concept="JncvC" id="3eH6BL3bNjH" role="JncvA">
<property role="TrG5h" value="namedNode" />
<node concept="2jxLKc" id="3eH6BL3bNjI" role="1tU5fm" />
</node>
</node>
<node concept="3cpWs6" id="3eH6BL3bNXq" role="3cqZAp">
<node concept="2OqwBi" id="3eH6BL3bOrn" role="3cqZAk">
<node concept="2JrnkZ" id="3eH6BL3bObG" role="2Oq$k0">
<node concept="13iPFW" id="3eH6BL3bO1c" role="2JrQYb" />
</node>
<node concept="liA8E" id="3eH6BL3bO$O" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getPresentation()" resolve="getPresentation" />
</node>
</node>
</node>
</node>
</node>
<node concept="13hLZK" id="3eH6BL31ey4" role="13h7CW">
<node concept="3clFbS" id="3eH6BL31ey5" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="41vYFO2GtZu">
<property role="3GE5qa" value="tuples" />
<ref role="13h7C2" to="hm2y:5r47dOfJ9kS" resolve="InlineTupleType" />
Expand Down Expand Up @@ -28422,30 +28474,6 @@
</node>
</node>
</node>
<node concept="13h7C7" id="41vYFO2Jfdi">
<property role="3GE5qa" value="option" />
<ref role="13h7C2" to="hm2y:2rOWEwsEji_" resolve="NoneType" />
<node concept="13hLZK" id="41vYFO2Jfdj" role="13h7CW">
<node concept="3clFbS" id="41vYFO2Jfdk" role="2VODD2" />
</node>
<node concept="13i0hz" id="41vYFO2Jfd_" role="13h7CS">
<property role="TrG5h" value="createDefaultVarExpr" />
<ref role="13i0hy" node="60Qa1k_nI2O" resolve="createDefaultVarExpr" />
<node concept="3Tm1VV" id="41vYFO2JfdA" role="1B3o_S" />
<node concept="3clFbS" id="41vYFO2JfdD" role="3clF47">
<node concept="3clFbF" id="41vYFO2Jfff" role="3cqZAp">
<node concept="2pJPEk" id="41vYFO2Jffd" role="3clFbG">
<node concept="2pJPED" id="41vYFO2Jffe" role="2pJPEn">
<ref role="2pJxaS" to="hm2y:2rOWEwsFyNP" resolve="NoneLiteral" />
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="41vYFO2JfdE" role="3clF45">
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
</node>
</node>
</node>
<node concept="13h7C7" id="2KEzU_jNnNy">
<property role="3GE5qa" value="numeric.number" />
<ref role="13h7C2" to="hm2y:2KEzU_jNj4j" resolve="ISupportHexValues" />
Expand Down Expand Up @@ -29310,56 +29338,28 @@
</node>
</node>
</node>
<node concept="13h7C7" id="3eH6BL31ey3">
<ref role="13h7C2" to="hm2y:3eH6BL2TJIw" resolve="IAssignable" />
<node concept="13i0hz" id="3eH6BL31eym" role="13h7CS">
<property role="13i0iv" value="true" />
<property role="13i0it" value="true" />
<property role="TrG5h" value="getInitExpression" />
<node concept="3Tm1VV" id="3eH6BL31eyn" role="1B3o_S" />
<node concept="3Tqbb2" id="3eH6BL31eD4" role="3clF45" />
<node concept="3clFbS" id="3eH6BL31eyp" role="3clF47" />
<node concept="13h7C7" id="41vYFO2_l64">
<property role="3GE5qa" value="nix" />
<ref role="13h7C2" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
<node concept="13hLZK" id="41vYFO2_l65" role="13h7CW">
<node concept="3clFbS" id="41vYFO2_l66" role="2VODD2" />
</node>
<node concept="13i0hz" id="3eH6BL3bMI8" role="13h7CS">
<property role="13i0it" value="true" />
<property role="TrG5h" value="getName" />
<node concept="3Tm1VV" id="3eH6BL3bMI9" role="1B3o_S" />
<node concept="17QB3L" id="3eH6BL3bMQ8" role="3clF45" />
<node concept="3clFbS" id="3eH6BL3bMIb" role="3clF47">
<node concept="Jncv_" id="3eH6BL3bNjE" role="3cqZAp">
<ref role="JncvD" to="tpck:h0TrEE$" resolve="INamedConcept" />
<node concept="13iPFW" id="3eH6BL3bNka" role="JncvB" />
<node concept="3clFbS" id="3eH6BL3bNjG" role="Jncv$">
<node concept="3cpWs6" id="3eH6BL3bNtp" role="3cqZAp">
<node concept="2OqwBi" id="3eH6BL3bNBV" role="3cqZAk">
<node concept="Jnkvi" id="3eH6BL3bNtX" role="2Oq$k0">
<ref role="1M0zk5" node="3eH6BL3bNjH" resolve="namedNode" />
</node>
<node concept="3TrcHB" id="3eH6BL3bNMH" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
<node concept="JncvC" id="3eH6BL3bNjH" role="JncvA">
<property role="TrG5h" value="namedNode" />
<node concept="2jxLKc" id="3eH6BL3bNjI" role="1tU5fm" />
</node>
</node>
<node concept="3cpWs6" id="3eH6BL3bNXq" role="3cqZAp">
<node concept="2OqwBi" id="3eH6BL3bOrn" role="3cqZAk">
<node concept="2JrnkZ" id="3eH6BL3bObG" role="2Oq$k0">
<node concept="13iPFW" id="3eH6BL3bO1c" role="2JrQYb" />
</node>
<node concept="liA8E" id="3eH6BL3bO$O" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getPresentation()" resolve="getPresentation" />
<node concept="13i0hz" id="41vYFO2_l6n" role="13h7CS">
<property role="TrG5h" value="createDefaultVarExpr" />
<ref role="13i0hy" node="60Qa1k_nI2O" resolve="createDefaultVarExpr" />
<node concept="3Tm1VV" id="41vYFO2_l6o" role="1B3o_S" />
<node concept="3clFbS" id="41vYFO2_l6r" role="3clF47">
<node concept="3clFbF" id="41vYFO2_l81" role="3cqZAp">
<node concept="2pJPEk" id="41vYFO2_l7Z" role="3clFbG">
<node concept="2pJPED" id="41vYFO2_l80" role="2pJPEn">
<ref role="2pJxaS" to="hm2y:3nVyItrZBN9" resolve="EmptyValue" />
</node>
</node>
</node>
</node>
</node>
<node concept="13hLZK" id="3eH6BL31ey4" role="13h7CW">
<node concept="3clFbS" id="3eH6BL31ey5" role="2VODD2" />
<node concept="3Tqbb2" id="41vYFO2_l6s" role="3clF45">
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
</node>
</node>
</node>
</model>
Expand Down
Loading

0 comments on commit b69997a

Please sign in to comment.