hand-coding more transformatin steps for STLCN

inca-translation/languages/NewLanguage/models/editor.mps

@@ -61,10 +61,6 @@
         <child id="1716599163375643746" name="inner" index="drBAU" />
         <child id="1716599163375643751" name="right" index="drBAZ" />
       </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="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
         <child id="7363578995839435358" name="wrapped" index="1kIj9b" />
@@ -305,9 +301,8 @@
     <node concept="1WcQYu" id="6JCho9VC0uc" role="2wV5jI">
       <node concept="2ElW$n" id="6JCho9VC0ug" role="2El2Yn" />
       <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" />
-          <node concept="2lD6_C" id="6JCho9VC0u5" role="2lD6_D" />
         </node>
       </node>
     </node>

inca-translation/languages/TypeLang/TypeLang.mpl

@@ -40,10 +40,25 @@
         <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="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)" 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="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>
       <mapping-priorities />
     </generator>
@@ -52,13 +67,13 @@
   <dependencies>
     <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">b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</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">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</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">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2(org.inca.data)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="0" />
@@ -109,11 +124,14 @@
     <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="e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2(org.inca.data)" 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" />
     <module reference="80e42679-e00d-400f-8714-aee80946d2f9(org.inca.styles)" version="0" />
   </dependencyVersions>
-  <extendedLanguages />
+  <extendedLanguages>
+    <extendedLanguage>b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</extendedLanguage>
+  </extendedLanguages>
 </language>
 

inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps

@@ -528,7 +528,7 @@
                       <node concept="3cpWsn" id="2groWwYmPQU" role="3cpWs9">
                         <property role="TrG5h" value="sort" />
                         <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 concept="2OqwBi" id="2groWwYmPQV" role="33vP2m">
                           <node concept="2OqwBi" id="2groWwYmPQW" role="2Oq$k0">

inca-translation/languages/TypeLang/generator/template/main@generator.mps

@@ -311,7 +311,7 @@
               <node concept="3cpWsn" id="4XA4NEmHUZx" role="3cpWs9">
                 <property role="TrG5h" value="typeSort" />
                 <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 concept="2OqwBi" id="4XA4NEmHUZy" role="33vP2m">
                   <node concept="2OqwBi" id="4XA4NEmHUZz" role="2Oq$k0">
@@ -538,7 +538,7 @@
               <node concept="3cpWsn" id="677Mj2_H$Zj" role="3cpWs9">
                 <property role="TrG5h" value="xRequiredOutputSort" />
                 <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 concept="2OqwBi" id="677Mj2_H$Zk" role="33vP2m">
                   <node concept="37vLTw" id="677Mj2_H$Zl" role="2Oq$k0">

inca-translation/languages/TypeLang/models/behavior.mps

@@ -201,9 +201,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
@@ -226,7 +223,6 @@
       </concept>
       <concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
       <concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
-      <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
         <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
       </concept>
@@ -241,9 +237,6 @@
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
       <concept id="334628810661441841" name="jetbrains.mps.lang.smodel.structure.AsSConcept" flags="nn" index="1rGIog" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
-      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -285,7 +278,6 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
@@ -303,47 +295,6 @@
   </registry>
   <node concept="13h7C7" id="6G$bWLkuTHf">
     <ref role="13h7C2" to="b83y:2_58u12cYEI" resolve="TypeLangModule" />
