Skip to content

Commit bc395c8

Browse files
arimerarimer
committed
test.ts.expr.os: added TS checks for inline tuple types
1 parent fcbae7c commit bc395c8

File tree

2 files changed

+192
-2
lines changed
  • code/languages/org.iets3.opensource

2 files changed

+192
-2
lines changed

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

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,9 @@
711711
<concept id="5232196642625574978" name="jetbrains.mps.baseLanguage.collections.structure.HeadListOperation" flags="nn" index="1eb2ty">
712712
<child id="5232196642625574980" name="upToIndex" index="1eb2t$" />
713713
</concept>
714+
<concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
715+
<child id="1240687658305" name="delimiter" index="3uJOhx" />
716+
</concept>
714717
<concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
715718
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
716719
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
@@ -7379,8 +7382,50 @@
73797382
<node concept="1iCGBv" id="1c6hIxySmQb" role="3EZMnx">
73807383
<ref role="1NtTu8" to="hm2y:5r47dOfJ9kT" resolve="decl" />
73817384
<node concept="1sVBvm" id="1c6hIxySmQe" role="1sWHZn">
7382-
<node concept="PMmxH" id="1c6hIxySmQA" role="2wV5jI">
7383-
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
7385+
<node concept="1HlG4h" id="5gz1ElMSFrN" role="2wV5jI">
7386+
<node concept="1HfYo3" id="5gz1ElMSFrP" role="1HlULh">
7387+
<node concept="3TQlhw" id="5gz1ElMSFrR" role="1Hhtcw">
7388+
<node concept="3clFbS" id="5gz1ElMSFrT" role="2VODD2">
7389+
<node concept="3clFbF" id="5gz1ElMSFzM" role="3cqZAp">
7390+
<node concept="2OqwBi" id="5gz1ElMVBr1" role="3clFbG">
7391+
<node concept="2OqwBi" id="5gz1ElMVwsX" role="2Oq$k0">
7392+
<node concept="2OqwBi" id="5gz1ElMSFK6" role="2Oq$k0">
7393+
<node concept="pncrf" id="5gz1ElMSFzL" role="2Oq$k0" />
7394+
<node concept="2qgKlT" id="5gz1ElMVuHB" role="2OqNvi">
7395+
<ref role="37wK5l" to="pbu6:5r47dOfJ8UL" resolve="getMembers" />
7396+
</node>
7397+
</node>
7398+
<node concept="3$u5V9" id="5gz1ElMVA8a" role="2OqNvi">
7399+
<node concept="1bVj0M" id="5gz1ElMVA8c" role="23t8la">
7400+
<node concept="3clFbS" id="5gz1ElMVA8d" role="1bW5cS">
7401+
<node concept="3clFbF" id="5gz1ElMVAdO" role="3cqZAp">
7402+
<node concept="2OqwBi" id="5gz1ElMVAvp" role="3clFbG">
7403+
<node concept="37vLTw" id="5gz1ElMVAdN" role="2Oq$k0">
7404+
<ref role="3cqZAo" node="5gz1ElMVA8e" resolve="it" />
7405+
</node>
7406+
<node concept="3TrcHB" id="5gz1ElMVAWE" role="2OqNvi">
7407+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
7408+
</node>
7409+
</node>
7410+
</node>
7411+
</node>
7412+
<node concept="Rh6nW" id="5gz1ElMVA8e" role="1bW2Oz">
7413+
<property role="TrG5h" value="it" />
7414+
<node concept="2jxLKc" id="5gz1ElMVA8f" role="1tU5fm" />
7415+
</node>
7416+
</node>
7417+
</node>
7418+
</node>
7419+
<node concept="3uJxvA" id="5gz1ElMVCGl" role="2OqNvi">
7420+
<node concept="Xl_RD" id="5gz1ElMVDTe" role="3uJOhx">
7421+
<property role="Xl_RC" value="_" />
7422+
</node>
7423+
</node>
7424+
</node>
7425+
</node>
7426+
</node>
7427+
</node>
7428+
</node>
73847429
</node>
73857430
</node>
73867431
</node>

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

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<child id="8489045168660938517" name="errorRef" index="3lydEf" />
4141
</concept>
4242
<concept id="1215511704609" name="jetbrains.mps.lang.test.structure.NodeWarningCheckOperation" flags="ng" index="29bkU" />
43+
<concept id="1215526290564" name="jetbrains.mps.lang.test.structure.NodeTypeCheckOperation" flags="ng" index="30Omv">
44+
<child id="1215526393912" name="type" index="31d$z" />
45+
</concept>
4346
<concept id="1215603922101" name="jetbrains.mps.lang.test.structure.NodeOperationsContainer" flags="ng" index="7CXmI">
4447
<child id="1215604436604" name="nodeOperations" index="7EUXB" />
4548
</concept>
@@ -312,6 +315,9 @@
312315
<child id="5115872837156576280" name="right" index="30dEs_" />
313316
<child id="5115872837156576278" name="left" index="30dEsF" />
314317
</concept>
318+
<concept id="7715507625824988980" name="org.iets3.core.expr.base.structure.InlineNamedTupleAccess" flags="ng" index="383P9U">
319+
<reference id="7715507625824989307" name="member" index="383OOP" />
320+
</concept>
315321
<concept id="9142018459473556821" name="org.iets3.core.expr.base.structure.JoinType" flags="ng" index="188GKf">
316322
<child id="9142018459473556822" name="types" index="188GKc" />
317323
</concept>
@@ -327,6 +333,9 @@
327333
<concept id="3352322994211036342" name="org.iets3.core.expr.base.structure.OneOfTarget" flags="ng" index="1kPOiQ">
328334
<child id="3352322994211036351" name="values" index="1kPOiZ" />
329335
</concept>
336+
<concept id="6252153918474458424" name="org.iets3.core.expr.base.structure.InlineTupleType" flags="ng" index="1pu8B_">
337+
<reference id="6252153918474458425" name="decl" index="1pu8B$" />
338+
</concept>
330339
<concept id="3889855429450038473" name="org.iets3.core.expr.base.structure.EmptyValue" flags="ng" index="1I1voI" />
331340
<concept id="3281846772293355652" name="org.iets3.core.expr.base.structure.CastExpression" flags="ng" index="1KhrV4">
332341
<child id="2396718651941969300" name="expr" index="12NKtY" />
@@ -17906,5 +17915,141 @@
1790617915
</node>
1790717916
</node>
1790817917
</node>
17918+
<node concept="1lH9Xt" id="5gz1ElMSBWl">
17919+
<property role="TrG5h" value="NameBasedTupleAccess" />
17920+
<node concept="1qefOq" id="5gz1ElMSDBM" role="1SKRRt">
17921+
<node concept="_iOnU" id="6HHp2WmY4bi" role="1qenE9">
17922+
<property role="TrG5h" value="tuples" />
17923+
<property role="2SXJ1i" value="true" />
17924+
<property role="1XBH2A" value="true" />
17925+
<node concept="1aga60" id="1c6hIxyYixT" role="_iOnB">
17926+
<property role="TrG5h" value="simpleMulteResults" />
17927+
<node concept="1fMURV" id="1c6hIxyYj2t" role="1ahQXP">
17928+
<node concept="1fLkTo" id="1c6hIxyYjeh" role="1vMDkh">
17929+
<node concept="1fLbrf" id="1c6hIxyYjeC" role="1fLbpX">
17930+
<ref role="1fLbst" node="1c6hIxyYj2u" />
17931+
<node concept="2vmpnb" id="1c6hIxyYjeB" role="1fLbpZ" />
17932+
</node>
17933+
<node concept="1fLbrf" id="1c6hIxyYjeR" role="1fLbpX">
17934+
<ref role="1fLbst" node="1c6hIxyYj2v" />
17935+
<node concept="30bXRB" id="1c6hIxyYjeQ" role="1fLbpZ">
17936+
<property role="30bXRw" value="1" />
17937+
</node>
17938+
</node>
17939+
<node concept="1fLbrf" id="1c6hIxyYjfv" role="1fLbpX">
17940+
<ref role="1fLbst" node="1c6hIxyYj9N" resolve="r1" />
17941+
<node concept="2vmpnb" id="1c6hIxyYjfu" role="1fLbpZ" />
17942+
</node>
17943+
<node concept="1fLbrf" id="1c6hIxyYjfK" role="1fLbpX">
17944+
<ref role="1fLbst" node="1c6hIxyYjdA" resolve="r2" />
17945+
<node concept="30bdrP" id="1c6hIxyYjfJ" role="1fLbpZ">
17946+
<property role="30bdrQ" value="done" />
17947+
</node>
17948+
</node>
17949+
</node>
17950+
<node concept="1fMUR7" id="1c6hIxyYj2u" role="1vMDcl">
17951+
<node concept="1afdae" id="1c6hIxyYj2O" role="1fMUOQ">
17952+
<ref role="1afue_" node="1c6hIxyYj13" resolve="v1" />
17953+
</node>
17954+
</node>
17955+
<node concept="1fMUR7" id="1c6hIxyYj2v" role="1vMDcl">
17956+
<node concept="1afdae" id="1c6hIxyYj6B" role="1fMUOQ">
17957+
<ref role="1afue_" node="1c6hIxyYj1K" resolve="v2" />
17958+
</node>
17959+
</node>
17960+
<node concept="1fMUOM" id="1c6hIxyYj9N" role="1vMDcl">
17961+
<property role="TrG5h" value="r1" />
17962+
<node concept="2vmvy5" id="1c6hIxyYjae" role="1fMUOZ" />
17963+
</node>
17964+
<node concept="1fMUOM" id="1c6hIxyYjdA" role="1vMDcl">
17965+
<property role="TrG5h" value="r2" />
17966+
<node concept="30bdrU" id="1c6hIxyYjdZ" role="1fMUOZ" />
17967+
</node>
17968+
<node concept="1fLkTo" id="1c6hIxyYjhi" role="1vMDkh">
17969+
<node concept="1fLbrf" id="1c6hIxyYjhT" role="1fLbpX">
17970+
<ref role="1fLbst" node="1c6hIxyYj2u" />
17971+
<node concept="2vmpn$" id="1c6hIxyYjhS" role="1fLbpZ" />
17972+
</node>
17973+
<node concept="1fLbrf" id="1c6hIxyYji8" role="1fLbpX">
17974+
<ref role="1fLbst" node="1c6hIxyYj2v" />
17975+
<node concept="30bXRB" id="1c6hIxyYji7" role="1fLbpZ">
17976+
<property role="30bXRw" value="2" />
17977+
</node>
17978+
</node>
17979+
<node concept="1fLbrf" id="1c6hIxyYjiM" role="1fLbpX">
17980+
<ref role="1fLbst" node="1c6hIxyYj9N" resolve="r1" />
17981+
<node concept="2vmpn$" id="1c6hIxyYjiL" role="1fLbpZ" />
17982+
</node>
17983+
<node concept="1fLbrf" id="1c6hIxyYjj3" role="1fLbpX">
17984+
<ref role="1fLbst" node="1c6hIxyYjdA" resolve="r2" />
17985+
<node concept="30bdrP" id="1c6hIxyYjj2" role="1fLbpZ">
17986+
<property role="30bdrQ" value="not done" />
17987+
</node>
17988+
</node>
17989+
</node>
17990+
<node concept="7CXmI" id="5gz1ElMSEiN" role="lGtFl">
17991+
<node concept="30Omv" id="5gz1ElMSEpu" role="7EUXB">
17992+
<node concept="1pu8B_" id="5gz1ElMYs6j" role="31d$z">
17993+
<ref role="1pu8B$" node="1c6hIxyYj2t" />
17994+
</node>
17995+
</node>
17996+
</node>
17997+
</node>
17998+
<node concept="1ahQXy" id="1c6hIxyYj13" role="1ahQWs">
17999+
<property role="TrG5h" value="v1" />
18000+
<node concept="2vmvy5" id="1c6hIxyYj1q" role="3ix9CU" />
18001+
</node>
18002+
<node concept="1ahQXy" id="1c6hIxyYj1K" role="1ahQWs">
18003+
<property role="TrG5h" value="v2" />
18004+
<node concept="30bXR$" id="1c6hIxyYj2h" role="3ix9CU" />
18005+
</node>
18006+
</node>
18007+
<node concept="_ixoA" id="5gz1ElMYxU5" role="_iOnB" />
18008+
<node concept="2zPypq" id="5gz1ElMYxXD" role="_iOnB">
18009+
<property role="TrG5h" value="foo" />
18010+
<node concept="1af_rf" id="5gz1ElMYxYw" role="2zPyp_">
18011+
<ref role="1afhQb" node="1c6hIxyYixT" resolve="simpleMulteResults" />
18012+
<node concept="2vmpnb" id="5gz1ElMYxYN" role="1afhQ5" />
18013+
<node concept="30bXRB" id="5gz1ElMYxZF" role="1afhQ5">
18014+
<property role="30bXRw" value="1" />
18015+
</node>
18016+
</node>
18017+
</node>
18018+
<node concept="2zPypq" id="5gz1ElMYy74" role="_iOnB">
18019+
<property role="TrG5h" value="access_r1" />
18020+
<node concept="1QScDb" id="5gz1ElMYy8r" role="2zPyp_">
18021+
<node concept="383P9U" id="5gz1ElMYybp" role="1QScD9">
18022+
<ref role="383OOP" node="1c6hIxyYj9N" resolve="r1" />
18023+
</node>
18024+
<node concept="_emDc" id="5gz1ElMYy7X" role="30czhm">
18025+
<ref role="_emDf" node="5gz1ElMYxXD" resolve="foo" />
18026+
</node>
18027+
<node concept="7CXmI" id="5gz1ElMYym5" role="lGtFl">
18028+
<node concept="30Omv" id="5gz1ElMYypW" role="7EUXB">
18029+
<node concept="2vmvy5" id="5gz1ElMYyrY" role="31d$z" />
18030+
</node>
18031+
</node>
18032+
</node>
18033+
</node>
18034+
<node concept="2zPypq" id="5gz1ElMYCe_" role="_iOnB">
18035+
<property role="TrG5h" value="access_r2" />
18036+
<node concept="1QScDb" id="5gz1ElMYCeA" role="2zPyp_">
18037+
<node concept="383P9U" id="5gz1ElMYCiP" role="1QScD9">
18038+
<ref role="383OOP" node="1c6hIxyYjdA" resolve="r2" />
18039+
</node>
18040+
<node concept="_emDc" id="5gz1ElMYCeC" role="30czhm">
18041+
<ref role="_emDf" node="5gz1ElMYxXD" resolve="foo" />
18042+
</node>
18043+
<node concept="7CXmI" id="5gz1ElMYCeD" role="lGtFl">
18044+
<node concept="30Omv" id="5gz1ElMYCeE" role="7EUXB">
18045+
<node concept="30bdrU" id="5gz1ElMYCmA" role="31d$z" />
18046+
</node>
18047+
</node>
18048+
</node>
18049+
</node>
18050+
<node concept="_ixoA" id="5gz1ElMYC6j" role="_iOnB" />
18051+
</node>
18052+
</node>
18053+
</node>
1790918054
</model>
1791018055

0 commit comments

Comments
 (0)