From 6ccb8513bda35fd58164ad1bba643b75953dfce5 Mon Sep 17 00:00:00 2001
From: Andre Pacak <pacak@uni-mainz.de>
Date: Fri, 29 Nov 2019 20:51:05 +0100
Subject: [PATCH] syntax directed sort mode instead of syntax directed judgment
 flag

---
 .../template/TypeLang.generator.util.mps      |  75 ++++------
 .../generator/template/main@generator.mps     |   8 +-
 .../languages/TypeLang/models/behavior.mps    | 140 ++++++++++++++----
 .../languages/TypeLang/models/editor.mps      |  36 +----
 .../languages/TypeLang/models/structure.mps   |  16 +-
 .../TypeLangTest/models/test_single.mps       |  87 +++++------
 6 files changed, 205 insertions(+), 157 deletions(-)

diff --git a/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps b/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
index afa59ed..b228335 100644
--- a/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
+++ b/inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
@@ -4077,7 +4077,7 @@
     </node>
     <node concept="2tJIrI" id="32CDcOyI4Xk" role="jymVt" />
     <node concept="3clFb_" id="2iwoW_qmyLT" role="jymVt">
-      <property role="TrG5h" value="getDeclarationsWithUserAndNonUserInput" />
+      <property role="TrG5h" value="getDeclarationsWithUserAndSyntaxDirectedInput" />
       <node concept="3clFbS" id="2iwoW_qmyLU" role="3clF47">
         <node concept="3clFbF" id="2iwoW_qmyLV" role="3cqZAp">
           <node concept="2OqwBi" id="2iwoW_qmyLW" role="3clFbG">
@@ -4100,7 +4100,7 @@
                   <node concept="3clFbS" id="2iwoW_qmyM6" role="1bW5cS">
                     <node concept="3cpWs8" id="7oauUzvciXS" role="3cqZAp">
                       <node concept="3cpWsn" id="7oauUzvciXT" role="3cpWs9">
-                        <property role="TrG5h" value="nonUserInputSorts" />
+                        <property role="TrG5h" value="syntaxDirectedInputSorts" />
                         <node concept="2I9FWS" id="7oauUzvciXI" role="1tU5fm">
                           <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
                         </node>
@@ -4108,8 +4108,8 @@
                           <node concept="37vLTw" id="7oauUzvciXV" role="2Oq$k0">
                             <ref role="3cqZAo" node="2iwoW_qmyMo" resolve="it" />
                           </node>
-                          <node concept="2qgKlT" id="7oauUzvciXW" role="2OqNvi">
-                            <ref role="37wK5l" to="pgas:2iwoW_qn4iq" resolve="getNonUserInputSorts" />
+                          <node concept="2qgKlT" id="1t5MWi4aLSq" role="2OqNvi">
+                            <ref role="37wK5l" to="pgas:1t5MWi48XT4" resolve="getSyntaxDirectedInputSorts" />
                           </node>
                         </node>
                       </node>
@@ -4152,7 +4152,7 @@
                             <node concept="2OqwBi" id="2iwoW_qn91j" role="3uHU7B">
                               <node concept="1uHKPH" id="2iwoW_qnhh9" role="2OqNvi" />
                               <node concept="37vLTw" id="7oauUzvciXY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7oauUzvciXT" resolve="nonUserInputSorts" />
+                                <ref role="3cqZAo" node="7oauUzvciXT" resolve="syntaxDirectedInputSorts" />
                               </node>
                             </node>
                             <node concept="10Nm6u" id="2iwoW_qn$Os" role="3uHU7w" />
@@ -5357,7 +5357,7 @@
     </node>
   </node>
   <node concept="312cEu" id="7oauUzrT9ir">
-    <property role="TrG5h" value="NonUserInputProjector" />
+    <property role="TrG5h" value="SyntaxDirectedInputProjector" />
     <node concept="312cEg" id="7oauUzrT9yp" role="jymVt">
       <property role="TrG5h" value="module" />
       <node concept="3Tm6S6" id="7oauUzrT9yq" role="1B3o_S" />
@@ -5509,7 +5509,7 @@
         </node>
         <node concept="3cpWs8" id="7TgNhRbgTQU" role="3cqZAp">
           <node concept="3cpWsn" id="7TgNhRbgTQV" role="3cpWs9">
-            <property role="TrG5h" value="declarationsWithUserAndNonUserInput" />
+            <property role="TrG5h" value="declarationsWithUserAndSyntaxDirected" />
             <node concept="2I9FWS" id="7TgNhRbgTQS" role="1tU5fm">
               <ref role="2I9WkF" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
             </node>
@@ -5518,33 +5518,16 @@
                 <ref role="3cqZAo" node="7TgNhRbgMBT" resolve="querier" />
               </node>
               <node concept="liA8E" id="7TgNhRbgTQY" role="2OqNvi">
-                <ref role="37wK5l" node="2iwoW_qmyLT" resolve="getDeclarationsWithUserAndNonUserInput" />
+                <ref role="37wK5l" node="2iwoW_qmyLT" resolve="getDeclarationsWithUserAndSyntaxDirectedInput" />
               </node>
             </node>
           </node>
         </node>
         <node concept="1DcWWT" id="7oauUztmAEb" role="3cqZAp">
           <node concept="3clFbS" id="7oauUztmAEd" role="2LFqv$">
-            <node concept="3clFbJ" id="7TgNhRb89JK" role="3cqZAp">
-              <node concept="3clFbS" id="7TgNhRb89JL" role="3clFbx">
-                <node concept="3N13vt" id="7TgNhRb89JM" role="3cqZAp" />
-              </node>
-              <node concept="3clFbC" id="7TgNhRb89JN" role="3clFbw">
-                <node concept="2OqwBi" id="7TgNhRb89JO" role="3uHU7B">
-                  <node concept="37vLTw" id="7TgNhRb89JP" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7oauUztmAEe" resolve="declaration" />
-                  </node>
-                  <node concept="3TrEf2" id="7TgNhRb89JQ" role="2OqNvi">
-                    <ref role="3Tt5mk" to="b83y:7TgNhRaTdk1" resolve="syntaxDirected" />
-                  </node>
-                </node>
-                <node concept="10Nm6u" id="7TgNhRb89JR" role="3uHU7w" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="7TgNhRb88_i" role="3cqZAp" />
             <node concept="3cpWs8" id="7oauUztmNqn" role="3cqZAp">
               <node concept="3cpWsn" id="7oauUztmNqo" role="3cpWs9">