-    <node concept="13i0hz" id="6G$bWLkuTHq" role="13h7CS">
-      <property role="TrG5h" value="hasRecursiveInputs" />
-      <node concept="3Tm1VV" id="6G$bWLkuTHr" role="1B3o_S" />
-      <node concept="10P_77" id="6G$bWLkuTHM" role="3clF45" />
-      <node concept="3clFbS" id="6G$bWLkuTHt" role="3clF47">
-        <node concept="3clFbF" id="6G$bWLkuTP2" role="3cqZAp">
-          <node concept="2OqwBi" id="6G$bWLkv6hN" role="3clFbG">
-            <node concept="2OqwBi" id="6G$bWLkuTZw" role="2Oq$k0">
-              <node concept="13iPFW" id="6G$bWLkuTP1" role="2Oq$k0" />
-              <node concept="2Rf3mk" id="6G$bWLkuYh2" role="2OqNvi">
-                <node concept="1xMEDy" id="6G$bWLkuYh4" role="1xVPHs">
-                  <node concept="chp4Y" id="6G$bWLkuY_Y" role="ri$Ld">
-                    <ref role="cht4Q" to="b83y:2_58u12cYwo" resolve="Sort" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2HwmR7" id="6G$bWLkv9H$" role="2OqNvi">
-              <node concept="1bVj0M" id="6G$bWLkv9HA" role="23t8la">
-                <node concept="3clFbS" id="6G$bWLkv9HB" role="1bW5cS">
-                  <node concept="3clFbF" id="6G$bWLkv9Pf" role="3cqZAp">
-                    <node concept="2OqwBi" id="6G$bWLkva1t" role="3clFbG">
-                      <node concept="37vLTw" id="6G$bWLkv9Pe" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6G$bWLkv9HC" resolve="it" />
-                      </node>
-                      <node concept="2qgKlT" id="6G$bWLkvbEr" role="2OqNvi">
-                        <ref role="37wK5l" node="6G$bWLkuTK6" resolve="isRecursiveInput" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="6G$bWLkv9HC" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6G$bWLkv9HD" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="13hLZK" id="6G$bWLkuTHg" role="13h7CW">
       <node concept="3clFbS" id="6G$bWLkuTHh" role="2VODD2" />
     </node>
@@ -466,7 +417,7 @@
   </node>
   <node concept="13h7C7" id="6G$bWLkuTJV">
     <property role="3GE5qa" value="judgment" />
-    <ref role="13h7C2" to="b83y:2_58u12cYwo" resolve="Sort" />
+    <ref role="13h7C2" to="b83y:2_58u12cYwo" resolve="SortConcept" />
     <node concept="13i0hz" id="6G$bWLkvsQx" role="13h7CS">
       <property role="TrG5h" value="isRecursiveConcept" />
       <node concept="3Tm1VV" id="6G$bWLkvsQy" role="1B3o_S" />
@@ -810,38 +761,28 @@
         </node>
       </node>
     </node>
-    <node concept="13i0hz" id="6G$bWLkuTK6" role="13h7CS">
-      <property role="TrG5h" value="isRecursiveInput" />
-      <node concept="3Tm1VV" id="6G$bWLkuTK7" role="1B3o_S" />
-      <node concept="10P_77" id="6G$bWLkuTKu" role="3clF45" />
-      <node concept="3clFbS" id="6G$bWLkuTK9" role="3clF47">
-        <node concept="3clFbF" id="6G$bWLkvjhi" role="3cqZAp">
-          <node concept="1Wc70l" id="6G$bWLkvsBM" role="3clFbG">
-            <node concept="BsUDl" id="6G$bWLkvt25" role="3uHU7w">
+    <node concept="13i0hz" id="2U2uJPpd7QZ" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="isEnumerable" />
+      <ref role="13i0hy" node="2U2uJPpd7Nx" resolve="isFinitelyEnumerable" />
+      <node concept="3Tm1VV" id="2U2uJPpd7R0" role="1B3o_S" />
+      <node concept="3clFbS" id="2U2uJPpd7R3" role="3clF47">
+        <node concept="3clFbF" id="2U2uJPpd7R6" role="3cqZAp">
+          <node concept="3fqX7Q" id="2U2uJPpddTu" role="3clFbG">
+            <node concept="BsUDl" id="2U2uJPpddTw" role="3fr31v">
               <ref role="37wK5l" node="6G$bWLkvsQx" resolve="isRecursiveConcept" />
