Skip to content

Commit cfa2174

Browse files
alexanderpannalexanderpann
authored
Merge pull request #588 from IETS3/bugfix/tablesPaste
2 parents 3f120f1 + e10d64f commit cfa2174

File tree

10 files changed

+2767
-1371
lines changed

10 files changed

+2767
-1371
lines changed

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

Lines changed: 433 additions & 168 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222
<dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
2323
<dependency reexport="false">7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</dependency>
2424
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
25+
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
2526
</dependencies>
2627
<languageVersions>
2728
<language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
2829
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
2930
<language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
31+
<language slang="l:52733268-be24-4f5f-ab84-a73b7c0c03b0:de.slisson.mps.richtext.customcell" version="0" />
3032
<language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
3133
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
3234
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/models/constraints.mps‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@
7272
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
7373
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
7474
</concept>
75-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
75+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
76+
<property id="1238684351431" name="asCast" index="1BlNFB" />
77+
</concept>
7678
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
7779
<reference id="1138056516764" name="link" index="3Tt5mk" />
7880
</concept>
@@ -82,24 +84,25 @@
8284
<ref role="1M2myG" to="8qwc:55lPkJH1wUe" resolve="LookupTarget" />
8385
<node concept="9S07l" id="55lPkJH1ECh" role="9Vyp8">
8486
<node concept="3clFbS" id="55lPkJH1ECi" role="2VODD2">
85-
<node concept="3clFbF" id="55lPkJH1EJx" role="3cqZAp">
86-
<node concept="2OqwBi" id="55lPkJH1HYY" role="3clFbG">
87-
<node concept="2OqwBi" id="55lPkJH1GrJ" role="2Oq$k0">
88-
<node concept="2OqwBi" id="55lPkJH1Fvs" role="2Oq$k0">
89-
<node concept="1PxgMI" id="55lPkJH1F1J" role="2Oq$k0">
90-
<node concept="chp4Y" id="55lPkJH1F9s" role="3oSUPX">
87+
<node concept="3clFbF" id="1tbxNVtFa_r" role="3cqZAp">
88+
<node concept="2OqwBi" id="1tbxNVtFckv" role="3clFbG">
89+
<node concept="2OqwBi" id="1tbxNVtFbWJ" role="2Oq$k0">
90+
<node concept="2OqwBi" id="1tbxNVtFbk5" role="2Oq$k0">
91+
<node concept="1PxgMI" id="1tbxNVtFaIV" role="2Oq$k0">
92+
<property role="1BlNFB" value="true" />
93+
<node concept="chp4Y" id="1tbxNVtFaTH" role="3oSUPX">
9194
<ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
9295
</node>
93-
<node concept="nLn13" id="55lPkJH1EJw" role="1m5AlR" />
96+
<node concept="nLn13" id="1tbxNVtFaSM" role="1m5AlR" />
9497
</node>
95-
<node concept="3TrEf2" id="55lPkJH1FRw" role="2OqNvi">
98+
<node concept="3TrEf2" id="1tbxNVtFbIj" role="2OqNvi">
9699
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
97100
</node>
98101
</node>
99-
<node concept="3JvlWi" id="55lPkJH1Hyn" role="2OqNvi" />
102+
<node concept="3JvlWi" id="1tbxNVtFcca" role="2OqNvi" />
100103
</node>
101-
<node concept="1mIQ4w" id="55lPkJH1IkA" role="2OqNvi">
102-
<node concept="chp4Y" id="55lPkJH1I$$" role="cj9EA">
104+
<node concept="1mIQ4w" id="1tbxNVtFcsH" role="2OqNvi">
105+
<node concept="chp4Y" id="1tbxNVtFcxk" role="cj9EA">
103106
<ref role="cht4Q" to="8qwc:55lPkJGZwPb" resolve="LookupTableType" />
104107
</node>
105108
</node>

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

Lines changed: 737 additions & 452 deletions
Large diffs are not rendered by default.

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

