natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return 'tagDetail' logic in RuleBuilder to handle duplicate tags of rules generated in loops

This commit is contained in:
Grigorii Kirgizov 2019-08-22 16:04:48 +03:00
parent ff9d109ea6
commit 924d07c8ed
4 changed files with 382 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
View File

@ -63,6 +63,9 @@
<concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
<child id="1076505808688" name="condition" index="2$JKZa" />
</concept>
<concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
<child id="1239714902950" name="expression" index="2$L3a6" />
</concept>
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
</concept>
@ -119,6 +122,7 @@
<reference id="1144433057691" name="classifier" index="1PxDUh" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
<child id="1070534934091" name="type" index="10QFUM" />
@ -233,6 +237,7 @@
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
</concept>
<concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
@ -6896,6 +6901,33 @@
</node>
<node concept="SfApY" id="tIwzd1I3W$" role="3cqZAp">
<node concept="3clFbS" id="tIwzd1I3W_" role="SfCbr">
<node concept="3cpWs8" id="1lzLQ0zthoQ" role="3cqZAp">
<node concept="3cpWsn" id="1lzLQ0zthoT" role="3cpWs9">
<property role="TrG5h" value="tags" />
<node concept="2hMVRd" id="1lzLQ0zthoM" role="1tU5fm">
<node concept="3uibUv" id="1lzLQ0zthJ4" role="2hN53Y">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="2ShNRf" id="1lzLQ0ztk2x" role="33vP2m">
<node concept="2i4dXS" id="1lzLQ0ztlh2" role="2ShVmc">
<node concept="3uibUv" id="1lzLQ0ztlyx" role="HW$YZ">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="1lzLQ0ztorX" role="3cqZAp">
<node concept="3cpWsn" id="1lzLQ0ztos0" role="3cpWs9">
<property role="TrG5h" value="tagSuffix" />
<node concept="10Oyi0" id="1lzLQ0ztorV" role="1tU5fm" />
<node concept="3cmrfG" id="1lzLQ0ztp0b" role="33vP2m">
<property role="3cmrfH" value="1" />
</node>
</node>
</node>
<node concept="3clFbH" id="1lzLQ0zvDes" role="3cqZAp" />
<node concept="2Gpval" id="tIwzd1I3Wy" role="3cqZAp">
<node concept="3clFbS" id="tIwzd1I3Wz" role="2LFqv$">
<node concept="3clFbJ" id="6i42QSsjOPU" role="3cqZAp">
@ -7058,6 +7090,98 @@
</node>
</node>
</node>
<node concept="3SKdUt" id="1lzLQ0zvEbS" role="3cqZAp">
<node concept="1PaTwC" id="1lzLQ0zvEbT" role="3ndbpf">
<node concept="3oM_SD" id="1lzLQ0zvEI6" role="1PaTwD">
<property role="3oM_SC" value="tag" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvEKV" role="1PaTwD">
<property role="3oM_SC" value="suffix" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvETC" role="1PaTwD">
<property role="3oM_SC" value="is" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvEWv" role="1PaTwD">
<property role="3oM_SC" value="required" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvF27" role="1PaTwD">
<property role="3oM_SC" value="when" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvF50" role="1PaTwD">
<property role="3oM_SC" value="rules" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvF7U" role="1PaTwD">
<property role="3oM_SC" value="are" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvF82" role="1PaTwD">
<property role="3oM_SC" value="generated" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvF8b" role="1PaTwD">
<property role="3oM_SC" value="in" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvF8l" role="1PaTwD">
<property role="3oM_SC" value="a" />
</node>
<node concept="3oM_SD" id="1lzLQ0zvF8w" role="1PaTwD">
<property role="3oM_SC" value="loop" />
</node>
</node>
</node>
<node concept="3clFbJ" id="1lzLQ0ztp_v" role="3cqZAp">
<node concept="3clFbS" id="1lzLQ0ztp_x" role="3clFbx">
<node concept="3clFbF" id="1lzLQ0ztwHU" role="3cqZAp">
<node concept="2OqwBi" id="1lzLQ0ztwP9" role="3clFbG">
<node concept="2GrUjf" id="1lzLQ0ztwHS" role="2Oq$k0">
<ref role="2Gs0qQ" node="tIwzd1I3Xb" resolve="builder" />
</node>
<node concept="liA8E" id="1lzLQ0zvBXd" role="2OqNvi">
<ref role="37wK5l" to="i348:1lzLQ0zuv5E" resolve="setTagSuffix" />
<node concept="3uNrnE" id="1lzLQ0zvD5Y" role="37wK5m">
<node concept="37vLTw" id="1lzLQ0zvD60" role="2$L3a6">
<ref role="3cqZAo" node="1lzLQ0ztos0" resolve="tagSuffix" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="1lzLQ0ztuv8" role="3clFbw">
<node concept="37vLTw" id="1lzLQ0zttAO" role="2Oq$k0">
<ref role="3cqZAo" node="1lzLQ0zthoT" resolve="tags" />
</node>
<node concept="3JPx81" id="1lzLQ0ztv4_" role="2OqNvi">
<node concept="2OqwBi" id="1lzLQ0ztvnG" role="25WWJ7">
<node concept="2GrUjf" id="1lzLQ0ztveq" role="2Oq$k0">
<ref role="2Gs0qQ" node="tIwzd1I3Xb" resolve="builder" />
</node>
<node concept="liA8E" id="1lzLQ0zvBun" role="2OqNvi">
<ref role="37wK5l" to="i348:1lzLQ0zv1m2" resolve="tag" />
</node>
</node>
</node>
</node>
<node concept="9aQIb" id="1lzLQ0zvMAC" role="9aQIa">
<node concept="3clFbS" id="1lzLQ0zvMAD" role="9aQI4">
<node concept="3clFbF" id="1lzLQ0ztq5K" role="3cqZAp">
<node concept="2OqwBi" id="1lzLQ0ztqUm" role="3clFbG">
<node concept="37vLTw" id="1lzLQ0ztq5I" role="2Oq$k0">
<ref role="3cqZAo" node="1lzLQ0zthoT" resolve="tags" />
</node>
<node concept="TSZUe" id="1lzLQ0ztrRZ" role="2OqNvi">
<node concept="2OqwBi" id="1lzLQ0ztsAw" role="25WWJ7">
<node concept="2GrUjf" id="1lzLQ0ztsgx" role="2Oq$k0">
<ref role="2Gs0qQ" node="tIwzd1I3Xb" resolve="builder" />
</node>
<node concept="liA8E" id="1lzLQ0zvFmp" role="2OqNvi">
<ref role="37wK5l" to="i348:1lzLQ0zv1m2" resolve="tag" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="4MqhgXUBix6" role="2GsD0m">
<ref role="3cqZAo" node="4MqhgXUBix2" resolve="builders" />

