Skip to content

Commit 68aa03b

Browse files
markusvoeltermarkusvoelter
authored
Merge pull request #715 from IETS3/fixesMarkus20213
Fixes markus20213
2 parents 25ca608 + 72a1d60 commit 68aa03b

File tree

52 files changed

+4859
-365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+4859
-365
lines changed

‎code/languages/org.iets3.opensource/.mps/libraries.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project version='4'>
3-
<component name='ProjectLibraryManager'>
4-
<option name='libraries'>
2+
<project version="4">
3+
<component name="ProjectLibraryManager">
4+
<option name="libraries">
55
<map>
6-
<entry key='mbeddr.plattform'>
6+
<entry key="mbeddr.plattform">
77
<value>
88
<Library>
9-
<option name='name' value='mbeddr.plattform' />
10-
<option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.platform' />
11-
</Library>
9+
<option name="name" value="mbeddr.plattform" />
10+
<option name='path' value='$PROJECT_DIR$/../../../build/dependencies/com.mbeddr.platform' />
11+
</Library>
1212
</value>
1313
</entry>
1414
</map>

‎code/languages/org.iets3.opensource/.mps/modules.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.doc/org.iets3.core.expr.doc.mpl" folder="expr.lang-advanced" />
3030
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.base/org.iets3.core.expr.genjava.base.mpl" folder="expr.genjava" />
3131
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.contracts/org.iets3.core.expr.genjava.contracts.mpl" folder="expr.genjava" />
32+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.data/org.iets3.core.expr.genjava.data.mpl" folder="expr.genjava" />
3233
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.datetime/org.iets3.core.expr.genjava.datetime.mpl" folder="expr.genjava" />
3334
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.messages/org.iets3.core.expr.genjava.messages.mpl" folder="expr.genjava" />
3435
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl" folder="expr.genjava" />

‎code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/models/org.iets3.opensource.__spreferences.TestExecutionPreferences.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<concept id="4473287864570292399" name="org.iets3.core.expr.testExecution.structure.TestExecutionConfig" flags="ng" index="3ZOQsN">
1616
<child id="4473287864570320758" name="executionMode" index="3ZOXzE" />
1717
</concept>
18-
<concept id="4473287864570320840" name="org.iets3.core.expr.testExecution.structure.InterpreterExecutionMode" flags="ng" index="3ZOXxk" />
18+
<concept id="4473287864570320810" name="org.iets3.core.expr.testExecution.structure.GeneratorExecutionMode" flags="ng" index="3ZOXwQ" />
1919
</language>
2020
</registry>
2121
<node concept="3ZOQsN" id="6pNCASbHXH8">
2222
<property role="TrG5h" value="KernelFTestExecution" />
23-
<node concept="3ZOXxk" id="2R7vP7hzmjd" role="3ZOXzE" />
23+
<node concept="3ZOXwQ" id="6wzrxL2Tnzf" role="3ZOXzE" />
2424
</node>
2525
</model>
2626

‎code/languages/org.iets3.opensource/devkits/org.iets3.core.expr.genjava.advanced.devkit/org.iets3.core.expr.genjava.advanced.devkit.devkit‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<exported-language name="15d858db-2d21-4ae9-90c4-f595086d0bdf(org.iets3.core.expr.genjava.util)" />
66
<exported-language name="752cf1d3-84d1-4f2b-bbf5-4ef076a62ec7(org.iets3.core.expr.genjava.messages)" />
77
<exported-language name="f9bb00ab-1f7e-40ab-9ec0-b11e02d84d0f(org.iets3.core.expr.genjava.stringvalidation)" />
8+
<exported-language name="98560bc9-b823-4181-83c6-33c39e2f5e9b(org.iets3.core.expr.genjava.data)" />
89
<extendedDevKits>
910
<extendedDevKit>da9c5738-b245-4e38-b52f-e6ee76cadd7f(org.iets3.core.expr.genjava.core.devkit)</extendedDevKit>
1011
</extendedDevKits>

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

Lines changed: 426 additions & 64 deletions
Large diffs are not rendered by default.

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

