Skip to content

Commit

Permalink
Extend DataTableLookUp with optional argument: default row
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexeiQ
AlexeiQ committed Dec 2, 2022
1 parent 9d904de commit 3af4b42
Show file tree
Hide file tree
Showing 8 changed files with 1,582 additions and 215 deletions.
297 changes: 297 additions & 0 deletions ...pensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.behavior.mps
View file

Large diffs are not rendered by default.

59 changes: 58 additions & 1 deletion ...source/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.constraints.mps
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:d01b97ee-eb54-4b3c-b85e-f72b7435869b(org.iets3.core.expr.data.constraints)">
<persistence version="9" />
<attribute name="doNotGenerate" value="false" />
<languages>
<use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
<use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
Expand All @@ -16,11 +17,12 @@
</languages>
<imports>
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
<import index="e9k1" ref="r:00903dee-f0b0-48de-9335-7cb3f90ae462(org.iets3.core.expr.data.structure)" implicit="true" />
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
<import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
<import index="ux24" ref="r:74ad67c1-3cf0-4c00-bd30-edf8df02cfe5(org.iets3.core.expr.data.behavior)" implicit="true" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
Expand Down Expand Up @@ -458,5 +460,60 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="1WMFq5x4gkL">
<ref role="1M2myG" to="e9k1:1WMFq5x4fLm" resolve="DataRowRefForLookup" />
<node concept="1N5Pfh" id="1WMFq5x4gm0" role="1Mr941">
<ref role="1N5Vy1" to="e9k1:1WMFq5x4fLn" resolve="dataRow" />
<node concept="3dgokm" id="1WMFq5x4gm1" role="1N6uqs">
<node concept="3clFbS" id="1WMFq5x4gm2" role="2VODD2">
<node concept="3clFbF" id="1WMFq5x4gm3" role="3cqZAp">
<node concept="2YIFZM" id="1WMFq5x4gm4" role="3clFbG">
<ref role="37wK5l" to="o8zo:4IP40Bi3eAf" resolve="forNamedElements" />
<ref role="1Pybhc" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
<node concept="2OqwBi" id="1WMFq5x4gm5" role="37wK5m">
<node concept="2OqwBi" id="1WMFq5x4gm6" role="2Oq$k0">
<node concept="2OqwBi" id="5nzoslouWGn" role="2Oq$k0">
<node concept="2OqwBi" id="5nzoslouW5T" role="2Oq$k0">
<node concept="2rP1CM" id="1WMFq5x4gmb" role="2Oq$k0" />
<node concept="2Xjw5R" id="5nzoslouWot" role="2OqNvi">
<node concept="1xMEDy" id="5nzoslouWov" role="1xVPHs">
<node concept="chp4Y" id="5nzoslouWvn" role="ri$Ld">
<ref role="cht4Q" to="e9k1:stdmzxm7Y2" resolve="DataTableLookUp" />
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="5nzoslouWNj" role="2OqNvi">
<ref role="37wK5l" to="ux24:5nzoslouECc" resolve="getDataSelector" />
</node>
</node>
<node concept="3TrEf2" id="1WMFq5x4gmh" role="2OqNvi">
<ref role="3Tt5mk" to="e9k1:cPLa7FstD4" resolve="table" />
</node>
</node>
<node concept="3Tsc0h" id="1WMFq5x4gmi" role="2OqNvi">
<ref role="3TtcxE" to="e9k1:cPLa7FpRVO" resolve="rows" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="9S07l" id="1WMFq5x4jil" role="9Vyp8">
<node concept="3clFbS" id="1WMFq5x4jim" role="2VODD2">
<node concept="3clFbF" id="1WMFq5x4jiH" role="3cqZAp">
<node concept="2OqwBi" id="67dYdlPOTzy" role="3clFbG">
<node concept="nLn13" id="67dYdlPOSXB" role="2Oq$k0" />
<node concept="1mIQ4w" id="67dYdlPOTJ9" role="2OqNvi">
<node concept="chp4Y" id="67dYdlPOTT1" role="cj9EA">
<ref role="cht4Q" to="e9k1:stdmzxm7Y2" resolve="DataTableLookUp" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</model>