93
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
View File

@ -2785,6 +2785,21 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="1lzLQ0zuHxv" role="jymVt" />
<node concept="3clFb_" id="1lzLQ0zv1m2" role="jymVt">
<property role="TrG5h" value="tag" />
<node concept="3clFbS" id="1lzLQ0zv1m5" role="3clF47">
<node concept="3clFbF" id="1lzLQ0zv6L$" role="3cqZAp">
<node concept="37vLTw" id="1lzLQ0zv6Lz" role="3clFbG">
<ref role="3cqZAo" node="6lpwCiZjjEm" resolve="tag" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="1lzLQ0zuSfI" role="1B3o_S" />
<node concept="3uibUv" id="1lzLQ0zuYPC" role="3clF45">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="2tJIrI" id="1N8$BG_3wAX" role="jymVt" />
<node concept="3clFb_" id="1N8$BG_3xre" role="jymVt">
<property role="TrG5h" value="uniqueTag" />
@ -2859,18 +2874,51 @@
</node>
</node>
</node>
<node concept="3clFbJ" id="1lzLQ0zvkzC" role="3cqZAp">
<node concept="3clFbS" id="1lzLQ0zvkzE" role="3clFbx">
<node concept="3clFbF" id="1lzLQ0zvuoF" role="3cqZAp">
<node concept="2OqwBi" id="1lzLQ0zv8Hp" role="3clFbG">
<node concept="2OqwBi" id="6$Huwhrydmu" role="2Oq$k0">
<node concept="37vLTw" id="6$Huwhry4ML" role="2Oq$k0">
<ref role="3cqZAo" node="6$HuwhrxNoF" resolve="sb" />
</node>
<node concept="liA8E" id="6$HuwhrydAc" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="Xl_RD" id="6$HuwhrydEd" role="37wK5m">
<property role="Xl_RC" value="_" />
</node>
</node>
</node>
<node concept="liA8E" id="1lzLQ0zv9os" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(int)" resolve="append" />
<node concept="37vLTw" id="1lzLQ0zva0x" role="37wK5m">
<ref role="3cqZAo" node="1lzLQ0ztUU2" resolve="tagGenSuffix" />
</node>
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="1lzLQ0zvswC" role="3clFbw">
<node concept="3cmrfG" id="1lzLQ0zvsGT" role="3uHU7w">
<property role="3cmrfH" value="0" />
</node>
<node concept="37vLTw" id="1lzLQ0zvqW0" role="3uHU7B">
<ref role="3cqZAo" node="1lzLQ0ztUU2" resolve="tagGenSuffix" />
</node>
</node>
</node>
<node concept="3clFbF" id="6$Huwhry4MN" role="3cqZAp">
<node concept="2OqwBi" id="6$Huwhry9qh" role="3clFbG">
<node concept="2OqwBi" id="6$Huwhrydmu" role="2Oq$k0">
<node concept="37vLTw" id="6$Huwhry4ML" role="2Oq$k0">
<ref role="3cqZAo" node="6$HuwhrxNoF" resolve="sb" />
</node>
<node concept="liA8E" id="6$HuwhrydAc" role="2OqNvi">
<node concept="2OqwBi" id="1lzLQ0zvc8r" role="2Oq$k0">
<node concept="liA8E" id="1lzLQ0zvcg2" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="Xl_RD" id="6$HuwhrydEd" role="37wK5m">
<node concept="Xl_RD" id="1lzLQ0zvcg3" role="37wK5m">
<property role="Xl_RC" value="_" />
</node>
</node>
<node concept="37vLTw" id="1lzLQ0zvt$V" role="2Oq$k0">
<ref role="3cqZAo" node="6$HuwhrxNoF" resolve="sb" />
</node>
</node>
<node concept="liA8E" id="6$Huwhry9KD" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(int)" resolve="append" />
@ -2897,6 +2945,31 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="1lzLQ0zudT2" role="jymVt" />
<node concept="3clFb_" id="1lzLQ0zuv5E" role="jymVt">
<property role="TrG5h" value="setTagSuffix" />
<node concept="3clFbS" id="1lzLQ0zuv5H" role="3clF47">
<node concept="3clFbF" id="1lzLQ0zuFWD" role="3cqZAp">
<node concept="37vLTI" id="1lzLQ0zuH10" role="3clFbG">
<node concept="37vLTw" id="1lzLQ0zuHi5" role="37vLTx">
<ref role="3cqZAo" node="1lzLQ0zu_HG" resolve="tagSuffix" />
</node>
<node concept="2OqwBi" id="1lzLQ0zuG1j" role="37vLTJ">
<node concept="Xjq3P" id="1lzLQ0zuFWC" role="2Oq$k0" />
<node concept="2OwXpG" id="1lzLQ0zuG7q" role="2OqNvi">
<ref role="2Oxat5" node="1lzLQ0ztUU2" resolve="tagGenSuffix" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="1lzLQ0zuouw" role="1B3o_S" />
<node concept="3cqZAl" id="1lzLQ0zuv3M" role="3clF45" />
<node concept="37vLTG" id="1lzLQ0zu_HG" role="3clF46">
<property role="TrG5h" value="tagSuffix" />
<node concept="10Oyi0" id="1lzLQ0zu_HF" role="1tU5fm" />
</node>
</node>
<node concept="2tJIrI" id="32fHqDf8Y5W" role="jymVt" />
<node concept="3clFb_" id="32fHqDf8Vx1" role="jymVt">
<property role="TrG5h" value="appendAlternation" />
@ -4479,6 +4552,14 @@
<node concept="3Tm6S6" id="6xVZN2uA62G" role="1B3o_S" />
<node concept="17QB3L" id="6xVZN2uAbM7" role="1tU5fm" />
</node>
<node concept="312cEg" id="1lzLQ0ztUU2" role="jymVt">
<property role="TrG5h" value="tagGenSuffix" />
<node concept="3Tm6S6" id="1lzLQ0ztOiW" role="1B3o_S" />
<node concept="10Oyi0" id="1lzLQ0ztUSa" role="1tU5fm" />
<node concept="3cmrfG" id="1lzLQ0zvdf0" role="33vP2m">
<property role="3cmrfH" value="0" />
</node>
</node>
<node concept="312cEg" id="7nPD14Ob4vA" role="jymVt">
<property role="TrG5h" value="templateRef" />
<node concept="3Tm6S6" id="7nPD14Ob4vB" role="1B3o_S" />