Lines changed: 86 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -386,65 +386,76 @@
386386
<node concept="3clFbH" id="55lPkJGOQMT" role="3cqZAp" />
387387
<node concept="3clFbJ" id="55lPkJGON6e" role="3cqZAp">
388388
<node concept="3clFbS" id="55lPkJGON6g" role="3clFbx">
389-
<node concept="1Z5TYs" id="55lPkJGON3i" role="3cqZAp">
390-
<node concept="mw_s8" id="55lPkJGON48" role="1ZfhKB">
391-
<node concept="2pJPEk" id="55lPkJH15$C" role="mwGJk">
392-
<node concept="2pJPED" id="55lPkJH15Of" role="2pJPEn">
393-
<ref role="2pJxaS" to="8qwc:55lPkJGZwPb" resolve="LookupTableType" />
394-
<node concept="2pIpSj" id="55lPkJH15P9" role="2pJxcM">
395-
<ref role="2pIpSl" to="8qwc:55lPkJGZxnb" resolve="rowType" />
396-
<node concept="36biLy" id="55lPkJH15PZ" role="28nt2d">
397-
<node concept="2OqwBi" id="55lPkJH17Le" role="36biLW">
398-
<node concept="2OqwBi" id="55lPkJH16bg" role="2Oq$k0">
399-
<node concept="1YBJjd" id="55lPkJH15Qg" role="2Oq$k0">
400-
<ref role="1YBMHb" node="55lPkJGOMCu" resolve="lookupTable" />
401-
</node>
402-
<node concept="3TrEf2" id="55lPkJH179S" role="2OqNvi">
403-
<ref role="3Tt5mk" to="8qwc:55lPkJGFLTi" resolve="rowType" />
389+
<node concept="nvevp" id="1tbxNVtCllI" role="3cqZAp">
390+
<node concept="3clFbS" id="1tbxNVtCllK" role="nvhr_">
391+
<node concept="1Z5TYs" id="55lPkJGON3i" role="3cqZAp">
392+
<node concept="mw_s8" id="55lPkJGON48" role="1ZfhKB">
393+
<node concept="2pJPEk" id="55lPkJH15$C" role="mwGJk">
394+
<node concept="2pJPED" id="55lPkJH15Of" role="2pJPEn">
395+
<ref role="2pJxaS" to="8qwc:55lPkJGZwPb" resolve="LookupTableType" />
396+
<node concept="2pIpSj" id="55lPkJH15P9" role="2pJxcM">
397+
<ref role="2pIpSl" to="8qwc:55lPkJGZxnb" resolve="rowType" />
398+
<node concept="36biLy" id="55lPkJH15PZ" role="28nt2d">
399+
<node concept="2OqwBi" id="55lPkJH17Le" role="36biLW">
400+
<node concept="2OqwBi" id="55lPkJH16bg" role="2Oq$k0">
401+
<node concept="1YBJjd" id="55lPkJH15Qg" role="2Oq$k0">
402+
<ref role="1YBMHb" node="55lPkJGOMCu" resolve="lookupTable" />
403+
</node>
404+
<node concept="3TrEf2" id="55lPkJH179S" role="2OqNvi">
405+
<ref role="3Tt5mk" to="8qwc:55lPkJGFLTi" resolve="rowType" />
406+
</node>
407+
</node>
408+
<node concept="1$rogu" id="55lPkJH18kw" role="2OqNvi" />
404409
</node>
405410
</node>
406-
<node concept="1$rogu" id="55lPkJH18kw" role="2OqNvi" />
407411
</node>
408-
</node>
409-
</node>
410-
<node concept="2pIpSj" id="55lPkJH18zh" role="2pJxcM">
411-
<ref role="2pIpSl" to="8qwc:55lPkJGZxng" resolve="colType" />
412-
<node concept="36biLy" id="55lPkJH18zi" role="28nt2d">
413-
<node concept="2OqwBi" id="55lPkJH18zj" role="36biLW">
414-
<node concept="2OqwBi" id="55lPkJH18zk" role="2Oq$k0">
415-
<node concept="1YBJjd" id="55lPkJH18zl" role="2Oq$k0">
416-
<ref role="1YBMHb" node="55lPkJGOMCu" resolve="lookupTable" />
412+
<node concept="2pIpSj" id="55lPkJH18zh" role="2pJxcM">
413+
<ref role="2pIpSl" to="8qwc:55lPkJGZxng" resolve="colType" />
414+
<node concept="36biLy" id="55lPkJH18zi" role="28nt2d">
415+
<node concept="2OqwBi" id="55lPkJH18zj" role="36biLW">
416+
<node concept="2OqwBi" id="55lPkJH18zk" role="2Oq$k0">
417+
<node concept="1YBJjd" id="55lPkJH18zl" role="2Oq$k0">
418+
<ref role="1YBMHb" node="55lPkJGOMCu" resolve="lookupTable" />
419+
</node>
420+
<node concept="3TrEf2" id="55lPkJH19GH" role="2OqNvi">
421+
<ref role="3Tt5mk" to="8qwc:55lPkJGFLTn" resolve="colType" />
422+
</node>
423+
</node>
424+
<node concept="1$rogu" id="55lPkJH18zn" role="2OqNvi" />
417425
</node>
418-
<node concept="3TrEf2" id="55lPkJH19GH" role="2OqNvi">
419-
<ref role="3Tt5mk" to="8qwc:55lPkJGFLTn" resolve="colType" />
426+
</node>
427+
</node>
428+
<node concept="2pIpSj" id="55lPkJH18CS" role="2pJxcM">
429+
<ref role="2pIpSl" to="8qwc:55lPkJGZxnp" resolve="resType" />
430+
<node concept="36biLy" id="55lPkJH18CT" role="28nt2d">
431+
<node concept="1PxgMI" id="1tbxNVtClwT" role="36biLW">
432+
<node concept="chp4Y" id="1tbxNVtClx_" role="3oSUPX">
433+
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
434+
</node>
435+
<node concept="2X3wrD" id="1tbxNVtCm8$" role="1m5AlR">
436+
<ref role="2X3Bk0" node="1tbxNVtCllO" resolve="concreteResultType" />
437+
</node>
420438
</node>
421439
</node>
422-
<node concept="1$rogu" id="55lPkJH18zn" role="2OqNvi" />
423440
</node>
424441
</node>
425442
</node>
426-
<node concept="2pIpSj" id="55lPkJH18CS" role="2pJxcM">
427-
<ref role="2pIpSl" to="8qwc:55lPkJGZxnp" resolve="resType" />
428-
<node concept="36biLy" id="55lPkJH18CT" role="28nt2d">
429-
<node concept="1PxgMI" id="6C0OSEaGERE" role="36biLW">
430-
<node concept="chp4Y" id="6C0OSEaGESi" role="3oSUPX">
431-
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
432-
</node>
433-
<node concept="1Z$b5t" id="55lPkJH1a0f" role="1m5AlR">
434-
<ref role="1Z$eMM" node="55lPkJGOMNy" resolve="resultType" />
435-
</node>
436-
</node>
443+
</node>
444+
<node concept="mw_s8" id="55lPkJGON3l" role="1ZfhK$">
445+
<node concept="1Z2H0r" id="55lPkJGOMOn" role="mwGJk">
446+
<node concept="1YBJjd" id="55lPkJGOMOY" role="1Z2MuG">
447+
<ref role="1YBMHb" node="55lPkJGOMCu" resolve="lookupTable" />
437448
</node>
438449
</node>
439450
</node>
440451
</node>
441452
</node>
442-
<node concept="mw_s8" id="55lPkJGON3l" role="1ZfhK$">
443-
<node concept="1Z2H0r" id="55lPkJGOMOn" role="mwGJk">
444-
<node concept="1YBJjd" id="55lPkJGOMOY" role="1Z2MuG">
445-
<ref role="1YBMHb" node="55lPkJGOMCu" resolve="lookupTable" />
446-
</node>
447-
</node>
453+
<node concept="1Z$b5t" id="1tbxNVtCm7_" role="nvjzm">
454+
<ref role="1Z$eMM" node="55lPkJGOMNy" resolve="resultType" />
455+
</node>
456+
<node concept="2X1qdy" id="1tbxNVtCllO" role="2X0Ygz">
457+
<property role="TrG5h" value="concreteResultType" />
458+
<node concept="2jxLKc" id="1tbxNVtCllP" role="1tU5fm" />
448459
</node>
449460
</node>
450461
</node>
@@ -624,5 +635,35 @@
624635
<ref role="1YaFvo" to="8qwc:55lPkJH1wUe" resolve="LookupTarget" />
625636
</node>
626637
</node>
638+
<node concept="1YbPZF" id="1tbxNVtFwVL">
639+
<property role="TrG5h" value="typeof_LookupTableRef" />
640+
<node concept="3clFbS" id="1tbxNVtFwVM" role="18ibNy">
641+
<node concept="1Z5TYs" id="1tbxNVtFx7m" role="3cqZAp">
642+
<node concept="mw_s8" id="1tbxNVtFx7E" role="1ZfhKB">
643+
<node concept="1Z2H0r" id="1tbxNVtFx7A" role="mwGJk">
644+
<node concept="2OqwBi" id="1tbxNVtFxiC" role="1Z2MuG">
645+
<node concept="1YBJjd" id="1tbxNVtFx7V" role="2Oq$k0">
646+
<ref role="1YBMHb" node="1tbxNVtFwVO" resolve="lookupTableRef" />
647+
</node>
648+
<node concept="3TrEf2" id="1tbxNVtFxxu" role="2OqNvi">
649+
<ref role="3Tt5mk" to="8qwc:55lPkJH2uuj" resolve="table" />
650+
</node>
651+
</node>
652+
</node>
653+
</node>
654+
<node concept="mw_s8" id="1tbxNVtFx7p" role="1ZfhK$">
655+
<node concept="1Z2H0r" id="1tbxNVtFwVS" role="mwGJk">
656+
<node concept="1YBJjd" id="1tbxNVtFwXK" role="1Z2MuG">
657+
<ref role="1YBMHb" node="1tbxNVtFwVO" resolve="lookupTableRef" />
658+
</node>
659+
</node>
660+
</node>
661+
</node>
662+
</node>
663+
<node concept="1YaCAy" id="1tbxNVtFwVO" role="1YuTPh">
664+
<property role="TrG5h" value="lookupTableRef" />
665+
<ref role="1YaFvo" to="8qwc:55lPkJH2urb" resolve="LookupTableRef" />
666+
</node>
667+
</node>
627668
</model>
628669

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/org.iets3.core.expr.lookup.mpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@
1717
<dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
1818
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
1919
<dependency reexport="false">7e450f4e-1ac3-41ef-a851-4598161bdb94(de.slisson.mps.tables)</dependency>
20+
<dependency reexport="false">da21218f-a674-474d-8b4e-d59e33007003(de.slisson.mps.tables.runtime)</dependency>
21+
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
22+
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
2023
</dependencies>
2124
<languageVersions>
2225
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
2326
<language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
27+
<language slang="l:52733268-be24-4f5f-ab84-a73b7c0c03b0:de.slisson.mps.richtext.customcell" version="0" />
2428
<language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" version="0" />
2529
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
2630
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />

0 commit comments

Comments
 (0)