-                <property role="TrG5h" value="nonUserInputSorts" />
+                <property role="TrG5h" value="syntaxDirectedInputSorts" />
                 <node concept="2I9FWS" id="7oauUztmNqj" role="1tU5fm">
                   <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
                 </node>
@@ -5552,8 +5535,8 @@
                   <node concept="37vLTw" id="7oauUztmNqq" role="2Oq$k0">
                     <ref role="3cqZAo" node="7oauUztmAEe" resolve="declaration" />
                   </node>
-                  <node concept="2qgKlT" id="7oauUztmNqr" role="2OqNvi">
-                    <ref role="37wK5l" to="pgas:2iwoW_qn4iq" resolve="getNonUserInputSorts" />
+                  <node concept="2qgKlT" id="1t5MWi4aauM" role="2OqNvi">
+                    <ref role="37wK5l" to="pgas:1t5MWi48XT4" resolve="getSyntaxDirectedInputSorts" />
                   </node>
                 </node>
               </node>
@@ -5573,7 +5556,7 @@
                           <ref role="3cqZAo" node="7oauUztmAEe" resolve="declaration" />
                         </node>
                         <node concept="37vLTw" id="7oauUztla0d" role="37wK5m">
-                          <ref role="3cqZAo" node="7oauUztla1h" resolve="nonUserSortToProject" />
+                          <ref role="3cqZAo" node="7oauUztla1h" resolve="syntaxDirectedSort" />
                         </node>
                       </node>
                       <node concept="Xjq3P" id="7TgNhRbgFyR" role="2Oq$k0" />
@@ -5594,14 +5577,14 @@
                 </node>
               </node>
               <node concept="3cpWsn" id="7oauUztla1h" role="1Duv9x">
-                <property role="TrG5h" value="nonUserSortToProject" />
+                <property role="TrG5h" value="syntaxDirectedSort" />
                 <node concept="3Tqbb2" id="7oauUztla1i" role="1tU5fm">
                   <ref role="ehGHo" to="b83y:2U2uJPpd5x5" resolve="Sort" />
                 </node>
               </node>
               <node concept="2OqwBi" id="7oauUztla1j" role="1DdaDG">
                 <node concept="37vLTw" id="7oauUztmNXL" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7oauUztmNqo" resolve="nonUserInputSorts" />
+                  <ref role="3cqZAo" node="7oauUztmNqo" resolve="syntaxDirectedInputSorts" />
                 </node>
                 <node concept="35Qw8J" id="7oauUztla1l" role="2OqNvi" />
               </node>
@@ -5614,7 +5597,7 @@
             </node>
           </node>
           <node concept="37vLTw" id="7TgNhRbgWnJ" role="1DdaDG">
-            <ref role="3cqZAo" node="7TgNhRbgTQV" resolve="declarationsWithUserAndNonUserInput" />
+            <ref role="3cqZAo" node="7TgNhRbgTQV" resolve="declarationsWithUserAndSyntaxDirected" />
           </node>
         </node>
       </node>
@@ -7412,7 +7395,7 @@
         </node>
         <node concept="3cpWs8" id="7oauUzvNtSd" role="3cqZAp">
           <node concept="3cpWsn" id="7oauUzvNtSe" role="3cpWs9">
-            <property role="TrG5h" value="nonUserInputSortsOfConclusion" />
+            <property role="TrG5h" value="syntaxDirectedInputSortsOfConclusion" />
             <node concept="2I9FWS" id="7oauUzvNtSf" role="1tU5fm">
               <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
             </node>
@@ -7420,8 +7403,8 @@
               <node concept="37vLTw" id="7oauUzvNtSh" role="2Oq$k0">
                 <ref role="3cqZAo" node="7oauUzvNtS6" resolve="judgmentOfConclusion" />
               </node>
-              <node concept="2qgKlT" id="7oauUzvNtSi" role="2OqNvi">
-                <ref role="37wK5l" to="pgas:2iwoW_qn4iq" resolve="getNonUserInputSorts" />
+              <node concept="2qgKlT" id="1t5MWi4acJ5" role="2OqNvi">
+                <ref role="37wK5l" to="pgas:1t5MWi48XT4" resolve="getSyntaxDirectedInputSorts" />
               </node>
             </node>
           </node>
@@ -7441,7 +7424,7 @@
                       <ref role="3cqZAo" node="7oauUzvNtS6" resolve="judgmentOfConclusion" />
                     </node>
                     <node concept="37vLTw" id="7oauUzvNtSr" role="1Lso8e">
-                      <ref role="3cqZAo" node="7oauUzvNtTh" resolve="nonUserInputSort" />
+                      <ref role="3cqZAo" node="7oauUzvNtTh" resolve="synaxtDirectedInputSort" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="7oauUzvNtSs" role="3ElQJh">
@@ -7500,7 +7483,7 @@
                                 <ref role="cht4Q" to="b83y:2_58u12cYwo" resolve="SortConcept" />
                               </node>
                               <node concept="37vLTw" id="7oauUzvNtSN" role="1m5AlR">
-                                <ref role="3cqZAo" node="7oauUzvNtTh" resolve="nonUserInputSort" />
+                                <ref role="3cqZAo" node="7oauUzvNtTh" resolve="synaxtDirectedInputSort" />
                               </node>
                             </node>
                             <node concept="3TrEf2" id="7oauUzvNtSO" role="2OqNvi">
@@ -7575,13 +7558,13 @@
             </node>
           </node>
           <node concept="3cpWsn" id="7oauUzvNtTh" role="1Duv9x">
