Skip to content

Commit 01507d1

Browse files
author
Alexander Pann
authored
Merge pull request #1218 from IETS3/merge/mps20223
2 parents 14a2375 + 5cdf24c commit 01507d1

File tree

1 file changed

+28
-28
lines changed
  • code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os

1 file changed

+28
-28
lines changed

‎code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/[email protected]‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<use id="b25b8ad1-4d3d-4e45-8c78-72091b39fdda" name="org.iets3.core.expr.data" version="3" />
1717
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="-1" />
1818
<use id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base" version="22" />
19-
<use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
2019
<use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
20+
<use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
2121
<use id="b80fab4e-53f2-409c-81d8-3475855e0e42" name="test.ts.expr.os.nix" version="0" />
2222
<devkit ref="c4e521ab-b605-4ef9-a7c3-68075da058f0(org.iets3.core.expr.core.devkit)" />
2323
</languages>
@@ -36,9 +36,9 @@
3636
<import index="bg10" ref="r:a71eb8ca-1a88-4b3c-85ef-63f23e5a12e0(org.iets3.core.expr.mutable.typesystem)" />
3737
<import index="iyw" ref="r:3b5d2a4d-f539-4854-bc25-c43da4b5202c(org.iets3.core.expr.lambda.typesystem)" />
3838
<import index="n0yb" ref="r:1fd78142-d7d8-42c9-9cbb-0609b1bc5311(org.iets3.core.expr.collections.typesystem)" />
39-
<import index="ym7l" ref="r:050f6d52-a81b-4b31-9a1c-531c1a04708e(org.iets3.core.expr.simpleTypes.typesystem)" />
4039
<import index="xlxw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.math(JDK/)" />
4140
<import index="700h" ref="r:61b1de80-490d-4fee-8e95-b956503290e9(org.iets3.core.expr.collections.structure)" />
41+
<import index="ym7l" ref="r:050f6d52-a81b-4b31-9a1c-531c1a04708e(org.iets3.core.expr.simpleTypes.typesystem)" />
4242
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
4343
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
4444
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
@@ -71,7 +71,7 @@
7171
</concept>
7272
<concept id="8578280453509464010" name="jetbrains.mps.lang.test.structure.NodeTypeSystemWarningCheckOperation" flags="ng" index="o5Tdl" />
7373
<concept id="7691029917083831655" name="jetbrains.mps.lang.test.structure.UnknownRuleReference" flags="ng" index="2u4KIi" />
74-
<concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ngI" index="2u4UPC">
74+
<concept id="7691029917083872157" name="jetbrains.mps.lang.test.structure.IRuleReference" flags="ng" index="2u4UPC">
7575
<reference id="8333855927540250453" name="declaration" index="39XzEq" />
7676
</concept>
7777
<concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr">
@@ -115,7 +115,7 @@
115115
<concept id="161551962036658069" name="org.iets3.core.expr.util.structure.ResultColDef" flags="ng" index="1fMUOM" />
116116
<concept id="161551962036658016" name="org.iets3.core.expr.util.structure.QueryColDef" flags="ng" index="1fMUR7" />
117117
<concept id="161551962036658012" name="org.iets3.core.expr.util.structure.MultiDecTab" flags="ng" index="1fMURV" />
118-
<concept id="8853770331921611232" name="org.iets3.core.expr.util.structure.IMultiDecTab" flags="ngI" index="1vMD3l">
118+
<concept id="8853770331921611232" name="org.iets3.core.expr.util.structure.IMultiDecTab" flags="ng" index="1vMD3l">
119119
<child id="8853770331921611296" name="colDefs" index="1vMDcl" />
120120
<child id="8853770331921611812" name="rows" index="1vMDkh" />
121121
</concept>
@@ -217,7 +217,7 @@
217217
</concept>
218218
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
219219
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
220-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
220+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
221221
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
222222
<child id="1068499141038" name="actualArgument" index="37wK5m" />
223223
</concept>
@@ -253,10 +253,10 @@
253253
<concept id="1174491169200" name="com.mbeddr.mpsutil.blutil.structure.GroupRegexp" flags="ng" index="1P8g2x" />
254254
</language>
255255
<language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
256-
<concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
256+
<concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ng" index="0Rz4o">
257257
<property id="7831630342157089649" name="__hash" index="0Rz4W" />
258258
</concept>
259-
<concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ngI" index="pfQq$">
259+
<concept id="229512757698888199" name="org.iets3.core.base.structure.IOptionallyNamed" flags="ng" index="pfQq$">
260260
<child id="229512757698888936" name="optionalName" index="pfQ1b" />
261261
</concept>
262262
<concept id="229512757698888202" name="org.iets3.core.base.structure.OptionalNameSpecifier" flags="ng" index="pfQqD">
@@ -272,7 +272,7 @@
272272
<concept id="7971844778466793028" name="org.iets3.core.expr.base.structure.AlternativesExpression" flags="ng" index="2fGnzi">
273273
<child id="7971844778466793162" name="alternatives" index="2fGnxs" />
274274
</concept>
275-
<concept id="4261931054731905240" name="org.iets3.core.expr.base.structure.IContainExpressionParam" flags="ngI" index="2lDidI">
275+
<concept id="4261931054731905240" name="org.iets3.core.expr.base.structure.IContainExpressionParam" flags="ng" index="2lDidI">
276276
<child id="4261931054731905241" name="expr" index="2lDidJ" />
277277
</concept>
278278
<concept id="1019070541450016346" name="org.iets3.core.expr.base.structure.TupleValue" flags="ng" index="m5g4o">
@@ -296,10 +296,10 @@
296296
<reference id="7089558164910719191" name="try" index="2zAAH1" />
297297
</concept>
298298
<concept id="7089558164908491660" name="org.iets3.core.expr.base.structure.EmptyExpression" flags="ng" index="2zH6wq" />
299-
<concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ngI" index="2zM23E">
299+
<concept id="7089558164905593724" name="org.iets3.core.expr.base.structure.IOptionallyTyped" flags="ng" index="2zM23E">
300300
<child id="7089558164905593725" name="type" index="2zM23F" />
301301
</concept>
302-
<concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ngI" index="2_iKZX">
302+
<concept id="7071042522334260296" name="org.iets3.core.expr.base.structure.ITyped" flags="ng" index="2_iKZX">
303303
<child id="8811147530085329321" name="type" index="2S399n" />
304304
</concept>
305305
<concept id="867786408877811041" name="org.iets3.core.expr.base.structure.Contract" flags="ng" index="I61D5">
@@ -310,7 +310,7 @@
310310
</concept>
311311
<concept id="867786408877811037" name="org.iets3.core.expr.base.structure.Precondition" flags="ng" index="I61DT" />
312312
<concept id="867786408877811180" name="org.iets3.core.expr.base.structure.Postcondition" flags="ng" index="I61F8" />
313-
<concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ngI" index="I61I7">
313+
<concept id="867786408877810851" name="org.iets3.core.expr.base.structure.IContracted" flags="ng" index="I61I7">
314314
<child id="867786408877811042" name="contract" index="I61D6" />
315315
</concept>
316316
<concept id="867786408882279828" name="org.iets3.core.expr.base.structure.PlainConstraint" flags="ng" index="InuEK" />
@@ -523,7 +523,7 @@
523523
<concept id="8811147530085329320" name="org.iets3.core.expr.toplevel.structure.RecordLiteral" flags="ng" index="2S399m">
524524
<child id="8811147530085329323" name="memberValues" index="2S399l" />
525525
</concept>
526-
<concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ngI" index="S5Q1W">
526+
<concept id="602952467877559919" name="org.iets3.core.expr.toplevel.structure.IRecordDeclaration" flags="ng" index="S5Q1W">
527527
<child id="602952467877562565" name="members" index="S5Trm" />
528528
</concept>
529529
<concept id="8811147530084018370" name="org.iets3.core.expr.toplevel.structure.RecordType" flags="ng" index="2Ss9cW">
@@ -691,7 +691,7 @@
691691
<concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
692692
<child id="1172073511101" name="message" index="3_1BAH" />
693693
</concept>
694-
<concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ngI" index="3_9gw8">
694+
<concept id="1172075514136" name="jetbrains.mps.baseLanguage.unitTest.structure.MessageHolder" flags="ng" index="3_9gw8">
695695
<child id="1172075534298" name="message" index="3_9lra" />
696696
</concept>
697697
</language>
@@ -721,7 +721,7 @@
721721
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
722722
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
723723
</concept>
724-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
724+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
725725
<property id="1169194664001" name="name" index="TrG5h" />
726726
</concept>
727727
<concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -871,17 +871,17 @@
871871
<reference id="4790956042241106533" name="val" index="1adwt6" />
872872
</concept>
873873
<concept id="4790956042241053102" name="org.iets3.core.expr.lambda.structure.ValExpression" flags="ng" index="1adJid" />
874-
<concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ngI" index="1aeol9">
874+
<concept id="4790956042240745578" name="org.iets3.core.expr.lambda.structure.IFunctionRef" flags="ng" index="1aeol9">
875875
<reference id="4790956042240745579" name="fun" index="1aeol8" />
876876
</concept>
877877
<concept id="4790956042240407469" name="org.iets3.core.expr.lambda.structure.ArgRef" flags="ng" index="1afdae">
878878
<reference id="4790956042240460422" name="arg" index="1afue_" />
879879
</concept>
880-
<concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
880+
<concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ng" index="1afhQZ">
881881
<reference id="4790956042240522408" name="function" index="1afhQb" />
882882
<child id="4790956042240522406" name="args" index="1afhQ5" />
883883
</concept>
884-
<concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
884+
<concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ng" index="1ahQWc">
885885
<property id="2861782275883660525" name="ext" index="1HeIcW" />
886886
<child id="3880322347437217307" name="effect" index="28QfE6" />
887887
<child id="4790956042240100927" name="args" index="1ahQWs" />
@@ -899,7 +899,7 @@
899899
<child id="7554398283340318471" name="args" index="3ix9CL" />
900900
</concept>
901901
<concept id="7554398283340318478" name="org.iets3.core.expr.lambda.structure.LambdaArg" flags="ng" index="3ix9CS" />
902-
<concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
902+
<concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ng" index="3ix9CZ">
903903
<child id="7554398283340318476" name="type" index="3ix9CU" />
904904
</concept>
905905
<concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60" />
@@ -22467,6 +22467,16 @@
2246722467
</node>
2246822468
</node>
2246922469
</node>
22470+
<node concept="1ZlgDW" id="45$ooctvHpq">
22471+
<property role="TrG5h" value="Regex" />
22472+
<node concept="1OD$hs" id="45$ooctvHpr" role="1ZlkZz">
22473+
<property role="TrG5h" value="hello" />
22474+
<property role="1ZnDHp" value="hello literal" />
22475+
<node concept="1OC9wW" id="45$ooctvHpt" role="1ODAi8">
22476+
<property role="1OCb_u" value="hello" />
22477+
</node>
22478+
</node>
22479+
</node>
2247022480
<node concept="1lH9Xt" id="3OxSopfZQZs">
2247122481
<property role="TrG5h" value="stringConstraintsTests" />
2247222482
<property role="3DII0k" value="2hh8MJdVwqX/command" />
@@ -25483,16 +25493,6 @@
2548325493
</node>
2548425494
</node>
2548525495
</node>
25486-
<node concept="1ZlgDW" id="45$ooctvHpq">
25487-
<property role="TrG5h" value="Regex" />
25488-
<node concept="1OD$hs" id="45$ooctvHpr" role="1ZlkZz">
25489-
<property role="TrG5h" value="hello" />
25490-
<property role="1ZnDHp" value="hello literal" />
25491-
<node concept="1OC9wW" id="45$ooctvHpt" role="1ODAi8">
25492-
<property role="1OCb_u" value="hello" />
25493-
</node>
25494-
</node>
25495-
</node>
2549625496
<node concept="1lH9Xt" id="1t_lOkRnMfg">
2549725497
<property role="3DII0k" value="2hh8MJdVwqX/command" />
2549825498
<property role="TrG5h" value="InfHelperTest" />

0 commit comments

Comments
 (0)