Skip to content

Commit 86e6809

Browse files
arimerarimer
authored
Merge pull request #1180 from IETS3/bugfix/alignWithAPIChanges
Bugfix/align with api changes
2 parents 2012c95 + 29c438d commit 86e6809

File tree

7 files changed

+32
-170
lines changed

7 files changed

+32
-170
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/generator/templates/org.iets3.core.expr.genjava.data.generator.templates@generator.mps‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,9 +1722,7 @@
17221722
<ref role="3uigEE" node="6wzrxL2VEMH" resolve="Dummy.TableEntry" />
17231723
</node>
17241724
<node concept="3Tm1VV" id="6wzrxL32ajv" role="1B3o_S" />
1725-
<node concept="3cmrfG" id="6wzrxL31N6a" role="33vP2m">
1726-
<property role="3cmrfH" value="10" />
1727-
</node>
1725+
<node concept="10Nm6u" id="1NX6wtRSeOF" role="33vP2m" />
17281726
</node>
17291727
<node concept="3clFb_" id="6wzrxL31RzI" role="jymVt">
17301728
<property role="TrG5h" value="is" />

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3387,9 +3387,7 @@
33873387
</node>
33883388
<node concept="37vLTG" id="ZYPG76BgMK" role="3clF46">
33893389
<property role="TrG5h" value="actualType" />
3390-
<node concept="3Tqbb2" id="ZYPG76BgML" role="1tU5fm">
3391-
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
3392-
</node>
3390+
<node concept="3Tqbb2" id="ZYPG76BgML" role="1tU5fm" />
33933391
</node>
33943392
<node concept="17QB3L" id="ZYPG76BgMM" role="3clF45" />
33953393
</node>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4689,9 +4689,7 @@
46894689
</node>
46904690
<node concept="37vLTG" id="ZYPG76NAqj" role="3clF46">
46914691
<property role="TrG5h" value="expectedType" />
4692-
<node concept="3Tqbb2" id="ZYPG76NAqk" role="1tU5fm">
4693-
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
4694-
</node>
4692+
<node concept="3Tqbb2" id="ZYPG76NAqk" role="1tU5fm" />
46954693
</node>
46964694
<node concept="37vLTG" id="ZYPG76NAql" role="3clF46">
46974695
<property role="TrG5h" value="actualType" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/generator/templates/org.iets3.core.expr.typetags.bindingtime.generator.templates@generator.mps‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.mpl‎

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -11,89 +11,6 @@
1111
</facet>
1212
</facets>
1313
<accessoryModels />
14-
<generators>
15-
<generator alias="main" namespace="org.iets3.core.expr.typetags.bindingtime.generator" uuid="e40bdaec-341f-4ec6-ba10-02efdcf680a8">
16-
<models>
17-
<modelRoot contentPath="${module}/generator" type="default">
18-
<sourceRoot location="templates" />
19-
</modelRoot>
20-
</models>
21-
<facets>
22-
<facet type="java" compile="mps" classes="mps" ext="no">
23-
<classes generated="true" path="${module}/generator/classes_gen" />
24-
</facet>
25-
</facets>
26-
<external-templates />
27-
<languageVersions>
28-
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
29-
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
30-
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
31-
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
32-
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
33-
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
34-
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
35-
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
36-
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
37-
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
38-
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
39-
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
40-
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
41-
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
42-
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
43-
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
44-
</languageVersions>
45-
<dependencyVersions>
46-
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
47-
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
48-
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
49-
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
50-
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
51-
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
52-
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
53-
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
54-
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
55-
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
56-
<module reference="47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)" version="0" />
57-
<module reference="735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)" version="0" />
58-
<module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
59-
<module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
60-
<module reference="726886d1-ef90-4249-a08f-1e3ec23a7113(com.mbeddr.mpsutil.traceExplorer)" version="0" />
61-
<module reference="3819ba36-98f4-49ac-b779-34f3a458c09b(com.mbeddr.mpsutil.varscope)" version="0" />
62-
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
63-
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
64-
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
65-
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
66-
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
67-
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
68-
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
69-
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
70-
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
71-
<module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
72-
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
73-
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
74-
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
75-
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
76-
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
77-
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
78-
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
79-
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
80-
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
81-
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
82-
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
83-
<module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
84-
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
85-
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="4" />
86-
<module reference="2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)" version="5" />
87-
<module reference="9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)" version="1" />
88-
<module reference="f3eafff0-30d2-46d6-9150-f0f3b880ce27(org.iets3.core.expr.path)" version="0" />
89-
<module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />
90-
<module reference="5186c6ce-428c-4f09-a9df-73d9e86c27d3(org.iets3.core.expr.typetags)" version="0" />
91-
<module reference="9c3cc6fb-ae5e-46d1-ace2-1e08bb47d03d(org.iets3.core.expr.typetags.bindingtime)" version="0" />
92-
<module reference="e40bdaec-341f-4ec6-ba10-02efdcf680a8(org.iets3.core.expr.typetags.bindingtime.generator)" version="0" />
93-
</dependencyVersions>
94-
<mapping-priorities />
95-
</generator>
96-
</generators>
9714
<dependencies>
9815
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
9916
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>

0 commit comments

Comments
 (0)