Skip to content

Commit 3f0cffe

Browse files
committed
Add example with enumeration and changelog
1 parent f3b5c9e commit 3f0cffe

14 files changed

+428
-14
lines changed

code/.mps/modules.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.children/de.itemis.model.simple.demo.children.mpl" folder="modelmerger2.test.language" />
8181
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl" folder="modelmerger2.test.language" />
8282
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl" folder="modelmerger2.test.language" />
83+
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.enums/de.itemis.model.simple.demo.enums.mpl" folder="modelmerger2.test.language" />
8384
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl" folder="modelmerger2.test.language" />
8485
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl" folder="modelmerger2.test.language" />
8586
<modulePath path="$PROJECT_DIR$/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl" folder="langvis" />
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<language namespace="de.itemis.model.simple.demo.enums" uuid="bf491fd2-a197-456a-8354-b3b225d4e871" languageVersion="0" moduleVersion="0">
3+
<models>
4+
<modelRoot type="default" contentPath="${module}">
5+
<sourceRoot location="models" />
6+
</modelRoot>
7+
</models>
8+
<facets>
9+
<facet compile="mps" classes="mps" ext="yes" type="java">
10+
<classes generated="true" path="${module}/classes_gen" />
11+
</facet>
12+
</facets>
13+
<accessoryModels />
14+
<generators>
15+
<generator alias="main" namespace="de.itemis.model.simple.demo.enums.generator" uuid="7306450b-0779-41f2-97a4-8a2ed3686b8d">
16+
<models>
17+
<modelRoot type="default" contentPath="${module}/generator">
18+
<sourceRoot location="templates" />
19+
</modelRoot>
20+
</models>
21+
<facets>
22+
<facet compile="mps" classes="mps" ext="no" type="java">
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="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
50+
<module reference="bf491fd2-a197-456a-8354-b3b225d4e871(de.itemis.model.simple.demo.enums)" version="0" />
51+
<module reference="7306450b-0779-41f2-97a4-8a2ed3686b8d(de.itemis.model.simple.demo.enums.generator)" version="0" />
52+
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
53+
</dependencyVersions>
54+
<mapping-priorities />
55+
</generator>
56+
</generators>
57+
<dependencies>
58+
<dependency reexport="false">e50b0500-6fd7-4c7f-a730-9d841358ca2b(de.itemis.model.simple.demo.property)</dependency>
59+
</dependencies>
60+
<languageVersions>
61+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
62+
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
63+
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
64+
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
65+
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
66+
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
67+
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
68+
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
69+
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
70+
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
71+
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
72+
<language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
73+
<language slang="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" version="0" />
74+
<language slang="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
75+
<language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
76+
<language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
77+
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
78+
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
79+
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
80+
<language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
81+
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
82+
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
83+
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
84+
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
85+
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
86+
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
87+
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
88+
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
89+
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
90+
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
91+
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
92+
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
93+
</languageVersions>
94+
<dependencyVersions>
95+
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
96+
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
97+
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
98+
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
99+
<module reference="bf491fd2-a197-456a-8354-b3b225d4e871(de.itemis.model.simple.demo.enums)" version="0" />
100+
<module reference="e50b0500-6fd7-4c7f-a730-9d841358ca2b(de.itemis.model.simple.demo.property)" version="0" />
101+
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
102+
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
103+
</dependencyVersions>
104+
<extendedLanguages />
105+
</language>
106+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:9640dad7-13c6-4c8c-8d08-7f88a65d650b(de.itemis.model.simple.demo.enums.generator.templates@generator)">
3+
<persistence version="9" />
4+
<languages>
5+
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
6+
</languages>
7+
<imports>
8+
<import index="7y8w" ref="r:5e14b5a3-3989-4ab3-a15a-50ea008667da(de.itemis.model.simple.demo.enums.structure)" />
9+
</imports>
10+
<registry>
11+
<language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
12+
<concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
13+
</language>
14+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
15+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
16+
<property id="1169194664001" name="name" index="TrG5h" />
17+
</concept>
18+
</language>
19+
</registry>
20+
<node concept="bUwia" id="38FdiWsmfmN">
21+
<property role="TrG5h" value="main" />
22+
</node>
23+
</model>
24+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:78b66a3f-0bcf-46f6-a8f9-f79d6fdf70ed(de.itemis.model.simple.demo.enums.behavior)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
6+
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
7+
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
8+
</languages>
9+
<imports />
10+
<registry />
11+
</model>
12+
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:22883d81-de71-42d8-abe7-b2dd1660b600(de.itemis.model.simple.demo.enums.constraints)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
6+
<use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
7+
<use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
8+
<use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
9+
<use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
10+
<use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
11+
<use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
12+
<use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
13+
<use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
14+
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
15+
</languages>
16+
<imports />
17+
<registry />
18+
</model>
19+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:69589d50-d03c-4a42-b47d-b8b9e68884ba(de.itemis.model.simple.demo.enums.editor)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
6+
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
7+
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
8+
</languages>
9+
<imports />
10+
<registry />
11+
</model>
12+
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:5e14b5a3-3989-4ab3-a15a-50ea008667da(de.itemis.model.simple.demo.enums.structure)">
3+
<persistence version="9" />
4+
<languages>
5+
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
6+
</languages>
7+
<imports>
8+
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
9+
<import index="yeyq" ref="r:98a265f1-4186-4e32-a289-328d37e5000c(de.itemis.model.simple.demo.property.structure)" implicit="true" />
10+
</imports>
11+
<registry>
12+
<language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
13+
<concept id="3348158742936976480" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ng" index="25R33">
14+
<property id="1421157252384165432" name="memberId" index="3tVfz5" />
15+
</concept>
16+
<concept id="3348158742936976479" name="jetbrains.mps.lang.structure.structure.EnumerationDeclaration" flags="ng" index="25R3W">
17+
<reference id="1075010451642646892" name="defaultMember" index="1H5jkz" />
18+
<child id="3348158742936976577" name="members" index="25R1y" />
19+
</concept>
20+
<concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
21+
<property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
22+
</concept>
23+
<concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
24+
<property id="6714410169261853888" name="conceptId" index="EcuMT" />
25+
<child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
26+
<child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
27+
</concept>
28+
<concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
29+
<property id="1096454100552" name="rootable" index="19KtqR" />
30+
<reference id="1071489389519" name="extends" index="1TJDcQ" />
31+
</concept>
32+
<concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
33+
<property id="241647608299431129" name="propertyId" index="IQ2nx" />
34+
<reference id="1082985295845" name="dataType" index="AX2Wp" />
35+
</concept>
36+
<concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
37+
<property id="1071599776563" name="role" index="20kJfa" />
38+
<property id="1071599937831" name="metaClass" index="20lmBu" />
39+
<property id="241647608299431140" name="linkId" index="IQ2ns" />
40+
<reference id="1071599976176" name="target" index="20lvS9" />
41+
</concept>
42+
</language>
43+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
44+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
45+
<property id="1169194664001" name="name" index="TrG5h" />
46+
</concept>
47+
</language>
48+
</registry>
49+
<node concept="25R3W" id="38FdiWsmfOB">
50+
<property role="3F6X1D" value="3615041602350284071" />
51+
<property role="TrG5h" value="SomeEnumeration" />
52+
<ref role="1H5jkz" node="38FdiWsmfOC" resolve="default" />
53+
<node concept="25R33" id="38FdiWsmfOC" role="25R1y">
54+
<property role="3tVfz5" value="3615041602350284072" />
55+
<property role="TrG5h" value="default" />
56+
</node>
57+
<node concept="25R33" id="38FdiWsmggi" role="25R1y">
58+
<property role="3tVfz5" value="3615041602350285842" />
59+
<property role="TrG5h" value="firstMember" />
60+
</node>
61+
<node concept="25R33" id="38FdiWsmgq3" role="25R1y">
62+
<property role="3tVfz5" value="3615041602350286467" />
63+
<property role="TrG5h" value="secondMember" />
64+
</node>
65+
</node>
66+
<node concept="1TIwiD" id="38FdiWsmguW">
67+
<property role="EcuMT" value="3615041602350286780" />
68+
<property role="TrG5h" value="ConceptWithEnum" />
69+
<property role="19KtqR" value="true" />
70+
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
71+
<node concept="1TJgyi" id="38FdiWsmgEl" role="1TKVEl">
72+
<property role="IQ2nx" value="3615041602350287509" />
73+
<property role="TrG5h" value="data" />
74+
<ref role="AX2Wp" node="38FdiWsmfOB" resolve="SomeEnumeration" />
75+
</node>
76+
<node concept="1TJgyj" id="38FdiWsmi$e" role="1TKVEi">
77+
<property role="IQ2ns" value="3615041602350295310" />
78+
<property role="20lmBu" value="fLJjDmT/aggregation" />
79+
<property role="20kJfa" value="idProperty" />
80+
<ref role="20lvS9" to="yeyq:32ggi2DCpGw" resolve="PropertyDummy" />
81+
</node>
82+
</node>
83+
</model>
84+
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:cad49041-3650-4fc3-88ef-4f58681dbbbb(de.itemis.model.simple.demo.enums.typesystem)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
6+
<devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
7+
</languages>
8+
<imports />
9+
<registry />
10+
</model>
11+

0 commit comments

Comments
 (0)