Commit 4ac94315 authored by Sebastian Erdweg's avatar Sebastian Erdweg

Implemented a generator from TypeLang to IncA

parent 71fabbe9
......@@ -17,6 +17,12 @@
<dependencies>
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">8c9a2720-9d21-4370-a226-819eb3e76e1e(org.inca.fun)</dependency>
<dependency reexport="false">b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</dependency>
<dependency reexport="false">e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2(org.inca.data)</dependency>
<dependency reexport="false">3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)</dependency>
<dependency reexport="false">d5a58d02-4ac7-4892-afde-65968670c300(org.inca.data#8607574815737030311)</dependency>
<dependency reexport="false">1bc49cec-41e6-417f-a12b-f0e0125494e9(org.inca.core#4530729936991344007)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
......@@ -33,8 +39,14 @@
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:b802a056-92a2-4fbc-902e-f8e5004c331f:org.inca.core" version="0" />
<language slang="l:e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2:org.inca.data" version="2" />
<language slang="l:3a1c1f85-c745-4d04-a210-f97a7e31f9cc:org.inca.extensions" version="0" />
<language slang="l:8c9a2720-9d21-4370-a226-819eb3e76e1e:org.inca.fun" version="0" />
<language slang="l:cd2909da-ecb4-49dc-b176-33e5c619e516:org.inca.gp" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
......@@ -58,9 +70,44 @@
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)" version="0" />
<module reference="1bc49cec-41e6-417f-a12b-f0e0125494e9(org.inca.core#4530729936991344007)" version="0" />
<module reference="bc791f96-4749-4311-a6e4-241e47ca97f9(org.inca.core.util)" version="0" />
<module reference="e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2(org.inca.data)" version="0" />
<module reference="d5a58d02-4ac7-4892-afde-65968670c300(org.inca.data#8607574815737030311)" version="0" />
<module reference="3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)" version="0" />
<module reference="8c9a2720-9d21-4370-a226-819eb3e76e1e(org.inca.fun)" version="0" />
<module reference="cd2909da-ecb4-49dc-b176-33e5c619e516(org.inca.gp)" version="0" />
</dependencyVersions>
<mapping-priorities />
<mapping-priorities>
<mapping-priority-rule kind="strictly_before">
<greater-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<all-local-mappings />
</external-mapping>
</greater-priority-mapping>
<lesser-priority-mapping>
<generator generatorUID="d5a58d02-4ac7-4892-afde-65968670c300(org.inca.data#8607574815737030311)" />
<external-mapping>
<all-local-mappings />
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
<mapping-priority-rule kind="strictly_before">
<greater-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<all-local-mappings />
</external-mapping>
</greater-priority-mapping>
<lesser-priority-mapping>
<generator generatorUID="1bc49cec-41e6-417f-a12b-f0e0125494e9(org.inca.core#4530729936991344007)" />
<external-mapping>
<all-local-mappings />
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
</mapping-priorities>
</generator>
</generators>
<sourcePath />
......@@ -73,6 +120,7 @@
<dependency reexport="false">ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2(org.inca.data)</dependency>
<dependency reexport="false">8c9a2720-9d21-4370-a226-819eb3e76e1e(org.inca.fun)</dependency>
</dependencies>
<languageVersions>
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="0" />
......@@ -130,8 +178,8 @@
<module reference="80e42679-e00d-400f-8714-aee80946d2f9(org.inca.styles)" version="0" />
</dependencyVersions>
<extendedLanguages>
<extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
<extendedLanguage>b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</extendedLanguage>
<extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
</extendedLanguages>
</language>
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -148,11 +148,6 @@
</concept>
<concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
</language>
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
<concept id="1168401810208" name="jetbrains.mps.baseLanguage.logging.structure.PrintStatement" flags="nn" index="abc8K">
<child id="1168401864803" name="textExpression" index="abp_N" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
......@@ -616,11 +611,6 @@
</node>
</node>
</node>
<node concept="abc8K" id="2U2uJPptViF" role="3cqZAp">
<node concept="37vLTw" id="2U2uJPptWYi" role="abp_N">
<ref role="3cqZAo" node="2U2uJPpok31" resolve="vars" />
</node>
</node>
<node concept="3cpWs6" id="2U2uJPpoYGD" role="3cqZAp">
<node concept="2ShNRf" id="2U2uJPpp0dZ" role="3cqZAk">
<node concept="YeOm9" id="2U2uJPpp2Ka" role="2ShVmc">
......
......@@ -1501,5 +1501,21 @@
</node>
</node>
</node>
<node concept="24kQdi" id="2U2uJPpPnX8">
<property role="3GE5qa" value="judgment" />
<ref role="1XX52x" to="b83y:2U2uJPpPnWW" resolve="JudgmentInstanceMatch" />
<node concept="3EZMnI" id="2U2uJPpPnXa" role="2wV5jI">
<node concept="3F1sOY" id="2U2uJPpPnXo" role="3EZMnx">
<ref role="1NtTu8" to="b83y:2U2uJPpPnWX" resolve="term" />
</node>
<node concept="3F0ifn" id="2U2uJPpPnXx" role="3EZMnx">
<property role="3F0ifm" value="match" />
</node>
<node concept="3F1sOY" id="2U2uJPpPnXQ" role="3EZMnx">
<ref role="1NtTu8" to="b83y:2U2uJPpPnWY" resolve="pat" />
</node>
<node concept="l2Vlx" id="2U2uJPpPnXd" role="2iSdaV" />
</node>
</node>
</model>
......@@ -139,7 +139,7 @@
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="conclusion" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12fwJB" resolve="JudgmentInstance" />
<ref role="20lvS9" node="677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="PrWs8" id="2_58u12fwIF" role="PzmwI">
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
......@@ -677,7 +677,7 @@
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="res" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12g7Tn" resolve="IMetaTerm" />
<ref role="20lvS9" node="2_58u12eCXq" resolve="MetaVariable" />
</node>
<node concept="1TJgyj" id="2U2uJPpkja4" role="1TKVEi">
<property role="IQ2ns" value="3351376301260878468" />
......@@ -703,5 +703,29 @@
<ref role="20lvS9" node="2_58u12eCXq" resolve="MetaVariable" />
</node>
</node>
<node concept="1TIwiD" id="2U2uJPpPnWW">
<property role="EcuMT" value="3351376301269548860" />
<property role="3GE5qa" value="judgment" />
<property role="TrG5h" value="JudgmentInstanceMatch" />
<property role="34LRSv" value="match" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="2U2uJPpPnWX" role="1TKVEi">
<property role="IQ2ns" value="3351376301269548861" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="term" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12g7Tn" resolve="IMetaTerm" />
</node>
<node concept="1TJgyj" id="2U2uJPpPnWY" role="1TKVEi">
<property role="IQ2ns" value="3351376301269548862" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="pat" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12g7Tn" resolve="IMetaTerm" />
</node>
<node concept="PrWs8" id="2U2uJPpPnWZ" role="PzmwI">
<ref role="PrY4T" node="2_58u12fwJB" resolve="JudgmentInstance" />
</node>
</node>
</model>
......@@ -9,6 +9,7 @@
<dependencies>
<dependency reexport="false">ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)</dependency>
<dependency reexport="false">f7521a8a-f887-420a-b23b-8fffa9357b8f(STLCN)</dependency>
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
</dependencies>
<languageVersions>
<language slang="l:ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71:TypeLang" version="0" />
......@@ -30,11 +31,28 @@
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="f7521a8a-f887-420a-b23b-8fffa9357b8f(STLCN)" version="0" />
<module reference="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)" version="0" />
<module reference="7e673f3e-1eb9-4560-b6b7-4f8b397f2636(TypeLangTest)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
<module reference="f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)" version="0" />
<module reference="bc791f96-4749-4311-a6e4-241e47ca97f9(org.inca.core.util)" version="0" />
<module reference="8c9a2720-9d21-4370-a226-819eb3e76e1e(org.inca.fun)" version="0" />
<module reference="cd2909da-ecb4-49dc-b176-33e5c619e516(org.inca.gp)" version="0" />
</dependencyVersions>
</solution>
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment