Skip to content

Commit 5bb9c1a

Browse files
author
Alexander Pann
committed
Merge remote-tracking branch 'origin/maintenance/mps20213' into bugfix/indexExpr_2021_3
# Conflicts: # CHANGELOG.md # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/[email protected]
2 parents dda229f + 4cfa2d2 commit 5bb9c1a

File tree

78 files changed

+18913
-3385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+18913
-3385
lines changed

‎CHANGELOG.md‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,30 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1010
### Fixed
1111

1212
- The `index` expression in collections operations now works correctly in nested expressions in the interpreter and generator.
13+
- Generation of nested short lambda expression now use the correct type for "it" as a variable.
14+
- Collections: The index expression now works with collection types in the generator.
1315

1416
### Added
1517

1618
- The `all` and `any` operation of collections now also support the `index` expression. The concepts `AllWithIndexOp` and `AnyWithIndexOp` are therefore deprecated.
1719

1820
## November 2023
1921

22+
### Added
23+
24+
- The `sort` method of collections now supports more types: all primitive types, the option type, all datetime types, the temporal type and the record type
25+
- Records: The sorting order can be added through the intention `Add a Comparison Order`, otherwise, the records are sorted based on the declaration order of the members
26+
- Option: Sorting removes all `none` values since the underlying data structure of collections doesn't support null values.
27+
28+
### Changed
29+
30+
- The comparison helper in org.iets3.core.expr.simpleTypes.runtime and the equals helper in the test language where merged into a new class EqualsHelper inside the first runtime solution to return the same values.
31+
2032
### Fixed
2133

2234
- String validation: A bug in the number detection logic was fixed
23-
35+
- String validation: A bug in the successor execution logic was fixed
36+
-
2437
## October 2023
2538