-            <property role="TrG5h" value="nonUserInputSort" />
+            <property role="TrG5h" value="synaxtDirectedInputSort" />
             <node concept="3Tqbb2" id="7oauUzvNtTi" role="1tU5fm">
               <ref role="ehGHo" to="b83y:2U2uJPpd5x5" resolve="Sort" />
             </node>
           </node>
           <node concept="37vLTw" id="7oauUzvNtTj" role="1DdaDG">
-            <ref role="3cqZAo" node="7oauUzvNtSe" resolve="nonUserInputSortsOfConclusion" />
+            <ref role="3cqZAo" node="7oauUzvNtSe" resolve="syntaxDirectedInputSortsOfConclusion" />
           </node>
         </node>
         <node concept="3cpWs6" id="7oauUzvNT3$" role="3cqZAp">
@@ -7746,8 +7729,8 @@
                   <node concept="37vLTw" id="7oauUzurV96" role="2Oq$k0">
                     <ref role="3cqZAo" node="7oauUzuqUhQ" resolve="declaration" />
                   </node>
-                  <node concept="2qgKlT" id="7oauUzurV97" role="2OqNvi">
-                    <ref role="37wK5l" to="pgas:2iwoW_qn4iq" resolve="getNonUserInputSorts" />
+                  <node concept="2qgKlT" id="1t5MWi4asD8" role="2OqNvi">
+                    <ref role="37wK5l" to="pgas:1t5MWi48XT4" resolve="getSyntaxDirectedInputSorts" />
                   </node>
                 </node>
               </node>
@@ -8148,7 +8131,7 @@
           <node concept="3clFbS" id="7oauUztvRkQ" role="2LFqv$">
             <node concept="3cpWs8" id="7oauUztw1W4" role="3cqZAp">
               <node concept="3cpWsn" id="7oauUztw1W5" role="3cpWs9">
-                <property role="TrG5h" value="nonUserInputSorts" />
+                <property role="TrG5h" value="syntaxDirectedInputSorts" />
                 <node concept="2I9FWS" id="7oauUztw1W3" role="1tU5fm">
                   <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
                 </node>
@@ -8156,8 +8139,8 @@
                   <node concept="37vLTw" id="7oauUztw1W7" role="2Oq$k0">
                     <ref role="3cqZAo" node="7oauUztvRkR" resolve="declaration" />
                   </node>
-                  <node concept="2qgKlT" id="7oauUztw1W8" role="2OqNvi">
-                    <ref role="37wK5l" to="pgas:2iwoW_qn4iq" resolve="getNonUserInputSorts" />
+                  <node concept="2qgKlT" id="1t5MWi4aumn" role="2OqNvi">
+                    <ref role="37wK5l" to="pgas:1t5MWi48XT4" resolve="getSyntaxDirectedInputSorts" />
                   </node>
                 </node>
               </node>
@@ -8259,7 +8242,7 @@
               </node>
               <node concept="2OqwBi" id="7oauUztw7G_" role="1DdaDG">
                 <node concept="37vLTw" id="7oauUztw4x$" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7oauUztw1W5" resolve="nonUserInputSorts" />
+                  <ref role="3cqZAo" node="7oauUztw1W5" resolve="syntaxDirectedInputSorts" />
                 </node>
                 <node concept="35Qw8J" id="7oauUztw9Yf" role="2OqNvi" />
               </node>
@@ -8425,7 +8408,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="6OMXo1UBcFI" role="jymVt" />
+    <node concept="2tJIrI" id="1t5MWi40iIf" role="jymVt" />
     <node concept="312cEg" id="6OMXo1STrIX" role="jymVt">
       <property role="TrG5h" value="gencontext" />
       <node concept="3Tm6S6" id="6OMXo1STqvK" role="1B3o_S" />
diff --git a/inca-translation/languages/TypeLang/generator/template/main@generator.mps b/inca-translation/languages/TypeLang/generator/template/main@generator.mps
index 46bb7c0..c13b2dc 100644
--- a/inca-translation/languages/TypeLang/generator/template/main@generator.mps
+++ b/inca-translation/languages/TypeLang/generator/template/main@generator.mps
@@ -88,9 +88,7 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
@@ -820,9 +818,7 @@
     <node concept="avzCv" id="7TgNhRbqOho" role="avys_">
       <node concept="3clFbS" id="7TgNhRbqOhp" role="2VODD2">
         <node concept="3cpWs6" id="7TgNhRbqOoJ" role="3cqZAp">
-          <node concept="3clFbT" id="7TgNhRbqOwf" role="3cqZAk">
-            <property role="3clFbU" value="true" />
-          </node>
+          <node concept="3clFbT" id="7TgNhRbqOwf" role="3cqZAk" />
         </node>
       </node>
     </node>
diff --git a/inca-translation/languages/TypeLang/models/behavior.mps b/inca-translation/languages/TypeLang/models/behavior.mps
index 8143b8b..f6653e0 100644
--- a/inca-translation/languages/TypeLang/models/behavior.mps
+++ b/inca-translation/languages/TypeLang/models/behavior.mps
@@ -1018,6 +1018,47 @@
         <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
       </node>
     </node>
