Skip to content

Commit 2aca26d

Browse files
HeikoBeckerHeikoBecker
authored
Merge pull request #670 from IETS3/feature/merge_master_20212
Merge maintenance/mps20212 into master
2 parents f716dd8 + 9164235 commit 2aca26d

File tree

68 files changed

+20868
-1846
lines changed

Some content is hidden

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

68 files changed

+20868
-1846
lines changed

‎build/scripts/build-allScripts.xml‎

100755100644
File mode changed.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<project version='4'>
23
<component name='ProjectLibraryManager'>
34
<option name='libraries'>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.stateMachineExample/org.iets3.core.expr.genjava.stateMachineExample.mpl" folder="expr.genjava.stateMachineExample" />
3636
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.stateMachineExample/runtime/org.iets3.core.expr.genjava.stateMachineExample.runtime.msd" folder="expr.genjava.stateMachineExample" />
3737
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.stateMachineExample/sandbox/org.iets3.core.expr.genjava.stateMachineExample.sandbox.msd" folder="expr.genjava.stateMachineExample" />
38+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.stringvalidation/org.iets3.core.expr.genjava.stringvalidation.mpl" folder="expr.genjava" />
3839
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl" folder="expr.genjava" />
3940
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl" folder="expr.genjava" />
4041
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl" folder="expr.genjava" />
@@ -53,6 +54,7 @@
5354
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.simpleTypes.tests/org.iets3.core.expr.simpleTypes.tests.mpl" folder="expr.lang-core" />
5455
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.simpleTypes/org.iets3.core.expr.simpleTypes.mpl" folder="expr.lang-core" />
5556
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.statemachines/org.iets3.core.expr.statemachines.mpl" folder="expr.lang-stateful" />
57+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.stringvalidation/org.iets3.core.expr.stringvalidation.mpl" folder="expr.lang-advanced" />
5658
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.temporal/org.iets3.core.expr.temporal.mpl" folder="expr.lang-advanced" />
5759
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.testExecution/org.iets3.core.expr.testExecution.mpl" folder="expr" />
5860
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl" folder="expr.lang-core" />
@@ -80,6 +82,7 @@
8082
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.runtime/org.iets3.core.expr.base.runtime.msd" folder="expr.lang-core" />
8183
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.shared.runtime/org.iets3.core.expr.base.shared.runtime.msd" folder="expr.lang-core" />
8284
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.collections.interpreter/org.iets3.core.expr.collections.interpreter.msd" folder="expr.lang-core" />
85+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.collections.rt/org.iets3.core.expr.collections.rt.msd" folder="expr.lang-core" />
8386
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.data.interpreter/org.iets3.core.expr.data.interpreter.msd" folder="expr.lang-advanced" />
8487
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.dataflow.interpreter/org.iets3.core.expr.dataflow.interpreter.msd" folder="expr.lang-advanced" />
8588
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.datetime.interpreter/org.iets3.core.expr.datetime.interpreter.msd" folder="expr.lang-advanced" />
@@ -90,7 +93,6 @@
9093
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.genjava.core.genplan/org.iets3.core.expr.genjava.core.genplan.msd" folder="expr.genjava" />
9194
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.genjava.functionalJava/org.iets3.core.expr.genjava.functionalJava.msd" folder="expr.genjava" />
9295
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.genjava.messages.rt/org.iets3.core.expr.genjava.messages.rt.msd" folder="expr.genjava" />
93-
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.genjava.simpleTypes.rt/org.iets3.core.expr.genjava.simpleTypes.rt.msd" folder="expr.genjava" />
9496
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.genjava.stateMachineExample.genplan/org.iets3.core.expr.genjava.stateMachineExample.genplan.msd" folder="expr.genjava.stateMachineExample" />
9597
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.genjava.temporal.rt/org.iets3.core.expr.genjava.temporal.rt.msd" folder="expr.genjava" />
9698
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.genjava.tests.rt/org.iets3.core.expr.genjava.tests.rt.msd" folder="expr.genjava" />
@@ -112,6 +114,8 @@
112114
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd" folder="expr.lang-core" />
113115
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.simpleTypes.runtime/org.iets3.core.expr.simpleTypes.runtime.msd" folder="expr.lang-core" />
114116
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.statemachines.interpreter/org.iets3.core.expr.statemachines.interpreter.msd" folder="expr.lang-stateful" />
117+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.stringvalidation.interpreter/org.iets3.core.expr.stringvalidation.interpreter.msd" folder="expr.lang-advanced" />
118+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.stringvalidation.runtime/org.iets3.core.expr.stringvalidation.runtime.msd" folder="expr.lang-advanced" />
115119
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.temporal.interpreter/org.iets3.core.expr.temporal.interpreter.msd" folder="expr.lang-advanced" />
116120
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.temporal.runtime/org.iets3.core.expr.temporal.runtime.msd" folder="expr.lang-advanced" />
117121
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.tests.interpreter/org.iets3.core.expr.tests.interpreter.msd" folder="expr.lang-core" />
@@ -133,4 +137,4 @@
133137
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os/test.ts.expr.os.msd" folder="expr.tests" />
134138
</projectModules>
135139
</component>
136-
</project>
140+
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</registry>
2121
<node concept="3ZOQsN" id="6pNCASbHXH8">
2222
<property role="TrG5h" value="KernelFTestExecution" />
23-
<node concept="3ZOXxk" id="5FFsEXIfo19" role="3ZOXzE" />
23+
<node concept="3ZOXxk" id="2R7vP7hzmjd" 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<exported-language name="4453335f-7c63-4874-b3b1-ece8c37e6d9b(org.iets3.core.expr.genjava.temporal)" />
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)" />
7+
<exported-language name="f9bb00ab-1f7e-40ab-9ec0-b11e02d84d0f(org.iets3.core.expr.genjava.stringvalidation)" />
78
<extendedDevKits>
89
<extendedDevKit>da9c5738-b245-4e38-b52f-e6ee76cadd7f(org.iets3.core.expr.genjava.core.devkit)</extendedDevKit>
910
</extendedDevKits>
@@ -12,6 +13,7 @@
1213
<exported-solution>a37d732b-a361-4dba-bc6f-f8e645007559(org.iets3.core.expr.genjava.advanced.genplan)</exported-solution>
1314
<exported-solution>646d63c6-d580-4c19-8759-e3a3123f5424(org.iets3.core.expr.genjava.messages.rt)</exported-solution>
1415
<exported-solution>52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</exported-solution>
16+
<exported-solution>f38b69a3-1d33-4f9b-84e0-ac1095df2998(org.iets3.core.expr.stringvalidation.runtime)</exported-solution>
1517
</exported-solutions>
1618
<generation-plan model="r:b6940564-70dd-428c-9fbc-f83a23b7043b(org.iets3.core.expr.genjava.advanced.genplan.genplan)" />
1719
</dev-kit>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<exported-solutions>
99
<exported-solution>3a6ebc02-087e-4791-9854-65244ce22d8d(org.iets3.core.expr.genjava.base.rt)</exported-solution>
1010
<exported-solution>708a03ad-8699-43c9-821a-6cd00b68e9f8(org.iets3.core.expr.genjava.functionalJava)</exported-solution>
11-
<exported-solution>272bf1ac-d70c-4dac-96a3-976884f641b8(org.iets3.core.expr.genjava.simpleTypes.rt)</exported-solution>
1211
<exported-solution>fde59617-0336-493b-a7ec-21148c3507f1(org.iets3.core.expr.genjava.temporal.rt)</exported-solution>
1312
<exported-solution>68da6d9d-3ccf-4255-b4f7-37603cd89090(org.iets3.core.expr.genjava.tests.rt)</exported-solution>
1413
<exported-solution>336cc7f4-18d3-473b-81a1-d8df1c0ad27a(org.iets3.core.expr.genjava.toplevel.rt)</exported-solution>
@@ -17,6 +16,7 @@
1716
<exported-solution>b76a0f63-5959-456b-993a-c796cc0d0c13(org.iets3.core.expr.base.collections.stubs)</exported-solution>
1817
<exported-solution>52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</exported-solution>
1918
<exported-solution>00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime)</exported-solution>
19+
<exported-solution>272bf1ac-d70c-4dac-96a3-976884f641b8(org.iets3.core.expr.collections.rt)</exported-solution>
2020
</exported-solutions>
2121
<generation-plan model="r:44582398-dfcf-40ad-bb09-b88bb3cc5de2(org.iets3.core.expr.genjava.core.genplan.genplan)" />
2222
</dev-kit>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,6 +1332,7 @@
13321332
</node>
13331333
<node concept="13i0hz" id="7QODtLw3SMH" role="13h7CS">
13341334
<property role="TrG5h" value="runSolver" />
1335+
<property role="13i0it" value="true" />
13351336
<node concept="3Tm1VV" id="7QODtLw3SMI" role="1B3o_S" />
13361337
<node concept="3uibUv" id="7QODtLw3VBg" role="3clF45">
13371338
<ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -1375,6 +1376,7 @@
13751376
</node>
13761377
<node concept="13i0hz" id="3NwcubmnBQ5" role="13h7CS">
13771378
<property role="TrG5h" value="runSolverAsync" />
1379+
<property role="13i0it" value="true" />
13781380
<node concept="3Tm1VV" id="3NwcubmnBQ6" role="1B3o_S" />
13791381
<node concept="3clFbS" id="3NwcubmnBQ8" role="3clF47">
13801382
<node concept="3clFbF" id="3NwcubmnCHl" role="3cqZAp">

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,6 @@
383383
<property role="YLQ7P" value="The link was moved to concept &quot;org.iets3.components.core.structure.AbstractComponentInstanceWithRef&quot;" />
384384
</node>
385385
</node>
386-
<node concept="PrWs8" id="siw10FiR6l" role="PzmwI">
387-
<ref role="PrY4T" node="siw10FiR6c" resolve="ISubstructureContent" />
388-
</node>
389386
<node concept="PrWs8" id="6Z4vEhQZ6sI" role="PzmwI">
390387
<ref role="PrY4T" to="vs0r:3m8H$lmFM60" resolve="IDocumentable" />
391388
</node>
@@ -1422,6 +1419,9 @@
14221419
<node concept="PrWs8" id="2QRlyxOgRVg" role="PzmwI">
14231420
<ref role="PrY4T" to="4kwy:cJpacq5T0O" resolve="IValidNamedConcept" />
14241421
</node>
1422+
<node concept="PrWs8" id="2_GRxqhsLR7" role="PzmwI">
1423+
<ref role="PrY4T" node="siw10FiR6c" resolve="ISubstructureContent" />
1424+
</node>
14251425
</node>
14261426
<node concept="1TIwiD" id="77HYM7HnhfK">
14271427
<property role="EcuMT" value="8209493818901074928" />
@@ -1437,9 +1437,6 @@
14371437
<property role="20lbJX" value="fLJekj4/_1" />
14381438
<ref role="20lvS9" node="6LfBX8Yi4o1" resolve="Component" />
14391439
</node>
1440-
<node concept="PrWs8" id="77HYM7HosV8" role="PzmwI">
1441-
<ref role="PrY4T" node="siw10FiR6c" resolve="ISubstructureContent" />
1442-
</node>
14431440
<node concept="PrWs8" id="77HYM7HosVn" role="PzmwI">
14441441
<ref role="PrY4T" to="vs0r:3m8H$lmFM60" resolve="IDocumentable" />
14451442
</node>

0 commit comments

Comments
 (0)