Lines changed: 266 additions & 2 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,5 +2189,9 @@
21892189
<property role="EcuMT" value="7520958096812440715" />
21902190
<property role="TrG5h" value="IComplexTypeSupportsEquals" />
21912191
</node>
2192+
<node concept="PlHQZ" id="6wzrxL38hak">
2193+
<property role="EcuMT" value="7503962471793758868" />
2194+
<property role="TrG5h" value="IPreferredProposalContext" />
2195+
</node>
21922196
</model>
21932197

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626
<dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
2727
<dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
2828
<dependency reexport="false">00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime)</dependency>
29+
<dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
2930
</dependencies>
3031
<languageVersions>
3132
<language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
32-
<language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
33-
<language slang="l:b33d119e-196d-4497-977c-5c167b21fe33:com.mbeddr.mpsutil.framecell" version="0" />
3433
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
3534
<language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
3635
<language slang="l:b92f861d-0184-446d-b88b-6dcf0e070241:com.mbeddr.mpsutil.intentions" version="0" />
@@ -117,6 +116,7 @@
117116
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
118117
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
119118
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
119+
<module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
120120
<module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
121121
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
122122
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />

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

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
</imports>
1616
<registry>
1717
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
18-
<concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
19-
<child id="1082485599096" name="statements" index="9aQI4" />
20-
</concept>
2118
<concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
2219
<child id="1068498886297" name="rValue" index="37vLTx" />
2320
<child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -57,7 +54,6 @@
5754
</concept>
5855
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
5956
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
60-
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
6157
<child id="1068580123160" name="condition" index="3clFbw" />
6258
<child id="1068580123161" name="ifTrue" index="3clFbx" />
6359
</concept>
@@ -199,15 +195,11 @@
199195
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
200196
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
201197
</concept>
202-
<concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
203-
<child id="1144104376918" name="parameter" index="1xVPHs" />
204-
</concept>
205198
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
206199
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
207200
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
208201
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
209202
</concept>
210-
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
211203
<concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
212204
<reference id="3562215692195600259" name="link" index="13MTZf" />
213205
</concept>
@@ -220,9 +212,6 @@
220212
</concept>
221213
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
222214
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
223-
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
224-
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
225-
</concept>
226215
<concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
227216
<child id="1180636770616" name="createdType" index="3zrR0E" />
228217
</concept>
@@ -611,44 +600,6 @@
611600
<ref role="3TsBF5" to="e9k1:2SzGbCMIroO" resolve="allowLookup" />
612601
</node>
613602
</node>
614-
<node concept="9aQIb" id="3tcv7J0PUY6" role="9aQIa">
615-
<node concept="3clFbS" id="3tcv7J0PUY7" role="9aQI4">
616-
<node concept="3clFbF" id="3tcv7J0PVme" role="3cqZAp">
617-
<node concept="2OqwBi" id="3tcv7J0PYkS" role="3clFbG">
618-
<node concept="2OqwBi" id="3tcv7J0PVAB" role="2Oq$k0">
619-
<node concept="1YBJjd" id="3tcv7J0PVmd" role="2Oq$k0">
620-
<ref role="1YBMHb" node="cPLa7FrPf0" resolve="dataTable" />
621-
</node>
622-
<node concept="2Rf3mk" id="3tcv7J0PWqv" role="2OqNvi">
623-
<node concept="1xMEDy" id="3tcv7J0PWqx" role="1xVPHs">
624-
<node concept="chp4Y" id="3tcv7J0PWxk" role="ri$Ld">
625-
<ref role="cht4Q" to="hm2y:MNXm1ElbHo" resolve="IEmptyLiteral" />
626-
</node>
627-
</node>
628-
</node>
629-
</node>
630-
<node concept="2es0OD" id="3tcv7J0Q0uH" role="2OqNvi">
631-
<node concept="1bVj0M" id="3tcv7J0Q0uJ" role="23t8la">
632-
<node concept="3clFbS" id="3tcv7J0Q0uK" role="1bW5cS">
633-
<node concept="2MkqsV" id="3tcv7J0Q0xB" role="3cqZAp">
634-
<node concept="37vLTw" id="3tcv7J0Q0xJ" role="1urrMF">
635-
<ref role="3cqZAo" node="3tcv7J0Q0uL" resolve="it" />
636-
</node>
637-
<node concept="Xl_RD" id="3tcv7J0Q0GU" role="2MkJ7o">
638-
<property role="Xl_RC" value="empty value is only allowed in data tables that support look up" />
639-
</node>
640-
</node>
641-
</node>
642-
<node concept="Rh6nW" id="3tcv7J0Q0uL" role="1bW2Oz">
643-
<property role="TrG5h" value="it" />
644-
<node concept="2jxLKc" id="3tcv7J0Q0uM" role="1tU5fm" />
645-
</node>
646-
</node>
647-
</node>
648-
</node>
649-
</node>
650-
</node>
651-
</node>
652603
</node>
653604
</node>
654605
<node concept="1YaCAy" id="cPLa7FrPf0" role="1YuTPh">

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,5 +986,12 @@
986986
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
987987
</node>
988988
</node>
989+
<node concept="24kQdi" id="7MYpJaZ9zRO">
990+
<ref role="1XX52x" to="mi3w:7MYpJaZ9zRp" resolve="CurrentDateExpr" />
991+
<node concept="3F0ifn" id="7MYpJaZ9zRQ" role="2wV5jI">
992+
<property role="3F0ifm" value="currentDate" />
993+
<ref role="1k5W1q" to="itrz:4rZeNQ6MfR7" resolve="iets3Keyword" />
994+
</node>
995+
</node>
989996
</model>
990997

0 commit comments

Comments
 (0)