+    <node concept="13i0hz" id="1t5MWi48XT4" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getSyntaxDirectedInputSorts" />
+      <node concept="3Tm1VV" id="1t5MWi48XT5" role="1B3o_S" />
+      <node concept="3clFbS" id="1t5MWi48XT6" role="3clF47">
+        <node concept="3clFbF" id="1t5MWi48XT7" role="3cqZAp">
+          <node concept="2OqwBi" id="1t5MWi48XT8" role="3clFbG">
+            <node concept="2OqwBi" id="1t5MWi48XT9" role="2Oq$k0">
+              <node concept="BsUDl" id="1t5MWi48XTa" role="2Oq$k0">
+                <ref role="37wK5l" node="4XA4NEmGQRd" resolve="getSorts" />
+              </node>
+              <node concept="3zZkjj" id="1t5MWi48XTb" role="2OqNvi">
+                <node concept="1bVj0M" id="1t5MWi48XTc" role="23t8la">
+                  <node concept="3clFbS" id="1t5MWi48XTd" role="1bW5cS">
+                    <node concept="3clFbF" id="1t5MWi48XTe" role="3cqZAp">
+                      <node concept="2OqwBi" id="1t5MWi48XTf" role="3clFbG">
+                        <node concept="37vLTw" id="1t5MWi48XTg" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1t5MWi48XTi" resolve="it" />
+                        </node>
+                        <node concept="2qgKlT" id="1t5MWi492kY" role="2OqNvi">
+                          <ref role="37wK5l" node="1t5MWi491jl" resolve="isSyntaxDirectedInput" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="1t5MWi48XTi" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="1t5MWi48XTj" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="1t5MWi48XTk" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="2I9FWS" id="1t5MWi48XTl" role="3clF45">
+        <ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
+      </node>
+    </node>
     <node concept="13i0hz" id="2iwoW_qn4iq" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
@@ -1087,15 +1128,7 @@
                 <node concept="1bVj0M" id="7oauUzs6kXO" role="23t8la">
                   <node concept="3clFbS" id="7oauUzs6kXP" role="1bW5cS">
                     <node concept="3clFbF" id="7oauUzs6kXQ" role="3cqZAp">
-                      <node concept="22lmx$" id="7oauUzscwsg" role="3clFbG">
-                        <node concept="2OqwBi" id="7oauUzsgrzy" role="3uHU7B">
-                          <node concept="37vLTw" id="7oauUzsgrzz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7oauUzs6kXZ" resolve="it" />
-                          </node>
-                          <node concept="2qgKlT" id="7oauUzsgrz$" role="2OqNvi">
-                            <ref role="37wK5l" node="2U2uJPpeU0b" resolve="isInfiniteNonlatticeOutput" />
-                          </node>
-                        </node>
+                      <node concept="22lmx$" id="1t5MWi4fV1E" role="3clFbG">
                         <node concept="1eOMI4" id="7oauUzsgrz_" role="3uHU7w">
                           <node concept="1Wc70l" id="7oauUzsgrzA" role="1eOMHV">
                             <node concept="3fqX7Q" id="7oauUzsgrzB" role="3uHU7w">
@@ -1118,6 +1151,24 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="22lmx$" id="7oauUzscwsg" role="3uHU7B">
+                          <node concept="2OqwBi" id="7oauUzsgrzy" role="3uHU7B">
+                            <node concept="37vLTw" id="7oauUzsgrzz" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7oauUzs6kXZ" resolve="it" />
+                            </node>
+                            <node concept="2qgKlT" id="7oauUzsgrz$" role="2OqNvi">
+                              <ref role="37wK5l" node="2U2uJPpeU0b" resolve="isInfiniteNonlatticeOutput" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="1t5MWi4fVq8" role="3uHU7w">
+                            <node concept="37vLTw" id="1t5MWi4fVbY" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7oauUzs6kXZ" resolve="it" />
+                            </node>
+                            <node concept="2qgKlT" id="1t5MWi4fVID" role="2OqNvi">
+                              <ref role="37wK5l" node="1t5MWi491jl" resolve="isSyntaxDirectedInput" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -6547,30 +6598,45 @@
       <node concept="10P_77" id="2U2uJPpEtu3" role="3clF45" />
       <node concept="3clFbS" id="2U2uJPpEtkx" role="3clF47">
         <node concept="3clFbF" id="2U2uJPpEtuo" role="3cqZAp">
-          <node concept="22lmx$" id="2U2uJPpEuMh" role="3clFbG">
-            <node concept="2OqwBi" id="2U2uJPpEw91" role="3uHU7w">
-              <node concept="2OqwBi" id="2U2uJPpEv0j" role="2Oq$k0">
-                <node concept="13iPFW" id="2U2uJPpEuR6" role="2Oq$k0" />
-                <node concept="3TrEf2" id="2U2uJPpEv7z" role="2OqNvi">
+          <node concept="22lmx$" id="1t5MWi4iNxZ" role="3clFbG">
+            <node concept="2OqwBi" id="1t5MWi4iOhx" role="3uHU7w">
+              <node concept="2OqwBi" id="1t5MWi4iNMO" role="2Oq$k0">
+                <node concept="13iPFW" id="1t5MWi4iNCp" role="2Oq$k0" />
+                <node concept="3TrEf2" id="1t5MWi4iO73" role="2OqNvi">
                   <ref role="3Tt5mk" to="b83y:2_58u12cYDi" resolve="mode" />
                 </node>
               </node>
-              <node concept="1mIQ4w" id="2U2uJPpEwwU" role="2OqNvi">
-                <node concept="chp4Y" id="2U2uJPpEwD4" role="cj9EA">
-                  <ref role="cht4Q" to="b83y:6G$bWLkspQH" resolve="SortUserMode" />
+              <node concept="1mIQ4w" id="1t5MWi4iOZ9" role="2OqNvi">
+                <node concept="chp4Y" id="1t5MWi4iP8e" role="cj9EA">
+                  <ref role="cht4Q" to="b83y:1t5MWi448Ws" resolve="SortSyntaxMode" />
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="2U2uJPpEu36" role="3uHU7B">
-              <node concept="2OqwBi" id="2U2uJPpEtB3" role="2Oq$k0">
-                <node concept="13iPFW" id="2U2uJPpEtun" role="2Oq$k0" />
-                <node concept="3TrEf2" id="2U2uJPpEtO7" role="2OqNvi">
-                  <ref role="3Tt5mk" to="b83y:2_58u12cYDi" resolve="mode" />
+            <node concept="22lmx$" id="2U2uJPpEuMh" role="3uHU7B">
+              <node concept="2OqwBi" id="2U2uJPpEu36" role="3uHU7B">
+                <node concept="2OqwBi" id="2U2uJPpEtB3" role="2Oq$k0">
+                  <node concept="13iPFW" id="2U2uJPpEtun" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="2U2uJPpEtO7" role="2OqNvi">
+                    <ref role="3Tt5mk" to="b83y:2_58u12cYDi" resolve="mode" />
+                  </node>
+                </node>
+                <node concept="1mIQ4w" id="2U2uJPpEul8" role="2OqNvi">
+                  <node concept="chp4Y" id="2U2uJPpEusE" role="cj9EA">
+                    <ref role="cht4Q" to="b83y:2_58u12cYDo" resolve="SortInputMode" />
+                  </node>
                 </node>
               </node>
-              <node concept="1mIQ4w" id="2U2uJPpEul8" role="2OqNvi">
-                <node concept="chp4Y" id="2U2uJPpEusE" role="cj9EA">
-                  <ref role="cht4Q" to="b83y:2_58u12cYDo" resolve="SortInputMode" />
+              <node concept="2OqwBi" id="2U2uJPpEw91" role="3uHU7w">
+                <node concept="2OqwBi" id="2U2uJPpEv0j" role="2Oq$k0">
+                  <node concept="13iPFW" id="2U2uJPpEuR6" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="2U2uJPpEv7z" role="2OqNvi">
+                    <ref role="3Tt5mk" to="b83y:2_58u12cYDi" resolve="mode" />
+                  </node>
+                </node>
+                <node concept="1mIQ4w" id="2U2uJPpEwwU" role="2OqNvi">
+                  <node concept="chp4Y" id="2U2uJPpEwD4" role="cj9EA">
+                    <ref role="cht4Q" to="b83y:6G$bWLkspQH" resolve="SortUserMode" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -6626,6 +6692,30 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="1t5MWi491jl" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="isSyntaxDirectedInput" />
+      <node concept="3Tm1VV" id="1t5MWi491jm" role="1B3o_S" />
+      <node concept="10P_77" id="1t5MWi491jn" role="3clF45" />
+      <node concept="3clFbS" id="1t5MWi491jo" role="3clF47">
+        <node concept="3clFbF" id="1t5MWi491jp" role="3cqZAp">
+          <node concept="2OqwBi" id="1t5MWi491jq" role="3clFbG">
+            <node concept="2OqwBi" id="1t5MWi491jr" role="2Oq$k0">
+              <node concept="13iPFW" id="1t5MWi491js" role="2Oq$k0" />
+              <node concept="3TrEf2" id="1t5MWi491jt" role="2OqNvi">
+                <ref role="3Tt5mk" to="b83y:2_58u12cYDi" resolve="mode" />
+              </node>
+            </node>
+            <node concept="1mIQ4w" id="1t5MWi491ju" role="2OqNvi">
+              <node concept="chp4Y" id="1t5MWi49211" role="cj9EA">
+                <ref role="cht4Q" to="b83y:1t5MWi448Ws" resolve="SortSyntaxMode" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="13hLZK" id="2U2uJPpd7Nn" role="13h7CW">
       <node concept="3clFbS" id="2U2uJPpd7No" role="2VODD2" />
     </node>
diff --git a/inca-translation/languages/TypeLang/models/editor.mps b/inca-translation/languages/TypeLang/models/editor.mps
index 28b8fd9..17ed250 100644
--- a/inca-translation/languages/TypeLang/models/editor.mps
+++ b/inca-translation/languages/TypeLang/models/editor.mps
@@ -919,13 +919,6 @@
       <node concept="3F0A7n" id="2_58u12fi1D" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
       </node>
-      <node concept="1kIj98" id="7TgNhRaYVA2" role="3EZMnx">
-        <node concept="_tjkj" id="7TgNhRaTdkz" role="1kIj9b">
-          <node concept="3F1sOY" id="7TgNhRaTdkX" role="_tjki">
-            <ref role="1NtTu8" to="b83y:7TgNhRaTdk1" resolve="syntaxDirected" />
-          </node>
-        </node>
-      </node>
       <node concept="3F1sOY" id="2_58u12fi1Y" role="3EZMnx">
         <ref role="1NtTu8" to="b83y:2_58u12eLDF" resolve="pre" />
         <node concept="pVoyu" id="2_58u12_ODp" role="3F10Kt">
@@ -954,13 +947,6 @@
       <node concept="3F0A7n" id="2_58u12fi2N" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
       </node>
-      <node concept="1kIj98" id="7TgNhRaYVB_" role="3EZMnx">
-        <node concept="_tjkj" id="7TgNhRaTdlG" role="1kIj9b">
-          <node concept="3F1sOY" id="7TgNhRaTdm6" role="_tjki">
-            <ref role="1NtTu8" to="b83y:7TgNhRaTdk1" resolve="syntaxDirected" />
-          </node>
-        </node>
-      </node>
       <node concept="3F1sOY" id="2_58u12fi2O" role="3EZMnx">
         <ref role="1NtTu8" to="b83y:2_58u12eLE1" resolve="pre" />
         <node concept="pVoyu" id="2_58u12mvLm" role="3F10Kt">
@@ -995,13 +981,6 @@
       <node concept="3F0A7n" id="2_58u12fi4l" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
       </node>
-      <node concept="1kIj98" id="7TgNhRaWbDu" role="3EZMnx">
-        <node concept="_tjkj" id="7TgNhRaTdmX" role="1kIj9b">
-          <node concept="3F1sOY" id="7TgNhRaTdnv" role="_tjki">
-            <ref role="1NtTu8" to="b83y:7TgNhRaTdk1" resolve="syntaxDirected" />
-          </node>
-        </node>
-      </node>
       <node concept="3F1sOY" id="2_58u12fi4m" role="3EZMnx">
         <ref role="1NtTu8" to="b83y:2_58u12eLEc" resolve="pre" />
         <node concept="pVoyu" id="2_58u12mvL8" role="3F10Kt">
@@ -1532,13 +1511,6 @@
       <node concept="3F0A7n" id="2U2uJPq3W7J" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
       </node>
