Commit c7a8a226 authored by Sebastian Erdweg's avatar Sebastian Erdweg

hand-coding more transformatin steps for STLCN

parent a3db3bd4
...@@ -61,10 +61,6 @@ ...@@ -61,10 +61,6 @@
<child id="1716599163375643746" name="inner" index="drBAU" /> <child id="1716599163375643746" name="inner" index="drBAU" />
<child id="1716599163375643751" name="right" index="drBAZ" /> <child id="1716599163375643751" name="right" index="drBAZ" />
</concept> </concept>
<concept id="3921456275305506524" name="com.mbeddr.mpsutil.grammarcells.structure.ITokenizer" flags="ng" index="2lD6_C" />
<concept id="3921456275302774825" name="com.mbeddr.mpsutil.grammarcells.structure.SplittableCell" flags="sg" stub="3921456275302774831" index="2lNzut">
<child id="3921456275305506525" name="tokenizer" index="2lD6_D" />
</concept>
<concept id="8207263695490893775" name="com.mbeddr.mpsutil.grammarcells.structure.CellBasedRule" flags="ng" index="2ElW$n" /> <concept id="8207263695490893775" name="com.mbeddr.mpsutil.grammarcells.structure.CellBasedRule" flags="ng" index="2ElW$n" />
<concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98"> <concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
<child id="7363578995839435358" name="wrapped" index="1kIj9b" /> <child id="7363578995839435358" name="wrapped" index="1kIj9b" />
...@@ -305,9 +301,8 @@ ...@@ -305,9 +301,8 @@
<node concept="1WcQYu" id="6JCho9VC0uc" role="2wV5jI"> <node concept="1WcQYu" id="6JCho9VC0uc" role="2wV5jI">
<node concept="2ElW$n" id="6JCho9VC0ug" role="2El2Yn" /> <node concept="2ElW$n" id="6JCho9VC0ug" role="2El2Yn" />
<node concept="1kIj98" id="6JCho9VC0tT" role="1LiK7o"> <node concept="1kIj98" id="6JCho9VC0tT" role="1LiK7o">
<node concept="2lNzut" id="6JCho9VC0u3" role="1kIj9b"> <node concept="3F0A7n" id="2U2uJPpgJ_Y" role="1kIj9b">
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" /> <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
<node concept="2lD6_C" id="6JCho9VC0u5" role="2lD6_D" />
</node> </node>
</node> </node>
</node> </node>
......
...@@ -40,10 +40,25 @@ ...@@ -40,10 +40,25 @@
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" /> <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" 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="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="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)" version="0" /> <module reference="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)" version="0" />
<module reference="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" version="0" /> <module reference="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" 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="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" />
</dependencyVersions> </dependencyVersions>
<mapping-priorities /> <mapping-priorities />
</generator> </generator>
...@@ -52,13 +67,13 @@ ...@@ -52,13 +67,13 @@
<dependencies> <dependencies>
<dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency> <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency> <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
<dependency reexport="false">b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</dependency>
<dependency reexport="false">80e42679-e00d-400f-8714-aee80946d2f9(org.inca.styles)</dependency> <dependency reexport="false">80e42679-e00d-400f-8714-aee80946d2f9(org.inca.styles)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency> <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency> <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
<dependency reexport="false">3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)</dependency> <dependency reexport="false">3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)</dependency>
<dependency reexport="false">ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)</dependency> <dependency reexport="false">ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency> <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2(org.inca.data)</dependency>
</dependencies> </dependencies>
<languageVersions> <languageVersions>
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="0" /> <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="0" />
...@@ -109,11 +124,14 @@ ...@@ -109,11 +124,14 @@
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" 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="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="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="3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)" 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="8c9a2720-9d21-4370-a226-819eb3e76e1e(org.inca.fun)" version="0" />
<module reference="cd2909da-ecb4-49dc-b176-33e5c619e516(org.inca.gp)" version="0" /> <module reference="cd2909da-ecb4-49dc-b176-33e5c619e516(org.inca.gp)" version="0" />
<module reference="80e42679-e00d-400f-8714-aee80946d2f9(org.inca.styles)" version="0" /> <module reference="80e42679-e00d-400f-8714-aee80946d2f9(org.inca.styles)" version="0" />
</dependencyVersions> </dependencyVersions>
<extendedLanguages /> <extendedLanguages>
<extendedLanguage>b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</extendedLanguage>
</extendedLanguages>
</language> </language>
...@@ -528,7 +528,7 @@ ...@@ -528,7 +528,7 @@
<node concept="3cpWsn" id="2groWwYmPQU" role="3cpWs9"> <node concept="3cpWsn" id="2groWwYmPQU" role="3cpWs9">
<property role="TrG5h" value="sort" /> <property role="TrG5h" value="sort" />
<node concept="3Tqbb2" id="2groWwYmPQS" role="1tU5fm"> <node concept="3Tqbb2" id="2groWwYmPQS" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="Sort" /> <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="SortConcept" />
</node> </node>
<node concept="2OqwBi" id="2groWwYmPQV" role="33vP2m"> <node concept="2OqwBi" id="2groWwYmPQV" role="33vP2m">
<node concept="2OqwBi" id="2groWwYmPQW" role="2Oq$k0"> <node concept="2OqwBi" id="2groWwYmPQW" role="2Oq$k0">
......
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
<node concept="3cpWsn" id="4XA4NEmHUZx" role="3cpWs9"> <node concept="3cpWsn" id="4XA4NEmHUZx" role="3cpWs9">
<property role="TrG5h" value="typeSort" /> <property role="TrG5h" value="typeSort" />
<node concept="3Tqbb2" id="4XA4NEmHUZi" role="1tU5fm"> <node concept="3Tqbb2" id="4XA4NEmHUZi" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="Sort" /> <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="SortConcept" />
</node> </node>
<node concept="2OqwBi" id="4XA4NEmHUZy" role="33vP2m"> <node concept="2OqwBi" id="4XA4NEmHUZy" role="33vP2m">
<node concept="2OqwBi" id="4XA4NEmHUZz" role="2Oq$k0"> <node concept="2OqwBi" id="4XA4NEmHUZz" role="2Oq$k0">
...@@ -538,7 +538,7 @@ ...@@ -538,7 +538,7 @@
<node concept="3cpWsn" id="677Mj2_H$Zj" role="3cpWs9"> <node concept="3cpWsn" id="677Mj2_H$Zj" role="3cpWs9">
<property role="TrG5h" value="xRequiredOutputSort" /> <property role="TrG5h" value="xRequiredOutputSort" />
<node concept="3Tqbb2" id="677Mj2_H$YU" role="1tU5fm"> <node concept="3Tqbb2" id="677Mj2_H$YU" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="Sort" /> <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="SortConcept" />
</node> </node>
<node concept="2OqwBi" id="677Mj2_H$Zk" role="33vP2m"> <node concept="2OqwBi" id="677Mj2_H$Zk" role="33vP2m">
<node concept="37vLTw" id="677Mj2_H$Zl" role="2Oq$k0"> <node concept="37vLTw" id="677Mj2_H$Zl" role="2Oq$k0">
......
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
</node> </node>
<node concept="24kQdi" id="2_58u12d$ne"> <node concept="24kQdi" id="2_58u12d$ne">
<property role="3GE5qa" value="judgment" /> <property role="3GE5qa" value="judgment" />
<ref role="1XX52x" to="b83y:2_58u12cYwo" resolve="Sort" /> <ref role="1XX52x" to="b83y:2_58u12cYwo" resolve="SortConcept" />
<node concept="3EZMnI" id="2_58u12d$ng" role="2wV5jI"> <node concept="3EZMnI" id="2_58u12d$ng" role="2wV5jI">
<node concept="l2Vlx" id="2_58u12d$nj" role="2iSdaV" /> <node concept="l2Vlx" id="2_58u12d$nj" role="2iSdaV" />
<node concept="1iCGBv" id="2_58u12d$nH" role="3EZMnx"> <node concept="1iCGBv" id="2_58u12d$nH" role="3EZMnx">
...@@ -1356,5 +1356,52 @@ ...@@ -1356,5 +1356,52 @@
<node concept="l2Vlx" id="4XA4NEmF81U" role="2iSdaV" /> <node concept="l2Vlx" id="4XA4NEmF81U" role="2iSdaV" />
</node> </node>
</node> </node>
<node concept="24kQdi" id="2U2uJPpb$Ms">
<property role="3GE5qa" value="judgment" />
<ref role="1XX52x" to="b83y:2U2uJPpb$Me" resolve="JudgmentInstanceUndef" />
<node concept="3EZMnI" id="2U2uJPpb$Mu" role="2wV5jI">
<node concept="l2Vlx" id="2U2uJPpb$Mx" role="2iSdaV" />
<node concept="3F0ifn" id="2U2uJPpb$MG" role="3EZMnx">
<property role="3F0ifm" value="undef" />
</node>
<node concept="3F1sOY" id="2U2uJPpb$MO" role="3EZMnx">
<ref role="1NtTu8" to="b83y:2U2uJPpb$Mf" resolve="arg1" />
</node>
</node>
</node>
<node concept="24kQdi" id="2U2uJPphZhD">
<property role="3GE5qa" value="judgment" />
<ref role="1XX52x" to="b83y:2U2uJPpguJc" resolve="SortLattice" />
<node concept="3EZMnI" id="2U2uJPphZhF" role="2wV5jI">
<node concept="l2Vlx" id="2U2uJPphZhG" role="2iSdaV" />
<node concept="1iCGBv" id="2U2uJPphZhH" role="3EZMnx">
<ref role="1NtTu8" to="b83y:2U2uJPpguJd" resolve="sort" />
<node concept="1sVBvm" id="2U2uJPphZhI" role="1sWHZn">
<node concept="3F0A7n" id="2U2uJPphZhJ" role="2wV5jI">
<property role="1Intyy" value="true" />
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
<node concept="3F0ifn" id="2U2uJPphZhK" role="3EZMnx">
<property role="3F0ifm" value=":" />
<node concept="VSNWy" id="2U2uJPphZhL" role="3F10Kt">
<property role="1lJzqX" value="8" />
</node>
<node concept="11L4FC" id="2U2uJPphZhM" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="11LMrY" id="2U2uJPphZhN" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F1sOY" id="2U2uJPphZhO" role="3EZMnx">
<ref role="1NtTu8" to="b83y:2_58u12cYDi" resolve="mode" />
<node concept="VSNWy" id="2U2uJPphZhP" role="3F10Kt">
<property role="1lJzqX" value="8" />
</node>
</node>
</node>
</node>
</model> </model>
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
</languages> </languages>
<imports> <imports>
<import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" /> <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
<import index="uu1k" ref="r:5d05a0a1-0178-4953-8047-22b44c66dcde(org.inca.data.structure)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" /> <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
<import index="hqsm" ref="r:aa4c3470-43ab-4dad-b73e-20da0ee43be1(org.inca.core.structure)" implicit="true" /> <import index="hqsm" ref="r:aa4c3470-43ab-4dad-b73e-20da0ee43be1(org.inca.core.structure)" implicit="true" />
</imports> </imports>
...@@ -52,16 +53,9 @@ ...@@ -52,16 +53,9 @@
</registry> </registry>
<node concept="1TIwiD" id="2_58u12cYwo"> <node concept="1TIwiD" id="2_58u12cYwo">
<property role="EcuMT" value="2973820376015169560" /> <property role="EcuMT" value="2973820376015169560" />
<property role="TrG5h" value="Sort" /> <property role="TrG5h" value="SortConcept" />
<property role="3GE5qa" value="judgment" /> <property role="3GE5qa" value="judgment" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" /> <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="2_58u12cYDi" role="1TKVEi">
<property role="IQ2ns" value="2973820376015170130" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="mode" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12cYDn" resolve="SortMode" />
</node>
<node concept="1TJgyj" id="2_58u12cYws" role="1TKVEi"> <node concept="1TJgyj" id="2_58u12cYws" role="1TKVEi">
<property role="IQ2ns" value="2973820376015169564" /> <property role="IQ2ns" value="2973820376015169564" />
<property role="20lmBu" value="reference" /> <property role="20lmBu" value="reference" />
...@@ -69,6 +63,9 @@ ...@@ -69,6 +63,9 @@
<property role="20lbJX" value="1" /> <property role="20lbJX" value="1" />
<ref role="20lvS9" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" /> <ref role="20lvS9" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
</node> </node>
<node concept="PrWs8" id="2U2uJPpd5x6" role="PzmwI">
<ref role="PrY4T" node="2U2uJPpd5x5" resolve="Sort" />
</node>
</node> </node>
<node concept="PlHQZ" id="2_58u12cYDn"> <node concept="PlHQZ" id="2_58u12cYDn">
<property role="EcuMT" value="2973820376015170135" /> <property role="EcuMT" value="2973820376015170135" />
...@@ -202,7 +199,7 @@ ...@@ -202,7 +199,7 @@
<property role="20lmBu" value="aggregation" /> <property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="sort1" /> <property role="20kJfa" value="sort1" />
<property role="20lbJX" value="1" /> <property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12cYwo" resolve="Sort" /> <ref role="20lvS9" node="2U2uJPpd5x5" resolve="Sort" />
</node> </node>
<node concept="1TJgyj" id="2_58u12eLZl" role="1TKVEi"> <node concept="1TJgyj" id="2_58u12eLZl" role="1TKVEi">
<property role="IQ2ns" value="2973820376015642581" /> <property role="IQ2ns" value="2973820376015642581" />
...@@ -243,7 +240,7 @@ ...@@ -243,7 +240,7 @@
<property role="20lmBu" value="aggregation" /> <property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="sort1" /> <property role="20kJfa" value="sort1" />
<property role="20lbJX" value="1" /> <property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12cYwo" resolve="Sort" /> <ref role="20lvS9" node="2U2uJPpd5x5" resolve="Sort" />
</node> </node>
<node concept="1TJgyj" id="2_58u12eLZs" role="1TKVEi"> <node concept="1TJgyj" id="2_58u12eLZs" role="1TKVEi">
<property role="IQ2ns" value="2973820376015642588" /> <property role="IQ2ns" value="2973820376015642588" />
...@@ -257,7 +254,7 @@ ...@@ -257,7 +254,7 @@
<property role="20lmBu" value="aggregation" /> <property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="sort2" /> <property role="20kJfa" value="sort2" />
<property role="20lbJX" value="1" /> <property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12cYwo" resolve="Sort" /> <ref role="20lvS9" node="2U2uJPpd5x5" resolve="Sort" />
</node> </node>
<node concept="1TJgyj" id="2_58u12eLZ_" role="1TKVEi"> <node concept="1TJgyj" id="2_58u12eLZ_" role="1TKVEi">
<property role="IQ2ns" value="2973820376015642597" /> <property role="IQ2ns" value="2973820376015642597" />
...@@ -287,7 +284,7 @@ ...@@ -287,7 +284,7 @@
<property role="20lmBu" value="aggregation" /> <property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="sort1" /> <property role="20kJfa" value="sort1" />
<property role="20lbJX" value="1" /> <property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12cYwo" resolve="Sort" /> <ref role="20lvS9" node="2U2uJPpd5x5" resolve="Sort" />
</node> </node>
<node concept="1TJgyj" id="2_58u12eLYJ" role="1TKVEi"> <node concept="1TJgyj" id="2_58u12eLYJ" role="1TKVEi">
<property role="IQ2ns" value="2973820376015642543" /> <property role="IQ2ns" value="2973820376015642543" />
...@@ -301,7 +298,7 @@ ...@@ -301,7 +298,7 @@
<property role="20lmBu" value="aggregation" /> <property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="sort2" /> <property role="20kJfa" value="sort2" />
<property role="20lbJX" value="1" /> <property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12cYwo" resolve="Sort" /> <ref role="20lvS9" node="2U2uJPpd5x5" resolve="Sort" />
</node> </node>
<node concept="1TJgyj" id="2_58u12d$mx" role="1TKVEi"> <node concept="1TJgyj" id="2_58u12d$mx" role="1TKVEi">
<property role="IQ2ns" value="2973820376015324577" /> <property role="IQ2ns" value="2973820376015324577" />
...@@ -315,7 +312,7 @@ ...@@ -315,7 +312,7 @@
<property role="20lmBu" value="aggregation" /> <property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="sort3" /> <property role="20kJfa" value="sort3" />
<property role="20lbJX" value="1" /> <property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12cYwo" resolve="Sort" /> <ref role="20lvS9" node="2U2uJPpd5x5" resolve="Sort" />
</node> </node>
<node concept="1TJgyj" id="2_58u12eLZ6" role="1TKVEi"> <node concept="1TJgyj" id="2_58u12eLZ6" role="1TKVEi">
<property role="IQ2ns" value="2973820376015642566" /> <property role="IQ2ns" value="2973820376015642566" />
...@@ -623,5 +620,50 @@ ...@@ -623,5 +620,50 @@
<ref role="PrY4T" node="2_58u12fwJB" resolve="JudgmentInstance" /> <ref role="PrY4T" node="2_58u12fwJB" resolve="JudgmentInstance" />
</node> </node>
</node> </node>
<node concept="1TIwiD" id="2U2uJPpb$Me">
<property role="EcuMT" value="3351376301258591374" />
<property role="3GE5qa" value="judgment" />
<property role="TrG5h" value="JudgmentInstanceUndef" />
<property role="34LRSv" value="undef" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="2U2uJPpb$Mf" role="1TKVEi">
<property role="IQ2ns" value="3351376301258591375" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="arg1" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12g7Tn" resolve="IMetaTerm" />
</node>
<node concept="PrWs8" id="2U2uJPpb$Mh" role="PzmwI">
<ref role="PrY4T" node="2_58u12fwJB" resolve="JudgmentInstance" />
</node>
</node>
<node concept="PlHQZ" id="2U2uJPpd5x5">
<property role="EcuMT" value="3351376301258987589" />
<property role="3GE5qa" value="judgment" />
<property role="TrG5h" value="Sort" />
<node concept="1TJgyj" id="2_58u12cYDi" role="1TKVEi">
<property role="IQ2ns" value="2973820376015170130" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="mode" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="2_58u12cYDn" resolve="SortMode" />
</node>
</node>
<node concept="1TIwiD" id="2U2uJPpguJc">
<property role="EcuMT" value="3351376301259877324" />
<property role="TrG5h" value="SortLattice" />
<property role="3GE5qa" value="judgment" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="2U2uJPpguJd" role="1TKVEi">
<property role="IQ2ns" value="3351376301259877325" />
<property role="20lmBu" value="reference" />
<property role="20kJfa" value="sort" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" to="uu1k:3l0M8IajNMF" resolve="ITypeConstructor" />
</node>
<node concept="PrWs8" id="2U2uJPpguJe" role="PzmwI">
<ref role="PrY4T" node="2U2uJPpd5x5" resolve="Sort" />
</node>
</node>
</model> </model>
...@@ -67,29 +67,49 @@ ...@@ -67,29 +67,49 @@
<property role="3GE5qa" value="judgment" /> <property role="3GE5qa" value="judgment" />
<node concept="3clFbS" id="6G$bWLkvmoN" role="18ibNy"> <node concept="3clFbS" id="6G$bWLkvmoN" role="18ibNy">
<node concept="3clFbJ" id="6G$bWLkvmoT" role="3cqZAp"> <node concept="3clFbJ" id="6G$bWLkvmoT" role="3cqZAp">
<node concept="2OqwBi" id="6G$bWLkvmyA" role="3clFbw">
<node concept="1YBJjd" id="6G$bWLkvmpb" role="2Oq$k0">
<ref role="1YBMHb" node="6G$bWLkvmoP" resolve="sort" />
</node>
<node concept="2qgKlT" id="6G$bWLkvmZ1" role="2OqNvi">
<ref role="37wK5l" to="pgas:6G$bWLkuTK6" resolve="isRecursiveInput" />
</node>
</node>
<node concept="3clFbS" id="6G$bWLkvmoV" role="3clFbx"> <node concept="3clFbS" id="6G$bWLkvmoV" role="3clFbx">
<node concept="a7r0C" id="6G$bWLkvn4f" role="3cqZAp"> <node concept="a7r0C" id="6G$bWLkvn4f" role="3cqZAp">
<node concept="Xl_RD" id="6G$bWLkvn59" role="a7wSD"> <node concept="Xl_RD" id="6G$bWLkvn59" role="a7wSD">
<property role="Xl_RC" value="recursive input" /> <property role="Xl_RC" value="infinite input" />
</node> </node>
<node concept="1YBJjd" id="6G$bWLkvn4B" role="2OEOjV"> <node concept="1YBJjd" id="6G$bWLkvn4B" role="2OEOjV">
<ref role="1YBMHb" node="6G$bWLkvmoP" resolve="sort" /> <ref role="1YBMHb" node="6G$bWLkvmoP" resolve="sort" />
</node> </node>
</node> </node>
</node> </node>
<node concept="2OqwBi" id="2U2uJPpfY4S" role="3clFbw">
<node concept="1YBJjd" id="2U2uJPpfXVm" role="2Oq$k0">
<ref role="1YBMHb" node="6G$bWLkvmoP" resolve="sort" />
</node>
<node concept="2qgKlT" id="2U2uJPpfYlC" role="2OqNvi">
<ref role="37wK5l" to="pgas:2U2uJPpePaZ" resolve="isInfiniteInput" />
</node>
</node>
</node>
<node concept="3clFbJ" id="2U2uJPpdgN2" role="3cqZAp">
<node concept="3clFbS" id="2U2uJPpdgNe" role="3clFbx">
<node concept="a7r0C" id="2U2uJPpdgNf" role="3cqZAp">
<node concept="Xl_RD" id="2U2uJPpdgNg" role="a7wSD">
<property role="Xl_RC" value="infinite non-lattice output" />
</node>
<node concept="1YBJjd" id="2U2uJPpdgNh" role="2OEOjV">
<ref role="1YBMHb" node="6G$bWLkvmoP" resolve="sort" />
</node>
</node>
</node>
<node concept="2OqwBi" id="2U2uJPpfYKF" role="3clFbw">
<node concept="1YBJjd" id="2U2uJPpfY_D" role="2Oq$k0">
<ref role="1YBMHb" node="6G$bWLkvmoP" resolve="sort" />
</node>
<node concept="2qgKlT" id="2U2uJPpfZ6x" role="2OqNvi">
<ref role="37wK5l" to="pgas:2U2uJPpeU0b" resolve="isInfiniteNonlatticeOutput" />
</node>
</node>
</node> </node>
</node> </node>
<node concept="1YaCAy" id="6G$bWLkvmoP" role="1YuTPh"> <node concept="1YaCAy" id="6G$bWLkvmoP" role="1YuTPh">
<property role="TrG5h" value="sort" /> <property role="TrG5h" value="sort" />
<ref role="1YaFvo" to="b83y:2_58u12cYwo" resolve="Sort" /> <ref role="1YaFvo" to="b83y:2_58u12cYwo" resolve="SortConcept" />
</node> </node>
</node> </node>
</model> </model>
......
...@@ -12,7 +12,19 @@ ...@@ -12,7 +12,19 @@
</dependencies> </dependencies>
<languageVersions> <languageVersions>
<language slang="l:ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71:TypeLang" version="0" /> <language slang="l:ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71:TypeLang" version="0" />
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
<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="0" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" /> <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" 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: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:8c9a2720-9d21-4370-a226-819eb3e76e1e:org.inca.fun" version="0" />
<language slang="l:cd2909da-ecb4-49dc-b176-33e5c619e516:org.inca.gp" version="0" />
</languageVersions> </languageVersions>
<dependencyVersions> <dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" /> <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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