Skip to content

Commit a08406d

Browse files
alexanderpannalexanderpann
authored
Merge pull request #611 from IETS3/datev-staging
2 parents 7ca9ea5 + 2732115 commit a08406d

File tree

10 files changed

+798
-293
lines changed

10 files changed

+798
-293
lines changed

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

Lines changed: 63 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,16 @@
637637
<node concept="3clFbS" id="50smQ1Va0Ex" role="18ibNy">
638638
<node concept="3clFbH" id="7SY$c$i76FJ" role="3cqZAp" />
639639
<node concept="3clFbJ" id="50smQ1Va0EH" role="3cqZAp">
640+
<node concept="3clFbS" id="50smQ1Va0EJ" role="3clFbx">
641+
<node concept="2MkqsV" id="50smQ1Va57y" role="3cqZAp">
642+
<node concept="Xl_RD" id="50smQ1Va57I" role="2MkJ7o">
643+
<property role="Xl_RC" value="at least one slice must be defined (alternatively the type constraint must be set)" />
644+
</node>
645+
<node concept="1YBJjd" id="50smQ1Va58l" role="1urrMF">
646+
<ref role="1YBMHb" node="50smQ1Va0Ez" resolve="tl" />
647+
</node>
648+
</node>
649+
</node>
640650
<node concept="1Wc70l" id="7SY$c$i9jtF" role="3clFbw">
641651
<node concept="2OqwBi" id="7SY$c$i9kb5" role="3uHU7w">
642652
<node concept="2OqwBi" id="7SY$c$i9jGP" role="2Oq$k0">
@@ -661,16 +671,6 @@
661671
<node concept="1v1jN8" id="50smQ1Va56T" role="2OqNvi" />
662672
</node>
663673
</node>
664-
<node concept="3clFbS" id="50smQ1Va0EJ" role="3clFbx">
665-
<node concept="2MkqsV" id="50smQ1Va57y" role="3cqZAp">
666-
<node concept="Xl_RD" id="50smQ1Va57I" role="2MkJ7o">
667-
<property role="Xl_RC" value="at least one slice must be defined (alternatively the type constraint must be set)" />
668-
</node>
669-
<node concept="1YBJjd" id="50smQ1Va58l" role="1urrMF">
670-
<ref role="1YBMHb" node="50smQ1Va0Ez" resolve="tl" />
671-
</node>
672-
</node>
673-
</node>
674674
<node concept="3eNFk2" id="2LepRDoReMj" role="3eNLev">
675675
<node concept="1Wc70l" id="2LepRDoRj8d" role="3eO9$A">
676676
<node concept="2OqwBi" id="2LepRDoRjZS" role="3uHU7w">
@@ -1788,27 +1788,66 @@
17881788
</node>
17891789
</node>
17901790
<node concept="3clFbS" id="1Mp62pP0JhF" role="3clFbx">
1791-
<node concept="1Z5TYs" id="1Mp62pP0Kiq" role="3cqZAp">
1792-
<node concept="mw_s8" id="1Mp62pP0KqY" role="1ZfhKB">
1793-
<node concept="2OqwBi" id="1Mp62pP0KHS" role="mwGJk">
1794-
<node concept="1PxgMI" id="1Mp62pP0Kxj" role="2Oq$k0">
1795-
<node concept="chp4Y" id="1Mp62pP0KxL" role="3oSUPX">
1796-
<ref role="cht4Q" to="l462:50smQ1V8i89" resolve="TemporalType" />
1797-
</node>
1798-
<node concept="2X3wrD" id="1Mp62pP0KqW" role="1m5AlR">
1799-
<ref role="2X3Bk0" node="1Mp62pP0IvA" resolve="ctxType" />
1791+
<node concept="3clFbJ" id="5ggxKBpYbiE" role="3cqZAp">
1792+
<node concept="3clFbS" id="5ggxKBpYbiG" role="3clFbx">
1793+
<node concept="1Z5TYs" id="5ggxKBpYdIO" role="3cqZAp">
1794+
<node concept="mw_s8" id="5ggxKBpYg04" role="1ZfhKB">
1795+
<node concept="2YIFZM" id="5ggxKBpYg5z" role="mwGJk">
1796+
<ref role="37wK5l" to="xfg9:2Qbt$1tTQdc" resolve="createRealType" />
1797+
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
1798+
<node concept="10Nm6u" id="5ggxKBpYnI_" role="37wK5m" />
18001799
</node>
18011800
</node>
1802-
<node concept="3TrEf2" id="1Mp62pP0L4g" role="2OqNvi">
1803-
<ref role="3Tt5mk" to="l462:50smQ1V8i8a" resolve="baseType" />
1801+
<node concept="mw_s8" id="5ggxKBpYdIV" role="1ZfhK$">
1802+
<node concept="1Z2H0r" id="5ggxKBpYdIW" role="mwGJk">
1803+
<node concept="1YBJjd" id="5ggxKBpYdIX" role="1Z2MuG">
1804+
<ref role="1YBMHb" node="1Mp62pP0HRo" resolve="reduce" />
1805+
</node>
1806+
</node>
18041807
</node>
18051808
</node>
18061809
</node>
1807-
<node concept="mw_s8" id="1Mp62pP0Kit" role="1ZfhK$">
1808-
<node concept="1Z2H0r" id="1Mp62pP0K9n" role="mwGJk">
1809-
<node concept="1YBJjd" id="1Mp62pP0Kb9" role="1Z2MuG">
1810+
<node concept="2OqwBi" id="5ggxKBpYcNW" role="3clFbw">
1811+
<node concept="2OqwBi" id="5ggxKBpYbLA" role="2Oq$k0">
1812+
<node concept="1YBJjd" id="5ggxKBpYb$3" role="2Oq$k0">
18101813
<ref role="1YBMHb" node="1Mp62pP0HRo" resolve="reduce" />
18111814
</node>
1815+
<node concept="3TrEf2" id="5ggxKBpYcay" role="2OqNvi">
1816+
<ref role="3Tt5mk" to="l462:1Mp62pP0G9w" resolve="strategy" />
1817+
</node>
1818+
</node>
1819+
<node concept="1mIQ4w" id="5ggxKBpYd6L" role="2OqNvi">
1820+
<node concept="chp4Y" id="5ggxKBpYdd$" role="cj9EA">
1821+
<ref role="cht4Q" to="l462:6nEpT4GTaVD" resolve="ReduceStrategyWeighted" />
1822+
</node>
1823+
</node>
1824+
</node>
1825+
<node concept="9aQIb" id="5ggxKBpYdE7" role="9aQIa">
1826+
<node concept="3clFbS" id="5ggxKBpYdE8" role="9aQI4">
1827+
<node concept="1Z5TYs" id="1Mp62pP0Kiq" role="3cqZAp">
1828+
<node concept="mw_s8" id="1Mp62pP0KqY" role="1ZfhKB">
1829+
<node concept="2OqwBi" id="1Mp62pP0KHS" role="mwGJk">
1830+
<node concept="1PxgMI" id="1Mp62pP0Kxj" role="2Oq$k0">
1831+
<node concept="chp4Y" id="1Mp62pP0KxL" role="3oSUPX">
1832+
<ref role="cht4Q" to="l462:50smQ1V8i89" resolve="TemporalType" />
1833+
</node>
1834+
<node concept="2X3wrD" id="1Mp62pP0KqW" role="1m5AlR">
1835+
<ref role="2X3Bk0" node="1Mp62pP0IvA" resolve="ctxType" />
1836+
</node>
1837+
</node>
1838+
<node concept="3TrEf2" id="1Mp62pP0L4g" role="2OqNvi">
1839+
<ref role="3Tt5mk" to="l462:50smQ1V8i8a" resolve="baseType" />
1840+
</node>
1841+
</node>
1842+
</node>
1843+
<node concept="mw_s8" id="1Mp62pP0Kit" role="1ZfhK$">
1844+
<node concept="1Z2H0r" id="1Mp62pP0K9n" role="mwGJk">
1845+
<node concept="1YBJjd" id="1Mp62pP0Kb9" role="1Z2MuG">
1846+
<ref role="1YBMHb" node="1Mp62pP0HRo" resolve="reduce" />
1847+
</node>
1848+
</node>
1849+
</node>
1850+
</node>
18121851
</node>
18131852
</node>
18141853
</node>

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