-      <node concept="1kIj98" id="7TgNhRaYV$x" role="3EZMnx">
-        <node concept="_tjkj" id="7TgNhRaYV_7" role="1kIj9b">
-          <node concept="3F1sOY" id="7TgNhRaYV_j" role="_tjki">
-            <ref role="1NtTu8" to="b83y:7TgNhRaTdk1" resolve="syntaxDirected" />
-          </node>
-        </node>
-      </node>
       <node concept="3F1sOY" id="2U2uJPq3W7K" role="3EZMnx">
         <ref role="1NtTu8" to="b83y:2U2uJPq3W77" resolve="pre" />
         <node concept="pVoyu" id="2U2uJPq3W7L" role="3F10Kt">
@@ -1840,5 +1812,13 @@
       <property role="3F0ifm" value="syntax directed" />
     </node>
   </node>
+  <node concept="24kQdi" id="1t5MWi448WT">
+    <property role="3GE5qa" value="judgment" />
+    <ref role="1XX52x" to="b83y:1t5MWi448Ws" resolve="SortSyntaxMode" />
+    <node concept="PMmxH" id="1t5MWi448WZ" role="2wV5jI">
+      <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      <ref role="1k5W1q" to="tpen:hshU_KJ" resolve="Annotation" />
+    </node>
+  </node>
 </model>
 
diff --git a/inca-translation/languages/TypeLang/models/structure.mps b/inca-translation/languages/TypeLang/models/structure.mps
index 169da4c..d061a97 100644
--- a/inca-translation/languages/TypeLang/models/structure.mps
+++ b/inca-translation/languages/TypeLang/models/structure.mps
@@ -223,12 +223,6 @@
     <node concept="PrWs8" id="2_58u12khG6" role="PrDN$">
       <ref role="PrY4T" node="2_58u12khFL" resolve="TypeLangModuleContent" />
     </node>
-    <node concept="1TJgyj" id="7TgNhRaTdk1" role="1TKVEi">
-      <property role="IQ2ns" value="9102000374757512449" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="syntaxDirected" />
-      <ref role="20lvS9" node="7TgNhRaTdk0" resolve="SyntaxDirectedFlag" />
-    </node>
   </node>
   <node concept="1TIwiD" id="2_58u12eLE0">
     <property role="EcuMT" value="2973820376015641216" />
@@ -866,5 +860,15 @@
     <property role="34LRSv" value="syntax directed" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
+  <node concept="1TIwiD" id="1t5MWi448Ws">
+    <property role="EcuMT" value="1676970481155084060" />
+    <property role="3GE5qa" value="judgment" />
+    <property role="TrG5h" value="SortSyntaxMode" />
+    <property role="34LRSv" value="syntax" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="1t5MWi448Wt" role="PzmwI">
+      <ref role="PrY4T" node="2_58u12cYDn" resolve="SortMode" />
+    </node>
+  </node>
 </model>
 
diff --git a/inca-translation/solutions/TypeLangTest/models/test_single.mps b/inca-translation/solutions/TypeLangTest/models/test_single.mps
index ae617f1..533ce68 100644
--- a/inca-translation/solutions/TypeLangTest/models/test_single.mps
+++ b/inca-translation/solutions/TypeLangTest/models/test_single.mps
@@ -7,7 +7,6 @@
   <imports>
     <import index="5va7" ref="r:568f7667-a603-4374-adfa-c84f4fd5dac3(STLCN.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71" name="TypeLang">
@@ -19,7 +18,7 @@
         <reference id="1925259677761400369" name="interfacePart" index="3zVwH8" />
         <child id="7089330371250923106" name="pattern" index="bFJCb" />
       </concept>
-      <concept id="9102000374757512448" name="TypeLang.structure.SyntaxDirectedFlag" flags="ng" index="2OH1wt" />
+      <concept id="1676970481155084060" name="TypeLang.structure.SortSyntaxMode" flags="ng" index="2jlkjo" />
       <concept id="7720348215856438701" name="TypeLang.structure.SortUserMode" flags="ng" index="Zlr9x" />
       <concept id="2973820376017083148" name="TypeLang.structure.EmptyContent" flags="ng" index="1F53FG" />
       <concept id="2973820376019395340" name="TypeLang.structure.JudgmentInstanceEq" flags="ng" index="1FckbG">
@@ -50,9 +49,6 @@
         <child id="2973820376015642566" name="delimiter3" index="1FvzSA" />
         <child id="2973820376015642543" name="delimiter1" index="1FvzTf" />
       </concept>
-      <concept id="2973820376015641198" name="TypeLang.structure.JudgmentDeclaration" flags="ng" index="1FvzIe">
-        <child id="9102000374757512449" name="syntaxDirected" index="2OH1ws" />
-      </concept>
       <concept id="2973820376015655883" name="TypeLang.structure.JudgmentInstance3" flags="ng" index="1FvB8F">
         <reference id="2973820376015655884" name="judgment" index="1FvB8G" />
         <child id="2973820376015655885" name="arg1" index="1FvB8H" />
@@ -80,55 +76,54 @@
   </registry>
   <node concept="1FtGHe" id="6G$bWLkr_bd">
     <property role="TrG5h" value="BidirectionalSTLCN_1" />
-    <node concept="1FvzHF" id="7TgNhRaYE_Y" role="1FufQt">
+    <node concept="1FvzHF" id="6G$bWLkr_bf" role="1FufQt">
       <property role="TrG5h" value="infer" />
-      <node concept="2OH1wt" id="7TgNhRaYE_W" role="2OH1ws" />
-      <node concept="1FtGIX" id="7TgNhRaYEHH" role="1FvzHG" />
-      <node concept="1FtGBS" id="7TgNhRaYEHK" role="1FvzHH">
+      <node concept="1FtGIX" id="6G$bWLkr_bg" role="1FvzHG" />
+      <node concept="1FtGBS" id="6G$bWLkr_bh" role="1FvzHH">
         <ref role="1FtGBW" to="5va7:2_58u12slaZ" resolve="Context" />
-        <node concept="1FtGIS" id="7TgNhRaYEHQ" role="1FtGIM" />
+        <node concept="2jlkjo" id="1t5MWi46nRd" role="1FtGIM" />
       </node>
