Commit 15af2bd0 authored by André Pacak's avatar André Pacak
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	inca-translation/solutions/TypeLangTest/TypeLangTest.msd
parents a8d41835 5f841a6f
......@@ -6,6 +6,7 @@
<modulePath path="$PROJECT_DIR$/languages/TypeLang/TypeLang.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/languages/forecursive.lang/forecursive.lang.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/languages/pcf.lang/pcf.lang.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/languages/pcf.universal.ext/pcf.universal.ext.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/languages/product.lang/product.lang.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/languages/record.lang/record.lang.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/languages/stlcn.lang/stlcn.lang.mpl" folder="" />
......
......@@ -1284,8 +1284,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="6OMXo1SWoBV" role="3cqZAp" />
<node concept="3clFbH" id="6OMXo1SWro_" role="3cqZAp" />
<node concept="3SKdUt" id="6OMXo1R5NWT" role="3cqZAp">
<node concept="3SKdUq" id="6OMXo1R5NWV" role="3SKWNk">
<property role="3SKdUp" value="generate adt constructors" />
......@@ -1306,6 +1304,7 @@
<node concept="2GrUjf" id="6OMXo1TDMql" role="37wK5m">
<ref role="2Gs0qQ" node="6OMXo1Qi9G2" resolve="sort" />
</node>
<node concept="1Q6Npb" id="7kqDxo2CwT8" role="37wK5m" />
</node>
</node>
</node>
......
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:f33cff98-c101-4c3a-9055-92f96ed67dbb(main@generator)">
<persistence version="9" />
<languages>
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
</languages>
<imports>
<import index="bpp8" ref="r:f2d828c1-c3d0-412d-8424-6d58773c0f68(pcf.universal.ext.structure)" />
</imports>
<registry>
<language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
<concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
</registry>
<node concept="bUwia" id="7kqDxo2_lPV">
<property role="TrG5h" value="main" />
</node>
</model>
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:db7c54c2-c773-4b96-a645-7c204ebf25c0(pcf.universal.ext.behavior)">
<persistence version="9" />
<languages>
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports />
<registry />
</model>
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:8488ab7c-c916-482c-8780-1cbe51e182b7(pcf.universal.ext.constraints)">
<persistence version="9" />
<languages>
<use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
</languages>
<imports />
<registry />
</model>
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:4d025848-0e17-4021-9eb4-8ec5c164d3a9(pcf.universal.ext.editor)">
<persistence version="9" />
<languages>
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports />
<registry />
</model>
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:f2d828c1-c3d0-412d-8424-6d58773c0f68(pcf.universal.ext.structure)">
<persistence version="9" />
<languages>
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
</languages>
<imports>
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
<import index="jzuy" ref="r:6e7dd948-f19c-43a8-9d13-11db5e2eb071(pcf.lang.structure)" implicit="true" />
</imports>
<registry>
<language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
<concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
<property id="6714410169261853888" name="conceptId" index="EcuMT" />
<child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
</concept>
<concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
<reference id="1169127628841" name="intfc" index="PrY4T" />
</concept>
<concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
<reference id="1071489389519" name="extends" index="1TJDcQ" />
<child id="1169129564478" name="implements" index="PzmwI" />
</concept>
<concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
<property id="1071599776563" name="role" index="20kJfa" />
<property id="1071599893252" name="sourceCardinality" index="20lbJX" />
<property id="1071599937831" name="metaClass" index="20lmBu" />
<property id="241647608299431140" name="linkId" index="IQ2ns" />
<reference id="1071599976176" name="target" index="20lvS9" />
</concept>
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
</registry>
<node concept="1TIwiD" id="7kqDxo2_lPW">
<property role="EcuMT" value="8438239465294880124" />
<property role="TrG5h" value="Universal" />
<property role="3GE5qa" value="type" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="7kqDxo2_lQl" role="PzmwI">
<ref role="PrY4T" to="jzuy:1Da9ityUTef" resolve="Type" />
</node>
<node concept="PrWs8" id="7kqDxo2_lQd" role="PzmwI">
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="1TJgyj" id="7kqDxo2_lQr" role="1TKVEi">
<property role="IQ2ns" value="8438239465294880155" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="base" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" to="jzuy:1Da9ityUTef" resolve="Type" />
</node>
</node>
<node concept="1TIwiD" id="7kqDxo2_lPX">
<property role="EcuMT" value="8438239465294880125" />
<property role="TrG5h" value="TVar" />
<property role="3GE5qa" value="type" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="7kqDxo2_lPY" role="PzmwI">
<ref role="PrY4T" to="jzuy:1Da9ityUTef" resolve="Type" />
</node>
<node concept="PrWs8" id="7kqDxo2_lQ7" role="PzmwI">
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
</node>
<node concept="1TIwiD" id="7kqDxo2_lQu">
<property role="EcuMT" value="8438239465294880158" />
<property role="TrG5h" value="LamType" />
<property role="3GE5qa" value="term" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="7kqDxo2_lQv" role="PzmwI">
<ref role="PrY4T" to="jzuy:1Da9ityUTbh" resolve="Term" />
</node>
<node concept="PrWs8" id="7kqDxo2_lQB" role="PzmwI">
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="1TJgyj" id="7kqDxo2_lQH" role="1TKVEi">
<property role="IQ2ns" value="8438239465294880173" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="body" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" to="jzuy:1Da9ityUTbh" resolve="Term" />
</node>
</node>
<node concept="1TIwiD" id="7kqDxo2_lQK">
<property role="EcuMT" value="8438239465294880176" />
<property role="TrG5h" value="AppType" />
<property role="3GE5qa" value="term" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="7kqDxo2_lQL" role="PzmwI">
<ref role="PrY4T" to="jzuy:1Da9ityUTbh" resolve="Term" />
</node>
<node concept="1TJgyj" id="7kqDxo2_lQO" role="1TKVEi">
<property role="IQ2ns" value="8438239465294880180" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="term" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" to="jzuy:1Da9ityUTbh" resolve="Term" />
</node>
<node concept="1TJgyj" id="7kqDxo2_lQR" role="1TKVEi">
<property role="IQ2ns" value="8438239465294880183" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="type" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" to="jzuy:1Da9ityUTef" resolve="Type" />
</node>
</node>
</model>
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:5a01acf9-d103-4b43-b0ba-67dc2e043e85(pcf.universal.ext.typesystem)">
<persistence version="9" />
<languages>
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
<devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
</languages>
<imports />
<registry />
</model>
<?xml version="1.0" encoding="UTF-8"?>
<language namespace="pcf.universal.ext" uuid="f11c2e83-66b2-4c36-ae0f-9c8bd1f4a9c2" languageVersion="0" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />
</modelRoot>
</models>
<accessoryModels />
<generators>
<generator alias="main" namespace="pcf.universal.ext#01" uuid="0e34107e-5b31-4301-b977-a55cee98891d">
<models>
<modelRoot contentPath="${module}/generator/template" type="default">
<sourceRoot location="." />
</modelRoot>
</models>
<external-templates />
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<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="13" />
<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" />
</languageVersions>
<dependencyVersions>
<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="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="5a551d67-ba3f-49dc-b984-2ea4f8c9ad07(pcf.lang)" version="0" />
<module reference="f11c2e83-66b2-4c36-ae0f-9c8bd1f4a9c2(pcf.universal.ext)" version="0" />
<module reference="0e34107e-5b31-4301-b977-a55cee98891d(pcf.universal.ext#01)" version="0" />
</dependencyVersions>
<mapping-priorities />
</generator>
</generators>
<sourcePath />
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<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:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
</languageVersions>
<dependencyVersions>
<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="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
<module reference="5a551d67-ba3f-49dc-b984-2ea4f8c9ad07(pcf.lang)" version="0" />
<module reference="f11c2e83-66b2-4c36-ae0f-9c8bd1f4a9c2(pcf.universal.ext)" version="0" />
</dependencyVersions>
<extendedLanguages>
<extendedLanguage>5a551d67-ba3f-49dc-b984-2ea4f8c9ad07(pcf.lang)</extendedLanguage>
</extendedLanguages>
</language>
......@@ -6,7 +6,7 @@
<use id="cd2909da-ecb4-49dc-b176-33e5c619e516" name="org.inca.gp" version="0" />
<use id="e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2" name="org.inca.data" version="2" />
<use id="8c9a2720-9d21-4370-a226-819eb3e76e1e" name="org.inca.fun" version="0" />
<use id="08d23328-33fa-47ce-89df-daaa7554f251" name="SumTypes" version="0" />
<use id="08d23328-33fa-47ce-89df-daaa7554f251" name="sum.lang" version="0" />
<use id="3a1c1f85-c745-4d04-a210-f97a7e31f9cc" name="org.inca.extensions" version="0" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
</languages>
......@@ -352,7 +352,7 @@
<child id="4799072788058988391" name="options" index="1HTAgx" />
</concept>
</language>
<language id="08d23328-33fa-47ce-89df-daaa7554f251" name="SumTypes">
<language id="08d23328-33fa-47ce-89df-daaa7554f251" name="sum.lang">
<concept id="7997266186981964043" name="SumTypes.structure.ModuleElemDef" flags="ng" index="2BHCoM">
<child id="7997266186982065639" name="term" index="2BHfFu" />
</concept>
......
......@@ -2,8 +2,8 @@
<model ref="r:f4ba1d3a-ee62-43ad-8f94-eb28f0618499(TypeLangTest.test_pcf)">
<persistence version="9" />
<languages>
<use id="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71" name="TypeLang" version="0" />
<use id="5a551d67-ba3f-49dc-b984-2ea4f8c9ad07" name="pcf.lang" version="0" />
<use id="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71" name="TypeLang" version="-1" />
<use id="5a551d67-ba3f-49dc-b984-2ea4f8c9ad07" name="pcf.lang" version="-1" />
</languages>
<imports>
<import index="jzuy" ref="r:6e7dd948-f19c-43a8-9d13-11db5e2eb071(pcf.lang.structure)" />
......
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