Skip to content

Commit 1f6f240

Browse files
wsafonovwsafonov
authored
Merge pull request #504 from IETS3/datev-staging
Fixes/features from datev-staging branch
2 parents 1f225e2 + 0da165b commit 1f6f240

File tree

19 files changed

+1108
-1786
lines changed

19 files changed

+1108
-1786
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,6 @@
210210
<property role="TrG5h" value="deleteSolverControl" />
211211
<property role="3GE5qa" value="control" />
212212
<ref role="1h_SK9" to="l80j:3DYDRw0WRrP" resolve="SolveControl" />
213-
<node concept="1hA7zw" id="3DYDRw0XrFJ" role="1h_SK8">
214-
<property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
215-
<node concept="1hAIg9" id="3DYDRw0XrFK" role="1hA7z_">
216-
<node concept="3clFbS" id="3DYDRw0XrFL" role="2VODD2">
217-
<node concept="3clFbF" id="3DYDRw0XrFT" role="3cqZAp">
218-
<node concept="2OqwBi" id="3DYDRw0XrHO" role="3clFbG">
219-
<node concept="0IXxy" id="3DYDRw0XrFS" role="2Oq$k0" />
220-
<node concept="3YRAZt" id="3DYDRw0XrN4" role="2OqNvi" />
221-
</node>
222-
</node>
223-
</node>
224-
</node>
225-
</node>
226213
<node concept="1hA7zw" id="3DYDRw0XrNg" role="1h_SK8">
227214
<property role="1hAc7j" value="g_hAxAO/delete_action_id" />
228215
<node concept="1hAIg9" id="3DYDRw0XrNh" role="1hA7z_">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps‎

Lines changed: 275 additions & 181 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps‎

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,19 +1609,6 @@
16091609
</node>
16101610
</node>
16111611
</node>
1612-
<node concept="1hA7zw" id="71dSyJVpVTx" role="1h_SK8">
1613-
<property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
1614-
<node concept="1hAIg9" id="71dSyJVpVTy" role="1hA7z_">
1615-
<node concept="3clFbS" id="71dSyJVpVTz" role="2VODD2">
1616-
<node concept="3clFbF" id="71dSyJVpVT$" role="3cqZAp">
1617-
<node concept="2OqwBi" id="71dSyJVpVT_" role="3clFbG">
1618-
<node concept="0IXxy" id="71dSyJVpVTA" role="2Oq$k0" />
1619-
<node concept="3YRAZt" id="71dSyJVpVTB" role="2OqNvi" />
1620-
</node>
1621-
</node>
1622-
</node>
1623-
</node>
1624-
</node>
16251612
</node>
16261613
<node concept="24kQdi" id="71dSyJVqZSD">
16271614
<ref role="1XX52x" to="hm2y:71dSyJVqZSe" resolve="TracerExpression" />
@@ -4321,19 +4308,6 @@
43214308
<property role="3GE5qa" value="tracing" />
43224309
<property role="TrG5h" value="deleteReveal" />
43234310
<ref role="1h_SK9" to="hm2y:4hW8Ne0bQYm" resolve="Revealer" />
4324-
<node concept="1hA7zw" id="4yQfyMjn6TH" role="1h_SK8">
4325-
<property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
4326-
<node concept="1hAIg9" id="4yQfyMjn6TI" role="1hA7z_">
4327-
<node concept="3clFbS" id="4yQfyMjn6TJ" role="2VODD2">
4328-
<node concept="3clFbF" id="4hW8Ne0bUDi" role="3cqZAp">
4329-
<node concept="2OqwBi" id="4hW8Ne0bUMa" role="3clFbG">
4330-
<node concept="0IXxy" id="4hW8Ne0bUDf" role="2Oq$k0" />
4331-
<node concept="3YRAZt" id="4hW8Ne0nriM" role="2OqNvi" />
4332-
</node>
4333-
</node>
4334-
</node>
4335-
</node>
4336-
</node>
43374311
<node concept="1hA7zw" id="4yQfyMjn6w2" role="1h_SK8">
43384312
<property role="1hAc7j" value="g_hAxAO/delete_action_id" />
43394313
<node concept="1hAIg9" id="4yQfyMjn6w3" role="1hA7z_">
@@ -4722,26 +4696,6 @@
47224696
</node>
47234697
</node>
47244698
</node>
4725-
<node concept="1hA7zw" id="5AlTalNOjuB" role="1h_SK8">
4726-
<property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
4727-
<node concept="1hAIg9" id="5AlTalNOjuC" role="1hA7z_">
4728-
<node concept="3clFbS" id="5AlTalNOjuD" role="2VODD2">
4729-
<node concept="3clFbF" id="5AlTalNOjuE" role="3cqZAp">
4730-
<node concept="2OqwBi" id="5AlTalNOjuF" role="3clFbG">
4731-
<node concept="0IXxy" id="5AlTalNOjuG" role="2Oq$k0" />
4732-
<node concept="1P9Npp" id="5AlTalNOjuH" role="2OqNvi">
4733-
<node concept="2OqwBi" id="5AlTalNOjuI" role="1P9ThW">
4734-
<node concept="0IXxy" id="5AlTalNOjuJ" role="2Oq$k0" />
4735-
<node concept="3TrEf2" id="5AlTalNOjuK" role="2OqNvi">
4736-
<ref role="3Tt5mk" to="hm2y:2rOWEwsEjch" resolve="baseType" />
4737-
</node>
4738-
</node>
4739-
</node>
4740-
</node>
4741-
</node>
4742-
</node>
4743-
</node>
4744-
</node>
47454699
</node>
47464700
<node concept="24kQdi" id="2ufoZQIKHBI">
47474701
<ref role="1XX52x" to="hm2y:2ufoZQIKHqp" resolve="SimpleExpressionValueInspector" />
@@ -5185,19 +5139,6 @@
51855139
<node concept="1h_SRR" id="2ufoZQIP11$">
51865140
<property role="TrG5h" value="deleteValueInspector" />
51875141
<ref role="1h_SK9" to="hm2y:2ufoZQIKHqp" resolve="SimpleExpressionValueInspector" />
5188-
<node concept="1hA7zw" id="2ufoZQIP11_" role="1h_SK8">
5189-
<property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
5190-
<node concept="1hAIg9" id="2ufoZQIP11A" role="1hA7z_">
5191-
<node concept="3clFbS" id="2ufoZQIP11B" role="2VODD2">
5192-
<node concept="3clFbF" id="2ufoZQIP11O" role="3cqZAp">
5193-
<node concept="2OqwBi" id="2ufoZQIP1cQ" role="3clFbG">
5194-
<node concept="0IXxy" id="2ufoZQIP11N" role="2Oq$k0" />
5195-
<node concept="3YRAZt" id="2ufoZQIP1Bb" role="2OqNvi" />
5196-
</node>
5197-
</node>
5198-
</node>
5199-
</node>
5200-
</node>
52015142
<node concept="1hA7zw" id="2ufoZQIP1DC" role="1h_SK8">
52025143
<property role="1hAc7j" value="g_hAxAO/delete_action_id" />
52035144
<node concept="1hAIg9" id="2ufoZQIP1DD" role="1hA7z_">
@@ -6587,6 +6528,7 @@
65876528
<property role="3GE5qa" value="nix" />
65886529
<ref role="1XX52x" to="hm2y:3nVyItrZBN9" resolve="EmptyValue" />
65896530
<node concept="3EZMnI" id="3nVyItrZBNG" role="2wV5jI">
6531+
<node concept="2iRfu4" id="3nVyItrZBNH" role="2iSdaV" />
65906532
<node concept="3F0ifn" id="3nVyItrZBND" role="3EZMnx">
65916533
<property role="3F0ifm" value="empty" />
65926534
<node concept="11LMrY" id="3tcv7J0_Tob" role="3F10Kt">
@@ -6596,7 +6538,6 @@
65966538
<property role="VOm3f" value="true" />
65976539
</node>
65986540
</node>
6599-
<node concept="2iRfu4" id="3nVyItrZBNH" role="2iSdaV" />
66006541
<node concept="_tjkj" id="3tcv7J0yv9p" role="3EZMnx">
66016542
<node concept="3EZMnI" id="3tcv7J0yv9A" role="_tjki">
66026543
<node concept="3F0ifn" id="3nVyItrZBO4" role="3EZMnx">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/structure.mps‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,5 +1209,16 @@
12091209
<ref role="2wpffI" node="Lrty7CKd0e" />
12101210
</node>
12111211
</node>
1212+
<node concept="1TIwiD" id="1e59C2QAniP">
1213+
<property role="3GE5qa" value="ordered" />
1214+
<property role="TrG5h" value="IndexOfOp" />
1215+
<property role="34LRSv" value="indexOf" />
1216+
<property role="EcuMT" value="1406572792884327605" />
1217+
<property role="R4oN_" value="find the position of the argument in the list" />
1218+
<ref role="1TJDcQ" node="6zmBjqUjnKs" resolve="OneArgCollectionOp" />
1219+
<node concept="PrWs8" id="1e59C2QAniR" role="PzmwI">
1220+
<ref role="PrY4T" node="6zmBjqUiHHJ" resolve="IOrderedCollectionOp" />
1221+
</node>
1222+
</node>
12121223
</model>
12131224

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/typesystem.mps‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6501,5 +6501,31 @@
65016501
<ref role="1YaFvo" to="700h:twWOnQMGuT" resolve="ListPickOp" />
65026502
</node>
65036503
</node>
6504+
<node concept="1YbPZF" id="1e59C2QAnjj">
6505+
<property role="TrG5h" value="typeof_IndexOfOp" />
6506+
<property role="3GE5qa" value="ordered" />
6507+
<node concept="3clFbS" id="1e59C2QAnjk" role="18ibNy">
6508+
<node concept="1Z5TYs" id="1e59C2QAnqP" role="3cqZAp">
6509+
<node concept="mw_s8" id="1e59C2QAnr6" role="1ZfhKB">
6510+
<node concept="2YIFZM" id="1ipJiAd97w8" role="mwGJk">
6511+
<ref role="37wK5l" to="xfg9:2Qbt$1tTQcM" resolve="createIntegerType" />
6512+
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
6513+
<node concept="10Nm6u" id="1ipJiAd97wQ" role="37wK5m" />
6514+
</node>
6515+
</node>
6516+
<node concept="mw_s8" id="1e59C2QAnqS" role="1ZfhK$">
6517+
<node concept="1Z2H0r" id="1e59C2QAnjq" role="mwGJk">
6518+
<node concept="1YBJjd" id="1e59C2QAnjE" role="1Z2MuG">
6519+
<ref role="1YBMHb" node="1e59C2QAnjm" resolve="indexOfOp" />
6520+
</node>
6521+
</node>
6522+
</node>
6523+
</node>
6524+
</node>
6525+
<node concept="1YaCAy" id="1e59C2QAnjm" role="1YuTPh">
6526+
<property role="TrG5h" value="indexOfOp" />
6527+
<ref role="1YaFvo" to="700h:1e59C2QAniP" resolve="IndexOfOp" />
6528+
</node>
6529+
</node>
65046530
</model>
65056531

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -711,19 +711,6 @@
711711
<node concept="1h_SRR" id="NE1gl52AW1">
712712
<property role="TrG5h" value="DeleteDDD" />
713713
<ref role="1h_SK9" to="34lm:NE1gl52$xw" resolve="DotDotDot" />
714-
<node concept="1hA7zw" id="NE1gl52AW2" role="1h_SK8">
715-
<property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
716-
<node concept="1hAIg9" id="NE1gl52AW3" role="1hA7z_">
717-
<node concept="3clFbS" id="NE1gl52AW4" role="2VODD2">
718-
<node concept="3clFbF" id="NE1gl52AWh" role="3cqZAp">
719-
<node concept="2OqwBi" id="NE1gl52B4x" role="3clFbG">
720-
<node concept="0IXxy" id="NE1gl52AWg" role="2Oq$k0" />
721-
<node concept="3YRAZt" id="NE1gl52BKr" role="2OqNvi" />
722-
</node>
723-
</node>
724-
</node>
725-
</node>
726-
</node>
727714
<node concept="1hA7zw" id="NE1gl52BMK" role="1h_SK8">
728715
<property role="1hAc7j" value="g_hAxAO/delete_action_id" />
729716
<node concept="1hAIg9" id="NE1gl52BML" role="1hA7z_">
@@ -813,19 +800,6 @@
813800
</node>
814801
</node>
815802
</node>
816-
<node concept="1hA7zw" id="4vZ65iKq6Xw" role="1h_SK8">
817-
<property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
818-
<node concept="1hAIg9" id="4vZ65iKq6Xx" role="1hA7z_">
819-
<node concept="3clFbS" id="4vZ65iKq6Xy" role="2VODD2">
820-
<node concept="3clFbF" id="4vZ65iKq6Xz" role="3cqZAp">
821-
<node concept="2OqwBi" id="4vZ65iKq6X$" role="3clFbG">
822-
<node concept="0IXxy" id="4vZ65iKq6X_" role="2Oq$k0" />
823-
<node concept="3YRAZt" id="4vZ65iKq6XA" role="2OqNvi" />
824-
</node>
825-
</node>
826-
</node>
827-
</node>
828-
</node>
829803
</node>
830804
<node concept="24kQdi" id="5OzSgxea3Dk">
831805
<ref role="1XX52x" to="34lm:5OzSgxea3CI" resolve="ExampleSolution" />

0 commit comments

Comments
 (0)