337
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
View File

@ -6943,8 +6943,8 @@
</node>
</node>
</node>
<node concept="3Tm1VV" id="tIwzd2cJHE" role="1B3o_S" />
<node concept="2tJIrI" id="tIwzd2cJHW" role="jymVt" />
<node concept="3Tm1VV" id="tIwzd2cJHE" role="1B3o_S" />
</node>
<node concept="AVZre" id="6KkyQm4aYIo">
<property role="TrG5h" value="Containment" />
@ -13174,6 +13174,9 @@
</node>
<node concept="3Aqczg" id="2rIdnPvGPVF" role="3cqZAp">
<node concept="3A8Hvi" id="2rIdnPvGPV_" role="3Aqpz8">
<node concept="a7P8L" id="2rIdnPvGPXI" role="3A8wtg">
<ref role="a7OzE" node="5_6ImQYcOig" resolve="StartFrom" />
</node>
<node concept="Hz6ka" id="2rIdnPwh4D9" role="3A8w4Q">
<node concept="1oi5XN" id="2rIdnPwh4EP" role="Hz6kd">
<node concept="22Ky0T" id="2rIdnPwh4Gu" role="lGtFl">
@ -13185,9 +13188,6 @@
</node>
</node>
</node>
<node concept="a7P8L" id="2rIdnPvGPXI" role="3A8wtg">
<ref role="a7OzE" node="5_6ImQYcOig" resolve="StartFrom" />
</node>
</node>
</node>
<node concept="3Aqczg" id="2rIdnPtWlmx" role="3cqZAp">
@ -13197,8 +13197,8 @@
</node>
<node concept="HKQnh" id="2rIdnPtWlnq" role="3A8w4Q">
<node concept="2YIFZM" id="2rIdnPtWlnO" role="HKQng">
<ref role="1Pybhc" node="3KV3FXk1fjd" resolve="PathHelper" />
<ref role="37wK5l" node="3KV3FXk1fGe" resolve="findPath" />
<ref role="1Pybhc" node="3KV3FXk1fjd" resolve="PathHelper" />
<node concept="1TmgYN" id="2rIdnPtWlnQ" role="37wK5m">
<node concept="1nq8_$" id="2rIdnPtWlnY" role="1Tms7$">
<node concept="a7P8L" id="2rIdnPtWlnW" role="1nq8_t">
@ -14561,6 +14561,9 @@
<node concept="3clFbH" id="6BU$YTNHdPh" role="3cqZAp" />
<node concept="3Aqczg" id="2rIdnPtx_3e" role="3cqZAp">
<node concept="3A8Hvi" id="2rIdnPtx_38" role="3Aqpz8">
<node concept="a7P8L" id="2rIdnPtx_4g" role="3A8wtg">
<ref role="a7OzE" node="4JRKVCvg6UN" resolve="LubClassifiers" />
</node>
<node concept="HKQnh" id="2rIdnPtx_9L" role="3A8w4Q">
<node concept="2YIFZM" id="2rIdnPtx_ae" role="HKQng">
<ref role="37wK5l" node="5H6hZahmloU" resolve="findRawLub" />
@ -14581,9 +14584,6 @@
</node>
</node>
</node>
<node concept="a7P8L" id="2rIdnPtx_4g" role="3A8wtg">
<ref role="a7OzE" node="4JRKVCvg6UN" resolve="LubClassifiers" />
</node>
</node>
</node>
<node concept="3clFbH" id="2rIdnPwjYAF" role="3cqZAp" />
@ -22542,11 +22542,11 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="3KV3FXk1jp4" role="jymVt" />
<node concept="3Tm1VV" id="3KV3FXk1fje" role="1B3o_S" />
<node concept="3uibUv" id="3KV3FXk1$PC" role="1zkMxy">
<ref role="3uigEE" node="3KV3FXk1mCr" resolve="BaseHelper" />
</node>
<node concept="2tJIrI" id="3KV3FXk1jp4" role="jymVt" />
</node>
<node concept="312cEu" id="3KV3FXk1mCr">
<property role="TrG5h" value="BaseHelper" />
@ -22977,6 +22977,12 @@
<node concept="3cpWs8" id="3KV3FXk0plc" role="3cqZAp">
<node concept="3cpWsn" id="3KV3FXk0pld" role="3cpWs9">
<property role="TrG5h" value="resultList" />
<node concept="3uibUv" id="3KV3FXk0pl4" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3uibUv" id="3KV3FXk0pl7" role="11_B2D">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
<node concept="2OqwBi" id="3KV3FXk0ple" role="33vP2m">
<node concept="2ShNRf" id="3KV3FXk0plf" role="2Oq$k0">
<node concept="1pGfFk" id="3KV3FXk0plg" role="2ShVmc">
@ -22993,12 +22999,6 @@
</node>
</node>
</node>
<node concept="3uibUv" id="3KV3FXk0pl4" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3uibUv" id="3KV3FXk0pl7" role="11_B2D">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="3KV3FXjZMU_" role="3cqZAp">
@ -24076,9 +24076,6 @@
</node>
<node concept="2tJIrI" id="3KV3FXjZF4v" role="jymVt" />
<node concept="3Tm1VV" id="5H6hZahmloo" role="1B3o_S" />
<node concept="3uibUv" id="3KV3FXk1o$R" role="1zkMxy">
<ref role="3uigEE" node="3KV3FXk1mCr" resolve="BaseHelper" />
</node>
<node concept="312cEg" id="3KV3FXjZG64" role="jymVt">
<property role="TrG5h" value="candidateList" />
<property role="3TUv4t" value="false" />
@ -24117,6 +24114,9 @@
</node>
</node>
</node>
<node concept="3uibUv" id="3KV3FXk1o$R" role="1zkMxy">
<ref role="3uigEE" node="3KV3FXk1mCr" resolve="BaseHelper" />
</node>
</node>
<node concept="1M$Gom" id="6hqFpWmMzld">
<property role="TrG5h" value="Type Parameters" />
@ -31687,159 +31687,143 @@
</node>
<node concept="3cpWs8" id="3sbALnUgpas" role="3cqZAp">
<node concept="3cpWsn" id="3sbALnUgpav" role="3cpWs9">
<property role="TrG5h" value="firstEmptyDim" />
<node concept="2OqwBi" id="3sbALnUg5p0" role="33vP2m">
<node concept="2OqwBi" id="3sbALnUg3i9" role="2Oq$k0">
<node concept="3A2sRY" id="3sbALnUg38s" role="2Oq$k0">
<ref role="3A2yKK" node="1lzLQ0zo2uf" resolve="arrc" />
</node>
<node concept="3Tsc0h" id="3sbALnUg3C_" role="2OqNvi">
<ref role="3TtcxE" to="tpee:hf$GQt2" resolve="dimensionExpression" />
</node>
</node>
<node concept="1z4cxt" id="3sbALnUg7ej" role="2OqNvi">
<node concept="1bVj0M" id="3sbALnUg7el" role="23t8la">
<node concept="3clFbS" id="3sbALnUg7em" role="1bW5cS">
<node concept="3clFbF" id="3sbALnUg7nk" role="3cqZAp">
<node concept="2OqwBi" id="3sbALnUg7X_" role="3clFbG">
<node concept="2OqwBi" id="3sbALnUg7vm" role="2Oq$k0">
<node concept="37vLTw" id="3sbALnUg7nj" role="2Oq$k0">
<ref role="3cqZAo" node="3sbALnUg7en" resolve="it" />
</node>
<node concept="3TrEf2" id="3sbALnUg7EZ" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hf$I4rk" resolve="expression" />
</node>
</node>
<node concept="3w_OXm" id="3sbALnUg8br" role="2OqNvi" />
</node>
</node>
</node>
<node concept="Rh6nW" id="3sbALnUg7en" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="3sbALnUg7eo" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="3sbALnUgpaq" role="1tU5fm" />
</node>
</node>
<node concept="3cpWs8" id="3sbALnUg2zL" role="3cqZAp">
<node concept="3cpWsn" id="3sbALnUg2zO" role="3cpWs9">
<property role="TrG5h" value="firstEmptyDimIdx" />
<node concept="10Oyi0" id="3sbALnUg2zJ" role="1tU5fm" />
<node concept="3K4zz7" id="1lzLQ0zmffK" role="33vP2m">
<node concept="2OqwBi" id="1lzLQ0zmfAH" role="3K4E3e">
<node concept="37vLTw" id="1lzLQ0zmfhJ" role="2Oq$k0">
<ref role="3cqZAo" node="3sbALnUgpav" resolve="firstEmptyDim" />
</node>
<node concept="2bSWHS" id="1lzLQ0zmfMJ" role="2OqNvi" />
</node>
<node concept="37vLTw" id="1lzLQ0zmfMW" role="3K4GZi">
<ref role="3cqZAo" node="1lzLQ0zo2RN" resolve="ndims" />
</node>
<node concept="2OqwBi" id="3sbALnUgqTz" role="3K4Cdx">
<node concept="37vLTw" id="3sbALnUgqhq" role="2Oq$k0">
<ref role="3cqZAo" node="3sbALnUgpav" resolve="firstEmptyDim" />
</node>
<node concept="3x8VRR" id="1lzLQ0zmdb3" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="1lzLQ0zo4NN" role="3cqZAp" />
<node concept="3SKdUt" id="3sbALnUgw$O" role="3cqZAp">
<node concept="1PaTwC" id="3sbALnUgw$P" role="3ndbpf">
<node concept="3oM_SD" id="3sbALnUgwFP" role="1PaTwD">
<property role="3oM_SC" value="all" />
</node>
<node concept="3oM_SD" id="3sbALnUgwJE" role="1PaTwD">
<property role="3oM_SC" value="following" />
</node>
<node concept="3oM_SD" id="3sbALnUgwNw" role="1PaTwD">
<property role="3oM_SC" value="dims" />
</node>
<node concept="3oM_SD" id="3sbALnUgwN$" role="1PaTwD">
<property role="3oM_SC" value="must" />
</node>
<node concept="3oM_SD" id="3sbALnUgwRs" role="1PaTwD">
<property role="3oM_SC" value="also" />
</node>
<node concept="3oM_SD" id="3sbALnUgwVl" role="1PaTwD">
<property role="3oM_SC" value="be" />
</node>
<node concept="3oM_SD" id="3sbALnUgwVs" role="1PaTwD">
<property role="3oM_SC" value="null" />
</node>
</node>
</node>
<node concept="1Dw8fO" id="3sbALnUgbVc" role="3cqZAp">
<node concept="3clFbS" id="3sbALnUgbVe" role="2LFqv$">
<node concept="3cpWs8" id="3sbALnUgj0e" role="3cqZAp">
<node concept="3cpWsn" id="3sbALnUgj0h" role="3cpWs9">
<property role="TrG5h" value="dim" />
<node concept="3Tqbb2" id="3sbALnUgj0c" role="1tU5fm">
<ref role="ehGHo" to="tpee:hf$GHZq" resolve="DimensionExpression" />
</node>
<node concept="1y4W85" id="3sbALnUggP2" role="33vP2m">
<node concept="37vLTw" id="3sbALnUghas" role="1y58nS">
<ref role="3cqZAo" node="3sbALnUgbVf" resolve="i" />
<node concept="2OqwBi" id="1lzLQ0z_psJ" role="33vP2m">
<node concept="2OqwBi" id="3sbALnUg5p0" role="2Oq$k0">
<node concept="2OqwBi" id="3sbALnUg3i9" role="2Oq$k0">
<node concept="3A2sRY" id="3sbALnUg38s" role="2Oq$k0">
<ref role="3A2yKK" node="1lzLQ0zo2uf" resolve="arrc" />
</node>
<node concept="2OqwBi" id="3sbALnUgf2l" role="1y566C">
<node concept="3A2sRY" id="3sbALnUgeUs" role="2Oq$k0">
<ref role="3A2yKK" node="1lzLQ0zo2uf" resolve="arrc" />
</node>
<node concept="3Tsc0h" id="3sbALnUgfrF" role="2OqNvi">
<ref role="3TtcxE" to="tpee:hf$GQt2" resolve="dimensionExpression" />
</node>
<node concept="3Tsc0h" id="3sbALnUg3C_" role="2OqNvi">
<ref role="3TtcxE" to="tpee:hf$GQt2" resolve="dimensionExpression" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="3sbALnUgxf2" role="3cqZAp" />
<node concept="1nLNNL" id="3sbALnUgerM" role="3cqZAp">
<node concept="1nLNMm" id="3sbALnUgerO" role="1nLNNK">
<node concept="3Aq9E8" id="3sbALnUgi3U" role="1nLNMd">
<node concept="3I6sU6" id="3sbALnUgi3V" role="3Ip0Jz">
<node concept="3I6s7M" id="3sbALnUgeUu" role="3I6sU7">
<node concept="3wWvb2" id="3sbALnUgeUt" role="3I6s78">
<node concept="2OqwBi" id="3sbALnUi8tf" role="3wWo3s">
<node concept="2OqwBi" id="3sbALnUi7Qv" role="2Oq$k0">
<node concept="37vLTw" id="3sbALnUi7K4" role="2Oq$k0">
<ref role="3cqZAo" node="3sbALnUgj0h" resolve="dim" />
<node concept="1z4cxt" id="3sbALnUg7ej" role="2OqNvi">
<node concept="1bVj0M" id="3sbALnUg7el" role="23t8la">
<node concept="3clFbS" id="3sbALnUg7em" role="1bW5cS">
<node concept="3clFbF" id="3sbALnUg7nk" role="3cqZAp">
<node concept="2OqwBi" id="3sbALnUg7X_" role="3clFbG">
<node concept="2OqwBi" id="3sbALnUg7vm" role="2Oq$k0">
<node concept="37vLTw" id="3sbALnUg7nj" role="2Oq$k0">
<ref role="3cqZAo" node="3sbALnUg7en" resolve="it" />
</node>
<node concept="3TrEf2" id="3sbALnUi8gG" role="2OqNvi">
<node concept="3TrEf2" id="3sbALnUg7EZ" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hf$I4rk" resolve="expression" />
</node>
</node>
<node concept="3w_OXm" id="3sbALnUi8Eq" role="2OqNvi" />
<node concept="3w_OXm" id="3sbALnUg8br" role="2OqNvi" />
</node>
</node>
</node>
<node concept="Rh6nW" id="3sbALnUg7en" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="3sbALnUg7eo" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="2bSWHS" id="1lzLQ0z_pQX" role="2OqNvi" />
</node>
<node concept="10Oyi0" id="1lzLQ0z_qjx" role="1tU5fm" />
</node>
</node>
<node concept="3clFbH" id="1lzLQ0zo4NN" role="3cqZAp" />
<node concept="3clFbJ" id="1lzLQ0z_u9t" role="3cqZAp">
<node concept="3clFbS" id="1lzLQ0z_u9v" role="3clFbx">
<node concept="3SKdUt" id="3sbALnUgw$O" role="3cqZAp">
<node concept="1PaTwC" id="3sbALnUgw$P" role="3ndbpf">
<node concept="3oM_SD" id="3sbALnUgwFP" role="1PaTwD">
<property role="3oM_SC" value="all" />
</node>
<node concept="3oM_SD" id="3sbALnUgwJE" role="1PaTwD">
<property role="3oM_SC" value="following" />
</node>
<node concept="3oM_SD" id="3sbALnUgwNw" role="1PaTwD">
<property role="3oM_SC" value="dims" />
</node>
<node concept="3oM_SD" id="3sbALnUgwN$" role="1PaTwD">
<property role="3oM_SC" value="must" />
</node>
<node concept="3oM_SD" id="3sbALnUgwRs" role="1PaTwD">
<property role="3oM_SC" value="also" />
</node>
<node concept="3oM_SD" id="3sbALnUgwVl" role="1PaTwD">
<property role="3oM_SC" value="be" />
</node>
<node concept="3oM_SD" id="3sbALnUgwVs" role="1PaTwD">
<property role="3oM_SC" value="null" />
</node>
</node>
</node>
<node concept="1Dw8fO" id="3sbALnUgbVc" role="3cqZAp">
<node concept="3clFbS" id="3sbALnUgbVe" role="2LFqv$">
<node concept="3cpWs8" id="3sbALnUgj0e" role="3cqZAp">
<node concept="3cpWsn" id="3sbALnUgj0h" role="3cpWs9">
<property role="TrG5h" value="dim" />
<node concept="3Tqbb2" id="3sbALnUgj0c" role="1tU5fm">
<ref role="ehGHo" to="tpee:hf$GHZq" resolve="DimensionExpression" />
</node>
<node concept="1y4W85" id="3sbALnUggP2" role="33vP2m">
<node concept="37vLTw" id="3sbALnUghas" role="1y58nS">
<ref role="3cqZAo" node="3sbALnUgbVf" resolve="i" />
</node>
<node concept="2OqwBi" id="3sbALnUgf2l" role="1y566C">
<node concept="3A2sRY" id="3sbALnUgeUs" role="2Oq$k0">
<ref role="3A2yKK" node="1lzLQ0zo2uf" resolve="arrc" />
</node>
<node concept="3Tsc0h" id="3sbALnUgfrF" role="2OqNvi">
<ref role="3TtcxE" to="tpee:hf$GQt2" resolve="dimensionExpression" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq93q" id="3sbALnUgeBh" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3sbALnUgeBi" role="3Ip0Jz">
<node concept="3I6s7M" id="3sbALnUgeIW" role="3I6sU7">
<node concept="3Aqt3T" id="3sbALnUgeIV" role="3I6s78">
<ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
<node concept="3clFbH" id="3sbALnUgxf2" role="3cqZAp" />
<node concept="1nLNNL" id="3sbALnUgerM" role="3cqZAp">
<node concept="1nLNMm" id="3sbALnUgerO" role="1nLNNK">
<node concept="3Aq9E8" id="3sbALnUgi3U" role="1nLNMd">
<node concept="3I6sU6" id="3sbALnUgi3V" role="3Ip0Jz">
<node concept="3I6s7M" id="3sbALnUgeUu" role="3I6sU7">
<node concept="3wWvb2" id="3sbALnUgeUt" role="3I6s78">
<node concept="2OqwBi" id="3sbALnUi8tf" role="3wWo3s">
<node concept="2OqwBi" id="3sbALnUi7Qv" role="2Oq$k0">
<node concept="37vLTw" id="3sbALnUi7K4" role="2Oq$k0">
<ref role="3cqZAo" node="3sbALnUgj0h" resolve="dim" />
</node>
<node concept="3TrEf2" id="3sbALnUi8gG" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hf$I4rk" resolve="expression" />
</node>
</node>
<node concept="3w_OXm" id="3sbALnUi8Eq" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3Aq9E8" id="3sbALnUgeMM" role="1nLNMd">
<node concept="3I6sU6" id="3sbALnUgeMN" role="3Ip0Jz">
<node concept="3I6s7M" id="3sbALnUgkiM" role="3I6sU7">
<node concept="3wWvb2" id="3sbALnUgkiL" role="3I6s78">
<node concept="2OqwBi" id="3sbALnUgkt8" role="3wWo3s">
<node concept="37vLTw" id="3sbALnUgkiK" role="2Oq$k0">
<ref role="3cqZAo" node="3sbALnUgj0h" resolve="dim" />
<node concept="3Aq93q" id="3sbALnUgeBh" role="1nLNMb">
<property role="3ArMco" value="true" />
<node concept="3I6sU6" id="3sbALnUgeBi" role="3Ip0Jz">
<node concept="3I6s7M" id="3sbALnUgeIW" role="3I6sU7">
<node concept="3Aqt3T" id="3sbALnUgeIV" role="3I6s78">
<ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
</node>
<node concept="2s7oft" id="3sbALnUgkAw" role="2OqNvi">
<property role="2s7ueQ" value="oI9Ys1lFm/error" />
<node concept="Xl_RD" id="3sbALnUgkPW" role="2s7u9n">
<property role="Xl_RC" value="Dimension must not be specified here" />
</node>
</node>
</node>
<node concept="3Aq9E8" id="3sbALnUgeMM" role="1nLNMd">
<node concept="3I6sU6" id="3sbALnUgeMN" role="3Ip0Jz">
<node concept="3I6s7M" id="3sbALnUgkiM" role="3I6sU7">
<node concept="3wWvb2" id="3sbALnUgkiL" role="3I6s78">
<node concept="2OqwBi" id="3sbALnUgkt8" role="3wWo3s">
<node concept="37vLTw" id="3sbALnUgkiK" role="2Oq$k0">
<ref role="3cqZAo" node="3sbALnUgj0h" resolve="dim" />
</node>
<node concept="2s7oft" id="3sbALnUgkAw" role="2OqNvi">
<property role="2s7ueQ" value="oI9Ys1lFm/error" />
<node concept="Xl_RD" id="3sbALnUgkPW" role="2s7u9n">
<property role="Xl_RC" value="Dimension must not be specified here" />
</node>
</node>
</node>
</node>
</node>
@ -31848,31 +31832,34 @@
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="3sbALnUgbVf" role="1Duv9x">
<property role="TrG5h" value="i" />
<node concept="10Oyi0" id="3sbALnUgc1r" role="1tU5fm" />
<node concept="3cpWs3" id="3sbALnUgohR" role="33vP2m">
<node concept="3cmrfG" id="3sbALnUgohY" role="3uHU7w">
<property role="3cmrfH" value="1" />
<node concept="3cpWsn" id="3sbALnUgbVf" role="1Duv9x">
<property role="TrG5h" value="i" />
<node concept="10Oyi0" id="3sbALnUgc1r" role="1tU5fm" />
<node concept="37vLTw" id="1lzLQ0z_tPy" role="33vP2m">
<ref role="3cqZAo" node="3sbALnUgpav" resolve="firstEmptyDimIdx" />
</node>
</node>
<node concept="37vLTw" id="3sbALnUgc9h" role="3uHU7B">
<ref role="3cqZAo" node="3sbALnUg2zO" resolve="firstEmptyDimIdx" />
<node concept="3eOVzh" id="3sbALnUgddr" role="1Dwp0S">
<node concept="37vLTw" id="3sbALnUgdhv" role="3uHU7w">
<ref role="3cqZAo" node="1lzLQ0zo2RN" resolve="ndims" />
</node>
<node concept="37vLTw" id="3sbALnUgcoI" role="3uHU7B">
<ref role="3cqZAo" node="3sbALnUgbVf" resolve="i" />
</node>
</node>
<node concept="3uNrnE" id="3sbALnUgefT" role="1Dwrff">
<node concept="37vLTw" id="3sbALnUgefV" role="2$L3a6">
<ref role="3cqZAo" node="3sbALnUgbVf" resolve="i" />
</node>
</node>
</node>
</node>
<node concept="3eOVzh" id="3sbALnUgddr" role="1Dwp0S">
<node concept="37vLTw" id="3sbALnUgdhv" role="3uHU7w">
<ref role="3cqZAo" node="1lzLQ0zo2RN" resolve="ndims" />
<node concept="2d3UOw" id="1lzLQ0z_uZR" role="3clFbw">
<node concept="3cmrfG" id="1lzLQ0zECbm" role="3uHU7w">
<property role="3cmrfH" value="0" />
</node>
<node concept="37vLTw" id="3sbALnUgcoI" role="3uHU7B">
<ref role="3cqZAo" node="3sbALnUgbVf" resolve="i" />
</node>
</node>
<node concept="3uNrnE" id="3sbALnUgefT" role="1Dwrff">
<node concept="37vLTw" id="3sbALnUgefV" role="2$L3a6">
<ref role="3cqZAo" node="3sbALnUgbVf" resolve="i" />
<node concept="37vLTw" id="1lzLQ0z_ub4" role="3uHU7B">
<ref role="3cqZAo" node="3sbALnUgpav" resolve="firstEmptyDimIdx" />
</node>
</node>
</node>