-              <node concept="2OqwBi" id="6G$bWLkvth3" role="37wK5m">
-                <node concept="13iPFW" id="6G$bWLkvt6V" role="2Oq$k0" />
-                <node concept="3TrEf2" id="6G$bWLkvtHD" role="2OqNvi">
+              <node concept="2OqwBi" id="2U2uJPpddTx" role="37wK5m">
+                <node concept="13iPFW" id="2U2uJPpddTy" role="2Oq$k0" />
+                <node concept="3TrEf2" id="2U2uJPpddTz" role="2OqNvi">
                   <ref role="3Tt5mk" to="b83y:2_58u12cYws" resolve="sort" />
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="6G$bWLkvk55" role="3uHU7B">
-              <node concept="2OqwBi" id="6G$bWLkvjqK" role="2Oq$k0">
-                <node concept="13iPFW" id="6G$bWLkvjhh" role="2Oq$k0" />
-                <node concept="3TrEf2" id="6G$bWLkvjMR" role="2OqNvi">
-                  <ref role="3Tt5mk" to="b83y:2_58u12cYDi" resolve="mode" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="6G$bWLkvpGg" role="2OqNvi">
-                <node concept="chp4Y" id="6G$bWLkvpOl" role="cj9EA">
-                  <ref role="cht4Q" to="b83y:2_58u12cYDo" resolve="SortInputMode" />
-                </node>
-              </node>
-            </node>
           </node>
         </node>
       </node>
+      <node concept="10P_77" id="2U2uJPpd7R4" role="3clF45" />
     </node>
     <node concept="13hLZK" id="6G$bWLkuTJW" role="13h7CW">
       <node concept="3clFbS" id="6G$bWLkuTJX" role="2VODD2" />
@@ -857,43 +798,7 @@
       <node concept="3Tm1VV" id="4XA4NEmGQRe" role="1B3o_S" />
       <node concept="3clFbS" id="4XA4NEmGQRg" role="3clF47" />
       <node concept="2I9FWS" id="4XA4NEmGQRU" role="3clF45">
-        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="4XA4NEmH_Zs" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="hasRecursiveInputSort" />
-      <node concept="3Tm1VV" id="4XA4NEmH_Zt" role="1B3o_S" />
-      <node concept="10P_77" id="4XA4NEmH_ZS" role="3clF45" />
-      <node concept="3clFbS" id="4XA4NEmH_Zv" role="3clF47">
-        <node concept="3clFbF" id="4XA4NEmHA0X" role="3cqZAp">
-          <node concept="2OqwBi" id="4XA4NEmHB_p" role="3clFbG">
-            <node concept="BsUDl" id="4XA4NEmHA0W" role="2Oq$k0">
-              <ref role="37wK5l" node="4XA4NEmGQRd" resolve="getSorts" />
-            </node>
-            <node concept="2HwmR7" id="4XA4NEmHDVB" role="2OqNvi">
-              <node concept="1bVj0M" id="4XA4NEmHDVD" role="23t8la">
-                <node concept="3clFbS" id="4XA4NEmHDVE" role="1bW5cS">
-                  <node concept="3clFbF" id="4XA4NEmHE2Z" role="3cqZAp">
-                    <node concept="2OqwBi" id="4XA4NEmHEeD" role="3clFbG">
-                      <node concept="37vLTw" id="4XA4NEmHE2Y" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4XA4NEmHDVF" resolve="it" />
-                      </node>
-                      <node concept="2qgKlT" id="4XA4NEmHEvF" role="2OqNvi">
-                        <ref role="37wK5l" node="6G$bWLkuTK6" resolve="isRecursiveInput" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="4XA4NEmHDVF" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="4XA4NEmHDVG" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
+        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
       </node>
     </node>
     <node concept="13i0hz" id="4XA4NEmHFP0" role="13h7CS">
@@ -916,8 +821,8 @@
                         <node concept="37vLTw" id="4XA4NEmHJC0" role="2Oq$k0">
                           <ref role="3cqZAo" node="4XA4NEmHJxN" resolve="it" />
                         </node>