-      <node concept="1FtGIX" id="7TgNhRaYEHU" role="1FvzTf">
+      <node concept="1FtGIX" id="6G$bWLkr_bj" role="1FvzTf">
         <property role="1FtGIY" value="|-" />
       </node>
-      <node concept="1FtGBS" id="7TgNhRaYEHX" role="1FvzHI">
+      <node concept="1FtGBS" id="6G$bWLkr_bk" role="1FvzHI">
         <ref role="1FtGBW" to="5va7:1Da9ityUTbh" resolve="Term" />
-        <node concept="Zlr9x" id="7TgNhRaYEI3" role="1FtGIM" />
+        <node concept="Zlr9x" id="2U2uJPpfXqa" role="1FtGIM" />
       </node>
-      <node concept="1FtGIX" id="7TgNhRaYEI7" role="1FsQh1">
+      <node concept="1FtGIX" id="6G$bWLkr_bm" role="1FsQh1">
         <property role="1FtGIY" value="=&gt;" />
       </node>
-      <node concept="1FtGBS" id="7TgNhRaYEIa" role="1FvzHK">
-        <ref role="1FtGBW" to="tpee:fz3vP1H" resolve="Type" />
-        <node concept="1FtGIT" id="7TgNhRaYEIg" role="1FtGIM" />
+      <node concept="1FtGBS" id="6G$bWLkr_bn" role="1FvzHK">
+        <ref role="1FtGBW" to="5va7:1Da9ityUTef" resolve="Type" />
+        <node concept="1FtGIT" id="2U2uJPpfXqd" role="1FtGIM" />
       </node>
-      <node concept="1FtGIX" id="7TgNhRaYEIk" role="1FvzSA" />
+      <node concept="1FtGIX" id="6G$bWLkr_bp" role="1FvzSA" />
     </node>
-    <node concept="1FvzHF" id="7TgNhRaYFBG" role="1FufQt">
+    <node concept="1FvzHF" id="6G$bWLkr_bq" role="1FufQt">
       <property role="TrG5h" value="check" />
-      <node concept="2OH1wt" id="7TgNhRaYFBE" role="2OH1ws" />
-      <node concept="1FtGIX" id="7TgNhRaYFJL" role="1FvzHG" />
-      <node concept="1FtGBS" id="7TgNhRaYFJO" role="1FvzHH">
+      <node concept="1FtGIX" id="6G$bWLkr_br" role="1FvzHG" />
+      <node concept="1FtGBS" id="6G$bWLkr_bs" role="1FvzHH">
         <ref role="1FtGBW" to="5va7:2_58u12slaZ" resolve="Context" />
-        <node concept="1FtGIS" id="7TgNhRaYFJU" role="1FtGIM" />
+        <node concept="2jlkjo" id="1t5MWi46nRh" role="1FtGIM" />
       </node>
-      <node concept="1FtGIX" id="7TgNhRaYFJY" role="1FvzTf">
+      <node concept="1FtGIX" id="6G$bWLkr_bu" role="1FvzTf">
         <property role="1FtGIY" value="|-" />
       </node>
-      <node concept="1FtGBS" id="7TgNhRaYFK1" role="1FvzHI">
+      <node concept="1FtGBS" id="6G$bWLkr_bv" role="1FvzHI">
         <ref role="1FtGBW" to="5va7:1Da9ityUTbh" resolve="Term" />
-        <node concept="Zlr9x" id="7TgNhRaYFK7" role="1FtGIM" />
+        <node concept="Zlr9x" id="2U2uJPpfXB3" role="1FtGIM" />
       </node>
-      <node concept="1FtGIX" id="7TgNhRaYFKb" role="1FsQh1">
+      <node concept="1FtGIX" id="6G$bWLkr_bx" role="1FsQh1">
         <property role="1FtGIY" value="&lt;=" />
       </node>
-      <node concept="1FtGBS" id="7TgNhRaYFKe" role="1FvzHK">
-        <ref role="1FtGBW" to="tpee:fz3vP1H" resolve="Type" />
-        <node concept="1FtGIS" id="7TgNhRaYFKk" role="1FtGIM" />
+      <node concept="1FtGBS" id="6G$bWLkr_by" role="1FvzHK">
+        <ref role="1FtGBW" to="5va7:1Da9ityUTef" resolve="Type" />
+        <node concept="2jlkjo" id="1t5MWi46nRl" role="1FtGIM" />
       </node>
-      <node concept="1FtGIX" id="7TgNhRaYFKo" role="1FvzSA" />
+      <node concept="1FtGIX" id="6G$bWLkr_b$" role="1FvzSA" />
     </node>
     <node concept="1F53FG" id="6G$bWLkr_be" role="1FufQt" />
+    <node concept="1F53FG" id="1t5MWi46nxK" role="1FufQt" />
     <node concept="1FvzHF" id="6G$bWLkr_b_" role="1FufQt">
       <property role="TrG5h" value="lookup" />
       <node concept="1FtGIX" id="6G$bWLkr_bA" role="1FvzHG">
@@ -182,7 +177,7 @@
     <node concept="1FvUVj" id="6G$bWLkr_bX" role="1FufQt">
       <property role="TrG5h" value="infer Zero" />
       <node concept="1FvB8F" id="6G$bWLkr_bY" role="1FvUUP">
-        <ref role="1FvB8G" node="7TgNhRaYE_Y" resolve="infer" />
+        <ref role="1FvB8G" node="6G$bWLkr_bf" resolve="infer" />
         <node concept="1FvUUU" id="6G$bWLkr_bZ" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -198,7 +193,7 @@
     <node concept="1FvUVj" id="6G$bWLkr_c3" role="1FufQt">
       <property role="TrG5h" value="infer Succ" />
       <node concept="1FvB8F" id="6G$bWLkr_c4" role="1FvUUP">