2639
### Fixed
@@ -34,9 +47,16 @@ The project does _not_ follow Semantic Versioning and the changes are documented
3447
- Temporal Literal shows an error if two slices use the same point in time. The check can handle date literals and (nested) references to constants with a date literal. (See [PR 707](https://github.com/IETS3/iets3.opensource/pull/707))
3548
- Temporal Literal shows a warning if the point in time of a slice cannot be unwrapped to a date literal, rendering the duplicates-check mentioned above ineffective. (See [PR 707](https://github.com/IETS3/iets3.opensource/pull/707))
3649

50+
### New language org.iets3.core.expr.typetags.bindingtime
51+
52+
The language extends typetags with support for different binding times of values. Consistency checks ensure that information is passed on at appropriate levels.
53+
3754
### Fixed
3855

3956
- Unit comparisons for the **same** unit defined in **different** packages now lead to an error message for compatibility
57+
- `SliceValue` can now correctly be checked for equality: `SliceValue.equals()` and `SliceValue.hashCode()` are overwritten.
58+
- `TemporalValue.hashCode()` was overwritten, thus `equals` and `hashCode()` are in sync now.
59+
- Generation of nested short lambda expression now use the correct type for "it" as a variable.
4060

4161
### Removed
4262

@@ -58,4 +78,4 @@ The project does _not_ follow Semantic Versioning and the changes are documented
5878

5979
### Changed
6080

61-
- `IETS3ExprEvalHelper` methods no longer log exceptions that they re-throw. Some callers may ignore exceptions thrown by the interpreter, and having them logged unnecessarily clutters the logs. It is now the caller's responsibility to log exceptions where needed.
81+
- `IETS3ExprEvalHelper` methods no longer log exceptions that they re-throw. Some callers may ignore exceptions thrown by the interpreter, and having them logged unnecessarily clutters the logs. It is now the caller's responsibility to log exceptions where needed.

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ apply plugin: 'download-jbr'
3939

4040
// configure jbr download
4141
downloadJbr {
42-
jbrVersion = '11_0_11-b1341.60'
42+
jbrVersion = '11_0_14_1-b1751.46'
4343
}
4444

4545
// detect if we are in a CI build
@@ -56,7 +56,7 @@ def major = "2021"
5656
def minor = "3"
5757

5858
// Dependency versions
59-
ext.mpsVersion = '2021.3.3'
59+
ext.mpsVersion = '2021.3.5'
6060

6161
def mbeddrVersion = "2021.3+"
6262

‎code/languages/org.iets3.opensource/.mps/modules.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl" folder="expr.lang-core" />
6161
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl" folder="expr.lang-core" />
6262
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.tracing/org.iets3.core.expr.tracing.mpl" folder="expr.lang-core" />
63+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.mpl" folder="expr.lang-advanced" />
6364
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl" folder="expr.lang-advanced" />
6465
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.units.quantity/org.iets3.core.expr.typetags.units.quantity.mpl" folder="expr.lang-advanced" />
6566
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.units/org.iets3.core.expr.typetags.units.mpl" folder="expr.lang-advanced" />

‎code/languages/org.iets3.opensource/devkits/org.iets3.core.expr.advanced.devkit/org.iets3.core.expr.advanced.devkit.devkit‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<exported-language name="cb91a38e-738a-4811-a96d-448d08f526fa(org.iets3.core.expr.typetags.units)" />
1515
<exported-language name="8bb1251e-eae5-47ab-9843-33adfae8edaa(org.iets3.core.expr.util)" />
1616
<exported-language name="cee4aa62-aca9-4f26-9602-75129cd457c9(org.iets3.core.expr.dataflow)" />
17+
<exported-language name="9c3cc6fb-ae5e-46d1-ace2-1e08bb47d03d(org.iets3.core.expr.typetags.bindingtime)" />
1718
<exported-solutions>
1819
<exported-solution>79d5345e-e919-477c-b448-d9d5f36e2f92(org.iets3.core.expr.adt.interpreter)</exported-solution>
1920
<exported-solution>3a79aca0-f4b1-40f1-a3e9-259162afa77b(org.iets3.core.expr.dataflow.interpreter)</exported-solution>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11943,7 +11943,7 @@
1194311943
</node>
1194411944
<node concept="OXEIz" id="yfp7edvEmW" role="P5bDN">
1194511945
<node concept="UkePV" id="yfp7edvEmX" role="OY2wv">
11946-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
11946+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
1194711947
</node>
1194811948
</node>
1194911949
</node>

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5594,6 +5594,19 @@
55945594
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
55955595
</node>
55965596
</node>
5597+
<node concept="13i0hz" id="4TtBy4cxuTN" role="13h7CS">
5598+
<property role="TrG5h" value="canBeSorted" />
5599+
<ref role="13i0hy" node="7k6A8Wfp3IU" resolve="canBeSorted" />
5600+
<node concept="3Tm1VV" id="4TtBy4cxuTO" role="1B3o_S" />
5601+
<node concept="3clFbS" id="4TtBy4cxuTT" role="3clF47">
5602+
<node concept="3clFbF" id="4TtBy4cxyVC" role="3cqZAp">
5603+
<node concept="3clFbT" id="4TtBy4cxyVB" role="3clFbG">
5604+
<property role="3clFbU" value="true" />
5605+
</node>
5606+
</node>
5607+
</node>
5608+
<node concept="10P_77" id="4TtBy4cxuTU" role="3clF45" />
5609+
</node>
55975610
</node>
55985611
<node concept="13h7C7" id="UN2ftLUxnR">
55995612
<property role="3GE5qa" value="option" />
@@ -6242,6 +6255,17 @@
62426255
</node>
62436256
<node concept="17QB3L" id="1CNpG_h2Db0" role="3clF45" />
62446257
</node>
6258+
<node concept="13i0hz" id="7k6A8Wfp3IU" role="13h7CS">
6259+
<property role="TrG5h" value="canBeSorted" />
6260+
<property role="13i0it" value="true" />
6261+
<node concept="3Tm1VV" id="7k6A8Wfp3IV" role="1B3o_S" />
6262+
<node concept="10P_77" id="7k6A8Wfp7FV" role="3clF45" />
6263+
<node concept="3clFbS" id="7k6A8Wfp3IX" role="3clF47">
6264+
<node concept="3clFbF" id="7k6A8Wfp7GZ" role="3cqZAp">
6265+
<node concept="3clFbT" id="7k6A8Wfp7GY" role="3clFbG" />
6266+
</node>
6267+
</node>
6268+
</node>
62456269
</node>
62466270
<node concept="13h7C7" id="6XENO0rLjw">
62476271
<ref role="13h7C2" to="hm2y:6XENO0rLj7" resolve="IIsSingleSymbol" />
@@ -26433,5 +26457,24 @@
2643326457
<node concept="17QB3L" id="6ngDzsNlH8k" role="3clF45" />
2643426458
</node>
2643526459
</node>
26460+
<node concept="13h7C7" id="7k6A8Wfp7KX">
26461+
<ref role="13h7C2" to="hm2y:6sdnDbSlMSN" resolve="PrimitiveType" />
26462+
<node concept="13hLZK" id="7k6A8Wfp7KY" role="13h7CW">
26463+
<node concept="3clFbS" id="7k6A8Wfp7KZ" role="2VODD2" />
26464+
</node>
26465+
<node concept="13i0hz" id="7k6A8Wfp8Fb" role="13h7CS">
26466+
<property role="TrG5h" value="canBeSorted" />
26467+
<ref role="13i0hy" node="7k6A8Wfp3IU" resolve="canBeSorted" />
26468+
<node concept="3Tm1VV" id="7k6A8Wfp8Fc" role="1B3o_S" />
26469+
<node concept="3clFbS" id="7k6A8Wfp8Fh" role="3clF47">
26470+
<node concept="3clFbF" id="7k6A8Wfp8K$" role="3cqZAp">
26471+
<node concept="3clFbT" id="7k6A8Wfp8Kz" role="3clFbG">
26472+
<property role="3clFbU" value="true" />
26473+
</node>
26474+
</node>
26475+
</node>
26476+
<node concept="10P_77" id="7k6A8Wfp8Fi" role="3clF45" />
26477+
</node>
26478+
</node>
2643626479
</model>
2643726480

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,7 +2217,7 @@
22172217
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
22182218
<node concept="OXEIz" id="yfp7edvEmw" role="P5bDN">
22192219
<node concept="UkePV" id="yfp7edvEmx" role="OY2wv">
2220-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
2220+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
22212221
</node>
22222222
</node>
22232223
</node>
@@ -2330,7 +2330,7 @@
23302330
<property role="3F0ifm" value="success" />
23312331
<node concept="OXEIz" id="yfp7edvEmy" role="P5bDN">
23322332
<node concept="UkePV" id="yfp7edvEmz" role="OY2wv">
2333-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
2333+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
23342334
</node>
23352335
</node>
23362336
</node>
@@ -2371,7 +2371,7 @@
23712371
<property role="3F0ifm" value="error" />
23722372
<node concept="OXEIz" id="yfp7edvEm$" role="P5bDN">
23732373
<node concept="UkePV" id="yfp7edvEm_" role="OY2wv">
2374-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
2374+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
23752375
</node>
23762376
</node>
23772377
</node>
@@ -4427,7 +4427,7 @@
44274427
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
44284428
<node concept="OXEIz" id="yfp7edvEmA" role="P5bDN">
44294429
<node concept="UkePV" id="yfp7edvEmB" role="OY2wv">
4430-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
4430+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
44314431
</node>
44324432
</node>
44334433
</node>
@@ -4474,7 +4474,7 @@
44744474
<property role="3F0ifm" value="join" />
44754475
<node concept="OXEIz" id="yfp7edvEmC" role="P5bDN">
44764476
<node concept="UkePV" id="yfp7edvEmD" role="OY2wv">
4477-
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
4477+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
44784478
</node>
44794479
</node>
44804480
</node>
@@ -6836,9 +6836,6 @@
68366836
<node concept="2iRfu4" id="3nVyItrZBNH" role="2iSdaV" />
68376837
<node concept="3F0ifn" id="3nVyItrZBND" role="3EZMnx">
68386838
<property role="3F0ifm" value="empty" />
6839-
<node concept="11LMrY" id="3tcv7J0_Tob" role="3F10Kt">
6840-
<property role="VOm3f" value="true" />
6841-
</node>
68426839
<node concept="3CIbrd" id="1kEzTWVBIaM" role="3F10Kt">
68436840
<property role="VOm3f" value="true" />
68446841
</node>
@@ -6847,6 +6844,9 @@
68476844
<node concept="3EZMnI" id="3tcv7J0yv9A" role="_tjki">
68486845
<node concept="3F0ifn" id="3nVyItrZBO4" role="3EZMnx">
68496846
<property role="3F0ifm" value="&lt;" />
6847+
<node concept="11L4FC" id="3jp1EC0Z6K$" role="3F10Kt">
6848+
<property role="VOm3f" value="true" />
6849+
</node>
68506850
<node concept="11LMrY" id="3nVyItrZBOf" role="3F10Kt">
68516851
<property role="VOm3f" value="true" />
68526852
</node>

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

Lines changed: 69 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
1616
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
1717
<use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
18+
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
1819
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
1920
</languages>
2021
<imports>
@@ -29,8 +30,6 @@
2930
<import index="iwsx" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.fileEditor(MPS.IDEA/)" />
3031
<import index="7lvn" ref="r:4e6037e6-9135-44f8-9403-04d79fc40f4a(jetbrains.mps.ide.editor.util)" />
3132
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
32-
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
33-
<import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
3433
<import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
3534
<import index="5ueo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.style(MPS.Editor/)" />
3635
<import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
@@ -40,16 +39,15 @@
4039
<import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
4140
<import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
4241
<import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
43-
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
4442
<import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
4543
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
4644
<import index="ppzb" ref="r:5db517a0-f62d-4841-a421-11bb7269799d(org.iets3.core.expr.base.shared.runtime)" />
4745
<import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
48-
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
49-
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
50-
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
51-
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
52-
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
46+
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
47+
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
48+
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
49+
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
50+
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
5351
</imports>
5452
<registry>
5553
<language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -548,6 +546,9 @@
548546
<node concept="3uibUv" id="6MNhNeUh6na" role="EKbjA">
549547
<ref role="3uigEE" to="2ahs:6MNhNeUeM9i" resolve="IStopAndReturn" />
550548
</node>
549+
<node concept="3uibUv" id="4TtBy4czRM6" role="EKbjA">
550+
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
551+
</node>
551552
<node concept="3Tm1VV" id="UN2ftLWgA9" role="1B3o_S" />
552553
<node concept="3clFb_" id="UN2ftLXFXP" role="jymVt">
553554
<property role="1EzhhJ" value="false" />
@@ -671,13 +672,73 @@
671672
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
672673
</node>
673674
</node>
675+
<node concept="2tJIrI" id="4TtBy4czSoi" role="jymVt" />
674676
<node concept="3UR2Jj" id="3iq6R$ZyJbu" role="lGtFl">
675677
<node concept="TZ5HA" id="3iq6R$ZyJbv" role="TZ5H$">
676678
<node concept="1dT_AC" id="3iq6R$ZyJbw" role="1dT_Ay">
677679
<property role="1dT_AB" value="Represents 'none' value of an optional type." />
678680
</node>
679681
</node>
680682
</node>
683+
<node concept="3clFb_" id="4TtBy4czRUR" role="jymVt">
684+
<property role="TrG5h" value="compareTo" />
685+
<node concept="3Tm1VV" id="4TtBy4czRUS" role="1B3o_S" />
686+
<node concept="10Oyi0" id="4TtBy4czRUU" role="3clF45" />
687+
<node concept="37vLTG" id="4TtBy4czRUV" role="3clF46">
688+
<property role="TrG5h" value="object" />
689+
<node concept="3uibUv" id="4TtBy4czRUX" role="1tU5fm">
690+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
691+
</node>
692+
</node>
693+
<node concept="3clFbS" id="4TtBy4czRUY" role="3clF47">
694+
<node concept="3SKdUt" id="29KNCeyMCRt" role="3cqZAp">
695+
<node concept="1PaTwC" id="29KNCeyMCRu" role="1aUNEU">
696+
<node concept="3oM_SD" id="29KNCeyMD1j" role="1PaTwD">
697+
<property role="3oM_SC" value="NoneValues" />
698+
</node>
699+
<node concept="3oM_SD" id="29KNCeyMD1F" role="1PaTwD">
700+
<property role="3oM_SC" value="should" />
701+
</node>
702+
<node concept="3oM_SD" id="29KNCeyMD24" role="1PaTwD">
703+
<property role="3oM_SC" value="be" />
704+
</node>
705+
<node concept="3oM_SD" id="29KNCeyMD2u" role="1PaTwD">
706+
<property role="3oM_SC" value="the" />
707+
</node>
708+
<node concept="3oM_SD" id="29KNCeyMD2T" role="1PaTwD">
709+
<property role="3oM_SC" value="lowest" />
710+
</node>
711+
<node concept="3oM_SD" id="29KNCeyMD3l" role="1PaTwD">
712+
<property role="3oM_SC" value="value" />
713+
</node>
714+
<node concept="3oM_SD" id="29KNCeyMD3s" role="1PaTwD">
715+
<property role="3oM_SC" value="or" />
716+
</node>
717+
<node concept="3oM_SD" id="29KNCeyMD3$" role="1PaTwD">
718+
<property role="3oM_SC" value="filtered" />
719+
</node>
720+
<node concept="3oM_SD" id="29KNCeyMD43" role="1PaTwD">
721+
<property role="3oM_SC" value="from" />
722+
</node>
723+
<node concept="3oM_SD" id="29KNCeyMD4z" role="1PaTwD">
724+
<property role="3oM_SC" value="collections" />
725+
</node>
726+
<node concept="3oM_SD" id="29KNCeyMD54" role="1PaTwD">
727+
<property role="3oM_SC" value="anyway" />
728+
</node>
729+
</node>
730+
</node>
731+
<node concept="3clFbF" id="4TtBy4czRV1" role="3cqZAp">
732+
<node concept="3cmrfG" id="4TtBy4czRV0" role="3clFbG">
733+
<property role="3cmrfH" value="-1" />
734+
</node>
735+
</node>
736+
</node>
737+
<node concept="2AHcQZ" id="4TtBy4czRUZ" role="2AJF6D">
738+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
739+
</node>
740+
</node>
741+
<node concept="2tJIrI" id="29KNCeybCV7" role="jymVt" />
681742
</node>
682743
<node concept="312cEu" id="12WRc298rqY">
683744
<property role="TrG5h" value="SpecificErrorValue" />

0 commit comments

Comments
 (0)