-                        <node concept="2qgKlT" id="4XA4NEmHK20" role="2OqNvi">
-                          <ref role="37wK5l" node="6G$bWLkuTK6" resolve="isRecursiveInput" />
+                        <node concept="2qgKlT" id="2U2uJPpeWB$" role="2OqNvi">
+                          <ref role="37wK5l" node="2U2uJPpePaZ" resolve="isInfiniteInput" />
                         </node>
                       </node>
                     </node>
@@ -934,7 +839,7 @@
         </node>
       </node>
       <node concept="2I9FWS" id="4XA4NEmHFQk" role="3clF45">
-        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
       </node>
     </node>
     <node concept="13i0hz" id="5bZNdPkea12" role="13h7CS">
@@ -983,7 +888,7 @@
       <node concept="37vLTG" id="677Mj2_GYbE" role="3clF46">
         <property role="TrG5h" value="sort" />
         <node concept="3Tqbb2" id="677Mj2_GYbD" role="1tU5fm">
-          <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="Sort" />
+          <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="SortConcept" />
         </node>
       </node>
     </node>
@@ -1024,12 +929,12 @@
           <node concept="3cpWsn" id="4XA4NEmGXBG" role="3cpWs9">
             <property role="TrG5h" value="list" />
             <node concept="2I9FWS" id="4XA4NEmGXBE" role="1tU5fm">
-              <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+              <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
             </node>
             <node concept="2ShNRf" id="4XA4NEmGXBH" role="33vP2m">
               <node concept="2T8Vx0" id="4XA4NEmGXBI" role="2ShVmc">
                 <node concept="2I9FWS" id="4XA4NEmGXBJ" role="2T96Bj">
-                  <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+                  <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
                 </node>
               </node>
             </node>
@@ -1057,7 +962,7 @@
         </node>
       </node>
       <node concept="2I9FWS" id="4XA4NEmGQSA" role="3clF45">
-        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
       </node>
     </node>
     <node concept="13i0hz" id="5bZNdPkeaHl" role="13h7CS">
@@ -1194,7 +1099,7 @@
       <node concept="37vLTG" id="677Mj2_GYXp" role="3clF46">
         <property role="TrG5h" value="sort" />
         <node concept="3Tqbb2" id="677Mj2_GYXq" role="1tU5fm">
-          <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="Sort" />
+          <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="SortConcept" />
         </node>
       </node>
       <node concept="3Tqbb2" id="677Mj2_GYXr" role="3clF45">
@@ -1263,12 +1168,12 @@
           <node concept="3cpWsn" id="4XA4NEmH2Mk" role="3cpWs9">
             <property role="TrG5h" value="list" />
             <node concept="2I9FWS" id="4XA4NEmH2Ml" role="1tU5fm">
-              <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+              <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
             </node>
             <node concept="2ShNRf" id="4XA4NEmH2Mm" role="33vP2m">
               <node concept="2T8Vx0" id="4XA4NEmH2Mn" role="2ShVmc">
                 <node concept="2I9FWS" id="4XA4NEmH2Mo" role="2T96Bj">
-                  <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+                  <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
                 </node>
               </node>
             </node>
@@ -1311,7 +1216,7 @@
         </node>
       </node>
       <node concept="2I9FWS" id="4XA4NEmH2M2" role="3clF45">
-        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
       </node>
     </node>
     <node concept="13i0hz" id="5bZNdPkedmk" role="13h7CS">
@@ -1591,7 +1496,7 @@
       <node concept="37vLTG" id="677Mj2_H4oZ" role="3clF46">
         <property role="TrG5h" value="sort" />
         <node concept="3Tqbb2" id="677Mj2_H4p0" role="1tU5fm">
-          <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="Sort" />
+          <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="SortConcept" />
         </node>
       </node>
       <node concept="3Tqbb2" id="677Mj2_H4p1" role="3clF45">
@@ -1675,12 +1580,12 @@
           <node concept="3cpWsn" id="4XA4NEmH8AY" role="3cpWs9">
             <property role="TrG5h" value="list" />
             <node concept="2I9FWS" id="4XA4NEmH8AZ" role="1tU5fm">