-        <ref role="1FvB8G" node="7TgNhRaYE_Y" resolve="infer" />
+        <ref role="1FvB8G" node="6G$bWLkr_bf" resolve="infer" />
         <node concept="1FvUUU" id="6G$bWLkr_c5" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -216,7 +211,7 @@
         </node>
       </node>
       <node concept="1FvB8F" id="6G$bWLkr_ca" role="1FvUVk">
-        <ref role="1FvB8G" node="7TgNhRaYFBG" resolve="check" />
+        <ref role="1FvB8G" node="6G$bWLkr_bq" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLkr_cb" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -232,7 +227,7 @@
     <node concept="1FvUVj" id="6G$bWLkr_cf" role="1FufQt">
       <property role="TrG5h" value="infer Var" />
       <node concept="1FvB8F" id="6G$bWLkr_cg" role="1FvUUP">
-        <ref role="1FvB8G" node="7TgNhRaYE_Y" resolve="infer" />
+        <ref role="1FvB8G" node="6G$bWLkr_bf" resolve="infer" />
         <node concept="1FvUUU" id="6G$bWLkr_ch" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -265,7 +260,7 @@
     <node concept="1FvUVj" id="6G$bWLkr_cr" role="1FufQt">
       <property role="TrG5h" value="infer Anno" />
       <node concept="1FvB8F" id="6G$bWLkr_cs" role="1FvUUP">
-        <ref role="1FvB8G" node="7TgNhRaYE_Y" resolve="infer" />
+        <ref role="1FvB8G" node="6G$bWLkr_bf" resolve="infer" />
         <node concept="1FvUUU" id="6G$bWLkr_ct" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -289,7 +284,7 @@
         </node>
       </node>
       <node concept="1FvB8F" id="6G$bWLkr_c$" role="1FvUVk">
-        <ref role="1FvB8G" node="7TgNhRaYFBG" resolve="check" />
+        <ref role="1FvB8G" node="6G$bWLkr_bq" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLkr_c_" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -305,7 +300,7 @@
     <node concept="1FvUVj" id="6G$bWLkr_cD" role="1FufQt">
       <property role="TrG5h" value="infer App" />
       <node concept="1FvB8F" id="6G$bWLkr_cE" role="1FvUUP">
-        <ref role="1FvB8G" node="7TgNhRaYE_Y" resolve="infer" />
+        <ref role="1FvB8G" node="6G$bWLkr_bf" resolve="infer" />
         <node concept="1FvUUU" id="6G$bWLkr_cF" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -329,7 +324,7 @@
         </node>
       </node>
       <node concept="1FvB8F" id="6G$bWLkr_cM" role="1FvUVk">
-        <ref role="1FvB8G" node="7TgNhRaYE_Y" resolve="infer" />
+        <ref role="1FvB8G" node="6G$bWLkr_bf" resolve="infer" />
         <node concept="1FvUUU" id="6G$bWLkr_cN" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -353,7 +348,7 @@
         </node>
       </node>
       <node concept="1FvB8F" id="6G$bWLkr_cU" role="1FvUVk">
-        <ref role="1FvB8G" node="7TgNhRaYFBG" resolve="check" />
+        <ref role="1FvB8G" node="6G$bWLkr_bq" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLkr_cV" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -369,7 +364,7 @@
     <node concept="1FvUVj" id="6G$bWLkr_cZ" role="1FufQt">
       <property role="TrG5h" value="infer Parens" />
       <node concept="1FvB8F" id="6G$bWLkr_d0" role="1FvUUP">
-        <ref role="1FvB8G" node="7TgNhRaYE_Y" resolve="infer" />
+        <ref role="1FvB8G" node="6G$bWLkr_bf" resolve="infer" />
         <node concept="1FvUUU" id="6G$bWLkr_d1" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -387,7 +382,7 @@
         </node>
       </node>
       <node concept="1FvB8F" id="6G$bWLkr_d6" role="1FvUVk">
-        <ref role="1FvB8G" node="7TgNhRaYE_Y" resolve="infer" />
+        <ref role="1FvB8G" node="6G$bWLkr_bf" resolve="infer" />
         <node concept="1FvUUU" id="6G$bWLkr_d7" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -405,7 +400,7 @@
     <node concept="1FvUVj" id="6G$bWLkr_dd" role="1FufQt">
       <property role="TrG5h" value="check Lam" />
       <node concept="1FvB8F" id="6G$bWLkr_de" role="1FvUUP">
-        <ref role="1FvB8G" node="7TgNhRaYFBG" resolve="check" />
+        <ref role="1FvB8G" node="6G$bWLkr_bq" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLkr_df" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -441,7 +436,7 @@
         </node>
       </node>
       <node concept="1FvB8F" id="6G$bWLkr_dq" role="1FvUVk">
-        <ref role="1FvB8G" node="7TgNhRaYFBG" resolve="check" />
+        <ref role="1FvB8G" node="6G$bWLkr_bq" resolve="check" />
         <node concept="27Pwox" id="6G$bWLkr_dr" role="1FvB8H">
           <ref role="1F1YRu" to="5va7:2_58u12e1eN" resolve="Bind" />
           <node concept="bFJCQ" id="6G$bWLkr_ds" role="27Pwov">
@@ -475,7 +470,7 @@
     <node concept="1FvUVj" id="6G$bWLkr_d_" role="1FufQt">
       <property role="TrG5h" value="check inferred" />
       <node concept="1FvB8F" id="6G$bWLkr_dA" role="1FvUUP">
-        <ref role="1FvB8G" node="7TgNhRaYFBG" resolve="check" />
+        <ref role="1FvB8G" node="6G$bWLkr_bq" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLkr_dB" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
@@ -487,7 +482,7 @@
         </node>
       </node>
       <node concept="1FvB8F" id="6G$bWLkr_dE" role="1FvUVk">
-        <ref role="1FvB8G" node="7TgNhRaYE_Y" resolve="infer" />
+        <ref role="1FvB8G" node="6G$bWLkr_bf" resolve="infer" />
         <node concept="1FvUUU" id="6G$bWLkr_dF" role="1FvB8H">
           <property role="TrG5h" value="C" />
         </node>
-- 
GitLab