15
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps
View File

@ -8906,11 +8906,13 @@
<node concept="3cpWs8" id="3sbALnUe8LA" role="3cqZAp">
<node concept="3cpWsn" id="3sbALnUe8LB" role="3cpWs9">
<property role="TrG5h" value="a4e" />
<node concept="10Q1$e" id="3sbALnUe8LC" role="1tU5fm">
<node concept="10Q1$e" id="3sbALnUe8LD" role="10Q1$1">
<node concept="10Q1$e" id="3sbALnUe8LE" role="10Q1$1">
<node concept="10Q1$e" id="3sbALnUe8LF" role="10Q1$1">
<node concept="10Oyi0" id="3sbALnUe8LG" role="10Q1$1" />
<node concept="10Q1$e" id="7rg9TXcyHOx" role="1tU5fm">
<node concept="10Q1$e" id="3sbALnUe8LC" role="10Q1$1">
<node concept="10Q1$e" id="3sbALnUe8LD" role="10Q1$1">
<node concept="10Q1$e" id="3sbALnUe8LE" role="10Q1$1">
<node concept="10Q1$e" id="3sbALnUe8LF" role="10Q1$1">
<node concept="10Oyi0" id="3sbALnUe8LG" role="10Q1$1" />
</node>
</node>
</node>
</node>
@ -8932,10 +8934,11 @@
<node concept="3cmrfG" id="3sbALnUe8LP" role="3$I4v7">
<property role="3cmrfH" value="3" />
</node>
<node concept="1U20sH" id="3sbALnUe8LQ" role="lGtFl">
<node concept="1U20sH" id="1lzLQ0zB7ev" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
<node concept="3$GHV9" id="7rg9TXcyHKj" role="3$GQph" />
<node concept="10Oyi0" id="3sbALnUe8LR" role="3$_nBY" />
<node concept="1U20sH" id="3sbALnUe8LS" role="lGtFl">
<property role="1U20sK" value="error" />