45 changes: 39 additions & 6 deletions ....opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
<import index="reoo" ref="r:1e59a084-7ebe-4e95-89ab-c58a7e396583(de.slisson.mps.tables.editor)" />
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
<import index="e9k1" ref="r:00903dee-f0b0-48de-9335-7cb3f90ae462(org.iets3.core.expr.data.structure)" implicit="true" />
<import index="e9k1" ref="r:00903dee-f0b0-48de-9335-7cb3f90ae462(org.iets3.core.expr.data.structure)" />
<import index="itrz" ref="r:80fb0853-eb3b-4e84-aebd-cc7fdb011d97(org.iets3.core.base.editor)" implicit="true" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
<import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
Expand Down Expand Up @@ -951,12 +951,24 @@
</node>
</node>
</node>
<node concept="3F0ifn" id="7F9023_KKU3" role="3EZMnx">
<property role="3F0ifm" value="&gt;" />
<node concept="11L4FC" id="7F9023_KKUj" role="3F10Kt">
<property role="VOm3f" value="true" />
<node concept="_tjkj" id="67dYdlPPfmg" role="3EZMnx">
<node concept="3EZMnI" id="67dYdlPPfLs" role="_tjki">
<node concept="3F0ifn" id="67dYdlPPfLD" role="3EZMnx">
<property role="3F0ifm" value="," />
<node concept="11L4FC" id="2sfIqvUwT3E" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F1sOY" id="67dYdlPOe94" role="3EZMnx">
<ref role="1NtTu8" to="e9k1:3RQ2yxdeEit" resolve="defaultRow" />
</node>
<node concept="2iRfu4" id="67dYdlPPfLv" role="2iSdaV" />
<node concept="VPM3Z" id="67dYdlPPfLw" role="3F10Kt" />
</node>
<node concept="11LMrY" id="7F9023_KKUo" role="3F10Kt">
</node>
<node concept="3F0ifn" id="67dYdlPMe4a" role="3EZMnx">
<property role="3F0ifm" value="&gt;" />
<node concept="11L4FC" id="2sfIqvUwT3C" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
Expand Down Expand Up @@ -1123,5 +1135,26 @@
</node>
</node>
</node>
<node concept="24kQdi" id="1WMFq5x4fLo">
<ref role="1XX52x" to="e9k1:1WMFq5x4fLm" resolve="DataRowRefForLookup" />
<node concept="3EZMnI" id="7EHDEMiDE42" role="2wV5jI">
<node concept="PMmxH" id="7EHDEMiDE4h" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
</node>
<node concept="3F0ifn" id="7EHDEMiDE4s" role="3EZMnx">
<property role="3F0ifm" value="=" />
</node>
<node concept="2iRfu4" id="7EHDEMiDE43" role="2iSdaV" />
<node concept="1iCGBv" id="1WMFq5x4fLp" role="3EZMnx">
<ref role="1NtTu8" to="e9k1:1WMFq5x4fLn" resolve="dataRow" />
<node concept="1sVBvm" id="1WMFq5x4fLq" role="1sWHZn">
<node concept="3F0A7n" id="1WMFq5x4fLr" role="2wV5jI">
<property role="1Intyy" value="true" />
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</model>

18 changes: 18 additions & 0 deletions ...ensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.structure.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,12 @@
<property role="20kJfa" value="col" />
<ref role="20lvS9" node="7F9023_OqBf" resolve="DataColDefRef" />
</node>
<node concept="1TJgyj" id="3RQ2yxdeEit" role="1TKVEi">
<property role="IQ2ns" value="4464767248795083933" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="defaultRow" />
<ref role="20lvS9" node="1WMFq5x4fLm" resolve="DataRowRefForLookup" />
</node>
<node concept="1TJgyj" id="stdmzxm7Y5" role="1TKVEi">
<property role="IQ2ns" value="512624657163648901" />
<property role="20kJfa" value="col_old" />
Expand Down Expand Up @@ -272,5 +278,17 @@
<ref role="20lvS9" node="cPLa7Fpiy9" resolve="DataRow" />
</node>
</node>
<node concept="1TIwiD" id="1WMFq5x4fLm">
<property role="EcuMT" value="2248050072641141846" />
<property role="TrG5h" value="DataRowRefForLookup" />
<property role="34LRSv" value="default" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="1WMFq5x4fLn" role="1TKVEi">
<property role="20lbJX" value="fLJekj4/1" />
<property role="IQ2ns" value="2248050072641141847" />
<property role="20kJfa" value="dataRow" />
<ref role="20lvS9" node="cPLa7Fpiy9" resolve="DataRow" />
</node>
</node>
</model>

Loading

0 comments on commit 3af4b42

Please sign in to comment.