-              <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+              <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
             </node>
             <node concept="2ShNRf" id="4XA4NEmH8B0" role="33vP2m">
               <node concept="2T8Vx0" id="4XA4NEmH8B1" role="2ShVmc">
                 <node concept="2I9FWS" id="4XA4NEmH8B2" role="2T96Bj">
-                  <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+                  <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
                 </node>
               </node>
             </node>
@@ -1738,7 +1643,7 @@
         </node>
       </node>
       <node concept="2I9FWS" id="4XA4NEmH8AG" role="3clF45">
-        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="Sort" />
+        <ref role="2I9WkF" to="b83y:2_58u12cYwo" resolve="SortConcept" />
       </node>
     </node>
     <node concept="13i0hz" id="5bZNdPkeeQ_" role="13h7CS">
@@ -2069,7 +1974,7 @@
       <node concept="37vLTG" id="677Mj2_H7E_" role="3clF46">
         <property role="TrG5h" value="sort" />
         <node concept="3Tqbb2" id="677Mj2_H7EA" role="1tU5fm">
-          <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="Sort" />
+          <ref role="ehGHo" to="b83y:2_58u12cYwo" resolve="SortConcept" />
         </node>
       </node>
       <node concept="3Tqbb2" id="677Mj2_H7EB" role="3clF45">
@@ -3548,5 +3453,124 @@
       <node concept="3clFbS" id="2groWwXYoO_" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="2U2uJPpd7Nm">
