Skip to content

Commit aff2bd3

Browse files
sergej-koscejevsergej-koscejev
authored
Merge pull request #464 from IETS3/refactor/unify-ah
Unify AH2 and AH
2 parents 05d0426 + da5b876 commit aff2bd3

File tree

13 files changed

+407
-3173
lines changed

13 files changed

+407
-3173
lines changed

‎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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<exported-solution>72f3ce09-f244-46a5-88ca-7b98cd2dfb22(org.iets3.core.expr.genjava.core.genplan)</exported-solution>
1616
<exported-solution>dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</exported-solution>
1717
<exported-solution>b76a0f63-5959-456b-993a-c796cc0d0c13(org.iets3.core.expr.base.collections.stubs)</exported-solution>
18+
<exported-solution>52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</exported-solution>
1819
</exported-solutions>
1920
<generation-plan model="r:44582398-dfcf-40ad-bb09-b88bb3cc5de2(org.iets3.core.expr.genjava.core.genplan.genplan)" />
2021
</dev-kit>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/[email protected]‎

Lines changed: 51 additions & 50 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<module reference="272bf1ac-d70c-4dac-96a3-976884f641b8(org.iets3.core.expr.genjava.simpleTypes.rt)" version="0" />
102102
<module reference="9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)" version="0" />
103103
<module reference="6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)" version="1" />
104+
<module reference="52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)" version="0" />
104105
</dependencyVersions>
105106
<mapping-priorities />
106107
</generator>
@@ -174,6 +175,7 @@
174175
</dependencyVersions>
175176
<runtime>
176177
<dependency reexport="false">272bf1ac-d70c-4dac-96a3-976884f641b8(org.iets3.core.expr.genjava.simpleTypes.rt)</dependency>
178+
<dependency reexport="false">52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</dependency>
177179
</runtime>
178180
<extendedLanguages />
179181
</language>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/generator/template/[email protected]‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<import index="700h" ref="r:61b1de80-490d-4fee-8e95-b956503290e9(org.iets3.core.expr.collections.structure)" />
3333
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
3434
<import index="xlxw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.math(JDK/)" />
35+
<import index="dj6k" ref="r:59d52af6-663b-49dc-8980-30d79b8dffa1(org.iets3.core.expr.simpleTypes.runtime)" />
3536
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
3637
<import index="zzzn" ref="r:af0af2e7-f7e1-4536-83b5-6bf010d4afd2(org.iets3.core.expr.lambda.structure)" implicit="true" />
3738
<import index="lmd" ref="r:a6074908-e483-4c8e-80b5-5dbf8b24df4c(org.iets3.core.expr.path.structure)" implicit="true" />
@@ -2968,8 +2969,8 @@
29682969
<ref role="30HIoZ" to="5qo5:46cplYy1TAG" resolve="LimitExpression" />
29692970
<node concept="gft3U" id="1s3ECkt3vpu" role="1lVwrX">
29702971
<node concept="2YIFZM" id="1s3ECkt3D3D" role="gfFT$">
2971-
<ref role="37wK5l" to="wfax:1s3ECkt3zHX" resolve="limit" />
2972-
<ref role="1Pybhc" to="wfax:6IxV2nShzcy" resolve="AH" />
2972+
<ref role="1Pybhc" to="dj6k:6IxV2nShzcy" resolve="AH" />
2973+
<ref role="37wK5l" to="dj6k:1s3ECkt3zHX" resolve="limit" />
29732974
<node concept="3cmrfG" id="1s3ECkt3D40" role="37wK5m">
29742975
<property role="3cmrfH" value="1" />
29752976
<node concept="29HgVG" id="1s3ECkt3DaC" role="lGtFl">
@@ -10432,22 +10433,22 @@
1043210433
</node>
1043310434
</node>
1043410435
<node concept="3fqX7Q" id="Wka9OVriuM" role="3clFbw">
10435-
<node concept="2YIFZM" id="Wka9OVriuO" role="3fr31v">
10436-
<ref role="37wK5l" to="wfax:5hmZ_ho6_uZ" resolve="isEqual" />
10437-
<ref role="1Pybhc" to="wfax:6IxV2nShzcy" resolve="AH" />
10438-
<node concept="2OqwBi" id="Wka9OVriuP" role="37wK5m">
10439-
<node concept="Xjq3P" id="Wka9OVriuQ" role="2Oq$k0" />
10440-
<node concept="2OwXpG" id="Wka9OVriuR" role="2OqNvi">
10436+
<node concept="2YIFZM" id="2xddOZKNR8G" role="3fr31v">
10437+
<ref role="37wK5l" to="dj6k:5hmZ_ho6_uZ" resolve="isEqual" />
10438+
<ref role="1Pybhc" to="dj6k:6IxV2nShzcy" resolve="AH" />
10439+
<node concept="2OqwBi" id="2xddOZKNR8H" role="37wK5m">
10440+
<node concept="Xjq3P" id="2xddOZKNR8I" role="2Oq$k0" />
10441+
<node concept="2OwXpG" id="2xddOZKNR8J" role="2OqNvi">
1044110442
<ref role="2Oxat5" node="6XE8Bc$gDWa" resolve="i" />
10442-
<node concept="1ZhdrF" id="Wka9OVriuS" role="lGtFl">
10443+
<node concept="1ZhdrF" id="2xddOZKNR8K" role="lGtFl">
1044310444
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
1044410445
<property role="2qtEX8" value="fieldDeclaration" />
10445-
<node concept="3$xsQk" id="Wka9OVriuT" role="3$ytzL">
10446-
<node concept="3clFbS" id="Wka9OVriuU" role="2VODD2">
10447-
<node concept="3clFbF" id="Wka9OVriuV" role="3cqZAp">
10448-
<node concept="2OqwBi" id="Wka9OVriuW" role="3clFbG">
10449-
<node concept="30H73N" id="Wka9OVriuX" role="2Oq$k0" />
10450-
<node concept="3TrcHB" id="Wka9OVriuY" role="2OqNvi">
10446+
<node concept="3$xsQk" id="2xddOZKNR8L" role="3$ytzL">
10447+
<node concept="3clFbS" id="2xddOZKNR8M" role="2VODD2">
10448+
<node concept="3clFbF" id="2xddOZKNR8N" role="3cqZAp">
10449+
<node concept="2OqwBi" id="2xddOZKNR8O" role="3clFbG">
10450+
<node concept="30H73N" id="2xddOZKNR8P" role="2Oq$k0" />
10451+
<node concept="3TrcHB" id="2xddOZKNR8Q" role="2OqNvi">
1045110452
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
1045210453
</node>
1045310454
</node>
@@ -10457,26 +10458,26 @@
1045710458
</node>
1045810459
</node>
1045910460
</node>
10460-
<node concept="2OqwBi" id="Wka9OVriuZ" role="37wK5m">
10461-
<node concept="37vLTw" id="Wka9OVriv0" role="2Oq$k0">
10461+
<node concept="2OqwBi" id="2xddOZKNR8R" role="37wK5m">
10462+
<node concept="37vLTw" id="2xddOZKNR8S" role="2Oq$k0">
1046210463
<ref role="3cqZAo" node="6XE8Bc$gE2E" resolve="rd" />
1046310464
</node>
10464-
<node concept="liA8E" id="Wka9OVriv1" role="2OqNvi">
10465+
<node concept="liA8E" id="2xddOZKNR8T" role="2OqNvi">
1046510466
<ref role="37wK5l" node="6XE8Bc$gDXG" resolve="getI" />
10466-
<node concept="1ZhdrF" id="Wka9OVriv2" role="lGtFl">
10467+
<node concept="1ZhdrF" id="2xddOZKNR8U" role="lGtFl">
1046710468
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
1046810469
<property role="2qtEX8" value="baseMethodDeclaration" />
10469-
<node concept="3$xsQk" id="Wka9OVriv3" role="3$ytzL">
10470-
<node concept="3clFbS" id="Wka9OVriv4" role="2VODD2">
10471-
<node concept="3clFbF" id="Wka9OVriv5" role="3cqZAp">
10472-
<node concept="3cpWs3" id="Wka9OVriv6" role="3clFbG">
10473-
<node concept="2OqwBi" id="Wka9OVriv7" role="3uHU7w">
10474-
<node concept="30H73N" id="Wka9OVriv8" role="2Oq$k0" />
10475-
<node concept="3TrcHB" id="Wka9OVriv9" role="2OqNvi">
10470+
<node concept="3$xsQk" id="2xddOZKNR8V" role="3$ytzL">
10471+
<node concept="3clFbS" id="2xddOZKNR8W" role="2VODD2">
10472+
<node concept="3clFbF" id="2xddOZKNR8X" role="3cqZAp">
10473+
<node concept="3cpWs3" id="2xddOZKNR8Y" role="3clFbG">
10474+
<node concept="2OqwBi" id="2xddOZKNR8Z" role="3uHU7w">
10475+
<node concept="30H73N" id="2xddOZKNR90" role="2Oq$k0" />
10476+
<node concept="3TrcHB" id="2xddOZKNR91" role="2OqNvi">
1047610477
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
1047710478
</node>
1047810479
</node>
10479-
<node concept="Xl_RD" id="Wka9OVriva" role="3uHU7B">
10480+
<node concept="Xl_RD" id="2xddOZKNR92" role="3uHU7B">
1048010481
<property role="Xl_RC" value="get" />
1048110482
</node>
1048210483
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
<module reference="fbba5118-5fc6-49ff-9c3b-0b4469830440(org.iets3.core.expr.mutable)" version="1" />
114114
<module reference="f3eafff0-30d2-46d6-9150-f0f3b880ce27(org.iets3.core.expr.path)" version="0" />
115115
<module reference="6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)" version="1" />
116+
<module reference="52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)" version="0" />
116117
<module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />
117118
</dependencyVersions>
118119
<mapping-priorities />
@@ -181,6 +182,9 @@
181182
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
182183
<module reference="ddeeec5e-aa31-4c44-bc40-319cd452626e(org.iets3.core.expr.genjava.toplevel)" version="0" />
183184
</dependencyVersions>
185+
<runtime>
186+
<dependency reexport="false">52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</dependency>
187+
</runtime>
184188
<extendedLanguages />
185189
</language>
186190

0 commit comments

Comments
 (0)