Lines changed: 52 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,14 @@
5757
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
5858
<import index="pq1l" ref="r:93cd1fe8-b296-405c-a6e6-040c940ccfa1(org.iets3.core.expr.toplevel.plugin)" />
5959
<import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
60-
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
61-
<import index="kpve" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.message(MPS.Editor/)" />
62-
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
60+
<import index="4k19" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.hamcrest(JUnit/)" />
6361
<import index="kvq8" ref="r:2e938759-cfd0-47cd-9046-896d85204f59(de.slisson.mps.hacks.editor)" />
6462
<import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
6563
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
66-
<import index="4k19" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.hamcrest(JUnit/)" />
64+
<import index="kpve" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.message(MPS.Editor/)" />
65+
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
66+
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
67+
<import index="wcxw" ref="r:b9f36c08-4a75-4513-9277-a390d3426e0f(jetbrains.mps.editor.runtime.impl.cellActions)" />
6768
<import index="jpm3" ref="r:e3e5593b-dfcd-4a2e-b10f-f1ed4a43f093(org.iets3.core.expr.plugin.plugin)" />
6869
<import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" implicit="true" />
6970
</imports>
@@ -417,6 +418,9 @@
417418
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
418419
<reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
419420
</concept>
421+
<concept id="1182511038748" name="jetbrains.mps.lang.smodel.structure.Model_NodesIncludingImportedOperation" flags="nn" index="1j9C0f">
422+
<child id="6750920497477143623" name="conceptArgument" index="3MHPCF" />
423+
</concept>
420424
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
421425
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
422426
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -2025,8 +2029,8 @@
20252029
<ref role="3cqZAo" node="1KPsfaLJpk$" resolve="res" />
20262030
</node>
20272031
<node concept="X8dFx" id="1KPsfaLJujm" role="2OqNvi">
2028-
<node concept="2OqwBi" id="5$JCxfbTwjt" role="25WWJ7">
2029-
<node concept="2OqwBi" id="5$JCxfbTwju" role="2Oq$k0">
2032+
<node concept="2OqwBi" id="230lIJUbgs" role="25WWJ7">
2033+
<node concept="2OqwBi" id="4QQXQNDecuu" role="2Oq$k0">
20302034
<node concept="2Rf3mk" id="2c2AzQdhomR" role="2OqNvi">
20312035
<node concept="1xMEDy" id="2c2AzQdhomT" role="1xVPHs">
20322036
<node concept="chp4Y" id="2c2AzQdhoCp" role="ri$Ld">
@@ -2036,30 +2040,13 @@
20362040
</node>
20372041
<node concept="13iPFW" id="5$JCxfbTwjv" role="2Oq$k0" />
20382042
</node>
2039-
<node concept="3zZkjj" id="5$JCxfbTwjx" role="2OqNvi">
2040-
<node concept="1bVj0M" id="5$JCxfbTwjy" role="23t8la">
2041-
<node concept="3clFbS" id="5$JCxfbTwjz" role="1bW5cS">
2042-
<node concept="3clFbF" id="5$JCxfbTwj$" role="3cqZAp">
2043-
<node concept="2OqwBi" id="5$JCxfbTwj_" role="3clFbG">
2044-
<node concept="37vLTw" id="5$JCxfbTwjA" role="2Oq$k0">
2045-
<ref role="3cqZAo" node="5$JCxfbTwjE" resolve="it" />
2046-
</node>
2047-
<node concept="1mIQ4w" id="5$JCxfbTwjB" role="2OqNvi">
2048-
<node concept="25Kdxt" id="5$JCxfbTwjC" role="cj9EA">
2049-
<node concept="2OqwBi" id="1mDdTGHnpv" role="25KhWn">
2050-
<node concept="37vLTw" id="5$JCxfbTwjD" role="2Oq$k0">
2051-
<ref role="3cqZAo" node="5$JCxfbTgvQ" resolve="targetConcept" />
2052-
</node>
2053-
<node concept="1rGIog" id="1mDdTGHnMK" role="2OqNvi" />
2054-
</node>
2055-
</node>
2056-
</node>
2057-
</node>
2043+
<node concept="v3k3i" id="230lIJUfBi" role="2OqNvi">
2044+
<node concept="25Kdxt" id="230lIJUhGN" role="v3oSu">
2045+
<node concept="2OqwBi" id="230lIJUlC6" role="25KhWn">
2046+
<node concept="37vLTw" id="230lIJUjQS" role="2Oq$k0">
2047+
<ref role="3cqZAo" node="5$JCxfbTgvQ" resolve="targetConcept" />
20582048
</node>
2059-
</node>
2060-
<node concept="Rh6nW" id="5$JCxfbTwjE" role="1bW2Oz">
2061-
<property role="TrG5h" value="it" />
2062-
<node concept="2jxLKc" id="5$JCxfbTwjF" role="1tU5fm" />
2049+
<node concept="1rGIog" id="230lIJUo4M" role="2OqNvi" />
20632050
</node>
20642051
</node>
20652052
</node>
@@ -2071,24 +2058,26 @@
20712058
<node concept="9aQIb" id="5$JCxfbTixX" role="9aQIa">
20722059
<node concept="3clFbS" id="5$JCxfbTixY" role="9aQI4">
20732060
<node concept="3clFbF" id="5m_JEEZZMav" role="3cqZAp">
2074-
<node concept="2OqwBi" id="5m_JEEZZOeu" role="3clFbG">
2061+
<node concept="2OqwBi" id="4QQXQNDig7j" role="3clFbG">
20752062
<node concept="37vLTw" id="5m_JEEZZMat" role="2Oq$k0">
20762063
<ref role="3cqZAo" node="1KPsfaLJpk$" resolve="res" />
20772064
</node>
20782065
<node concept="liA8E" id="5m_JEEZZP$o" role="2OqNvi">
20792066
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
2080-
<node concept="2YIFZM" id="5m_JEEZZlEm" role="37wK5m">
2081-
<ref role="1Pybhc" to="i8bi:5IkW5anFaW6" resolve="SModelOperations" />
2082-
<ref role="37wK5l" to="i8bi:6cG5ul0xAxx" resolve="nodesIncludingImported" />
2083-
<node concept="2OqwBi" id="5m_JEEZZm93" role="37wK5m">
2067+
<node concept="2OqwBi" id="230lIJTTtd" role="37wK5m">
2068+
<node concept="2OqwBi" id="5m_JEEZZm93" role="2Oq$k0">
20842069
<node concept="13iPFW" id="5m_JEEZZlID" role="2Oq$k0" />
20852070
<node concept="I4A8Y" id="5m_JEEZZmPd" role="2OqNvi" />
20862071
</node>
2087-
<node concept="2OqwBi" id="5m_JEEZZKze" role="37wK5m">
2088-
<node concept="37vLTw" id="5m_JEEZZKjw" role="2Oq$k0">
2089-
<ref role="3cqZAo" node="5$JCxfbTgvQ" resolve="targetConcept" />
2072+
<node concept="1j9C0f" id="230lIJTVBo" role="2OqNvi">
2073+
<node concept="25Kdxt" id="230lIJTXRs" role="3MHPCF">
2074+
<node concept="2OqwBi" id="230lIJU1LH" role="25KhWn">
2075+
<node concept="37vLTw" id="230lIJTZd6" role="2Oq$k0">
2076+
<ref role="3cqZAo" node="5$JCxfbTgvQ" resolve="targetConcept" />
2077+
</node>
2078+
<node concept="1rGIog" id="230lIJU2UF" role="2OqNvi" />
2079+
</node>
20902080
</node>
2091-
<node concept="1rGIog" id="5m_JEEZZKQC" role="2OqNvi" />
20922081
</node>
20932082
</node>
20942083
</node>
@@ -2135,8 +2124,31 @@
21352124
</node>
21362125
</node>
21372126
<node concept="3clFbF" id="1KPsfaLJH5h" role="3cqZAp">
2138-
<node concept="37vLTw" id="1KPsfaLJH5f" role="3clFbG">
2139-
<ref role="3cqZAo" node="1KPsfaLJpk$" resolve="res" />
2127+
<node concept="2OqwBi" id="230lIJTLgN" role="3clFbG">
2128+
<node concept="37vLTw" id="1KPsfaLJH5f" role="2Oq$k0">
2129+
<ref role="3cqZAo" node="1KPsfaLJpk$" resolve="res" />
2130+
</node>
2131+
<node concept="3zZkjj" id="230lIJTFuU" role="2OqNvi">
2132+
<node concept="1bVj0M" id="230lIJTFuW" role="23t8la">
2133+
<node concept="3clFbS" id="230lIJTFuX" role="1bW5cS">
2134+
<node concept="3clFbF" id="230lIJTF$c" role="3cqZAp">
2135+
<node concept="3fqX7Q" id="230lIJTGhW" role="3clFbG">
2136+
<node concept="2YIFZM" id="230lIJTGhY" role="3fr31v">
2137+
<ref role="37wK5l" to="wcxw:7YnpPzFReKN" resolve="isCommentedOut" />
2138+
<ref role="1Pybhc" to="wcxw:5FzO4t9gN3W" resolve="CommentUtil" />
2139+
<node concept="37vLTw" id="230lIJTGhZ" role="37wK5m">
2140+
<ref role="3cqZAo" node="230lIJTFuY" resolve="it" />
2141+
</node>
2142+
</node>
2143+
</node>
2144+
</node>
2145+
</node>
2146+
<node concept="Rh6nW" id="230lIJTFuY" role="1bW2Oz">
2147+
<property role="TrG5h" value="it" />
2148+
<node concept="2jxLKc" id="230lIJTFuZ" role="1tU5fm" />
2149+
</node>
2150+
</node>
2151+
</node>
21402152
</node>
21412153
</node>
21422154
</node>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@
163163
<dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
164164
<dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
165165
<dependency reexport="false">cbb71b24-470d-4374-b77c-ebd0d3b3bb27(org.iets3.core.expr.plugin)</dependency>
166+
<dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
166167
</dependencies>
167168
<languageVersions>
168169
<language slang="l:f3b3dc28-fee3-49e1-a46e-685e96389094:com.mbeddr.mpsutil.bldoc" version="0" />
@@ -266,6 +267,7 @@
266267
<module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
267268
<module reference="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" version="0" />
268269
<module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
270+
<module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
269271
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
270272
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
271273
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />

0 commit comments

Comments
 (0)