+    <property role="3GE5qa" value="judgment" />
+    <ref role="13h7C2" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+    <node concept="13i0hz" id="2U2uJPpd7Nx" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="isFinitelyEnumerable" />
+      <node concept="3Tm1VV" id="2U2uJPpd7Ny" role="1B3o_S" />
+      <node concept="10P_77" id="2U2uJPpd7NP" role="3clF45" />
+      <node concept="3clFbS" id="2U2uJPpd7N$" role="3clF47">
+        <node concept="3clFbF" id="2U2uJPphLX3" role="3cqZAp">
+          <node concept="3clFbT" id="2U2uJPphLX2" role="3clFbG">
+            <property role="3clFbU" value="false" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="2U2uJPpePaZ" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="isInfiniteInput" />
+      <node concept="3Tm1VV" id="2U2uJPpePb0" role="1B3o_S" />
+      <node concept="10P_77" id="2U2uJPpePbr" role="3clF45" />
+      <node concept="3clFbS" id="2U2uJPpePb2" role="3clF47">
+        <node concept="3clFbF" id="2U2uJPpePco" role="3cqZAp">
+          <node concept="1Wc70l" id="2U2uJPpeTmR" role="3clFbG">
+            <node concept="3fqX7Q" id="2U2uJPpeTrG" role="3uHU7w">
+              <node concept="2OqwBi" id="2U2uJPpeT_5" role="3fr31v">
+                <node concept="13iPFW" id="2U2uJPpeTrM" role="2Oq$k0" />
+                <node concept="2qgKlT" id="2U2uJPpeTTP" role="2OqNvi">
+                  <ref role="37wK5l" node="2U2uJPpd7Nx" resolve="isFinitelyEnumerable" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2U2uJPpeSJr" role="3uHU7B">
+              <node concept="2OqwBi" id="2U2uJPpePl3" role="2Oq$k0">
+                <node concept="13iPFW" id="2U2uJPpePcn" role="2Oq$k0" />
+                <node concept="3TrEf2" id="2U2uJPpeSws" role="2OqNvi">
+                  <ref role="3Tt5mk" to="b83y:2_58u12cYDi" resolve="mode" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="2U2uJPpeSTI" role="2OqNvi">
+                <node concept="chp4Y" id="2U2uJPpeT1g" role="cj9EA">
+                  <ref role="cht4Q" to="b83y:2_58u12cYDo" resolve="SortInputMode" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="2U2uJPpeU0b" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="isInfiniteNonlatticeOutput" />
+      <node concept="3Tm1VV" id="2U2uJPpeU0c" role="1B3o_S" />
+      <node concept="10P_77" id="2U2uJPpeU7p" role="3clF45" />
+      <node concept="3clFbS" id="2U2uJPpeU0e" role="3clF47">
+        <node concept="3clFbF" id="2U2uJPpeU8_" role="3cqZAp">
+          <node concept="1Wc70l" id="2U2uJPpeU8A" role="3clFbG">
+            <node concept="3fqX7Q" id="2U2uJPpeU8B" role="3uHU7w">
+              <node concept="2OqwBi" id="2U2uJPpeU8C" role="3fr31v">
+                <node concept="13iPFW" id="2U2uJPpeU8D" role="2Oq$k0" />
+                <node concept="2qgKlT" id="2U2uJPpeU8E" role="2OqNvi">
+                  <ref role="37wK5l" node="2U2uJPpd7Nx" resolve="isFinitelyEnumerable" />
+                </node>
+              </node>
+            </node>
+            <node concept="1Wc70l" id="2U2uJPpeUEM" role="3uHU7B">
+              <node concept="2OqwBi" id="2U2uJPpeVwP" role="3uHU7w">
+                <node concept="13iPFW" id="2U2uJPpeULE" role="2Oq$k0" />
+                <node concept="1mIQ4w" id="2U2uJPpeVRy" role="2OqNvi">
+                  <node concept="chp4Y" id="2U2uJPpeW1F" role="cj9EA">
+                    <ref role="cht4Q" to="b83y:2_58u12cYwo" resolve="SortConcept" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="2U2uJPpeU8F" role="3uHU7B">
+                <node concept="2OqwBi" id="2U2uJPpeU8G" role="2Oq$k0">
+                  <node concept="13iPFW" id="2U2uJPpeU8H" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="2U2uJPpeU8I" role="2OqNvi">
+                    <ref role="3Tt5mk" to="b83y:2_58u12cYDi" resolve="mode" />
+                  </node>
+                </node>
+                <node concept="1mIQ4w" id="2U2uJPpeU8J" role="2OqNvi">
+                  <node concept="chp4Y" id="2U2uJPpeUj8" role="cj9EA">
+                    <ref role="cht4Q" to="b83y:2_58u12cYDp" resolve="SortOutputMode" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="2U2uJPpd7Nn" role="13h7CW">
+      <node concept="3clFbS" id="2U2uJPpd7No" role="2VODD2" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="2U2uJPpgAn7">
+    <property role="3GE5qa" value="judgment" />
+    <ref role="13h7C2" to="b83y:2U2uJPpguJc" resolve="SortLattice" />
+    <node concept="13hLZK" id="2U2uJPpgAn8" role="13h7CW">
+      <node concept="3clFbS" id="2U2uJPpgAn9" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="2U2uJPpgAni" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="isFinitelyEnumerable" />
+      <ref role="13i0hy" node="2U2uJPpd7Nx" resolve="isFinitelyEnumerable" />
+      <node concept="3Tm1VV" id="2U2uJPpgAnj" role="1B3o_S" />
+      <node concept="3clFbS" id="2U2uJPpgAnm" role="3clF47">
+        <node concept="3clFbF" id="2U2uJPpgAnp" role="3cqZAp">
+          <node concept="3clFbT" id="2U2uJPpgAno" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="10P_77" id="2U2uJPpgAnn" role="3clF45" />
+    </node>
+  </node>
 </model>
 

inca-translation/languages/TypeLang/models/editor.mps

@@ -379,7 +379,7 @@
   </node>
   <node concept="24kQdi" id="2_58u12d$ne">
     <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="l2Vlx" id="2_58u12d$nj" role="2iSdaV" />
       <node concept="1iCGBv" id="2_58u12d$nH" role="3EZMnx">
@@ -1356,5 +1356,52 @@
       <node concept="l2Vlx" id="4XA4NEmF81U" role="2iSdaV" />
     </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">