- Add scope judgment references.

- Add check for cycles in judgment input sorts

inca-translation/languages/FORecursiveTypes/FORecursiveTypes.mpl

@@ -89,7 +89,6 @@
     <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />

inca-translation/languages/NewLanguage/SumTypes.mpl

@@ -89,7 +89,6 @@
     <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />

inca-translation/languages/ProductTypes/ProductTypes.mpl

@@ -89,7 +89,6 @@
     <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />

inca-translation/languages/RecordTypes/RecordTypes.mpl

@@ -89,7 +89,6 @@
     <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />

inca-translation/languages/STLCN/STLCN.mpl

@@ -89,7 +89,6 @@
     <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />

inca-translation/languages/TypeLang/TypeLang.mpl

@@ -53,6 +53,8 @@
     <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>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="0" />

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

@@ -9,7 +9,7 @@
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="z9af" ref="r:92efe085-3295-42c0-bd7e-2ea049fae522(org.inca.extensions.structure)" />
-    <import index="b83y" ref="r:63340c72-1a1f-4a8d-acb4-c73b4c9c590a(TypeLang.structure)" implicit="true" />
+    <import index="b83y" ref="r:63340c72-1a1f-4a8d-acb4-c73b4c9c590a(TypeLang.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" 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" />
@@ -123,6 +123,9 @@
       </concept>
       <concept id="1212096972063" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyValidator" flags="in" index="QB0g5" />
       <concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
+      <concept id="8401916545537438642" name="jetbrains.mps.lang.constraints.structure.InheritedNodeScopeFactory" flags="ng" index="1dDu$B">
+        <reference id="8401916545537438643" name="kind" index="1dDu$A" />
+      </concept>
       <concept id="1163200647017" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_referenceNode" flags="nn" index="3kakTB" />
       <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
         <reference id="1213093996982" name="concept" index="1M2myG" />
@@ -404,6 +407,32 @@
   <node concept="1M2fIO" id="6G$bWLksoXm">
     <property role="3GE5qa" value="judgment" />
     <ref role="1M2myG" to="b83y:2_58u12eCWR" resolve="JudgmentInstance1" />
+    <node concept="1N5Pfh" id="2_58u12$Ann" role="1Mr941">
+      <ref role="1N5Vy1" to="b83y:2_58u12eCWS" resolve="judgment" />
+      <node concept="1dDu$B" id="2_58u12AyzM" role="1N6uqs">
+        <ref role="1dDu$A" to="b83y:2_58u12eLDE" resolve="JudgmentDeclaration1" />
+      </node>
+    </node>
+  </node>
+  <node concept="1M2fIO" id="2_58u12AErI">
+    <property role="3GE5qa" value="judgment" />
+    <ref role="1M2myG" to="b83y:2_58u12eNuo" resolve="JudgmentInstance2" />
+    <node concept="1N5Pfh" id="2_58u12AErJ" role="1Mr941">
+      <ref role="1N5Vy1" to="b83y:2_58u12eNup" resolve="judgment" />
+      <node concept="1dDu$B" id="2_58u12AErM" role="1N6uqs">
+        <ref role="1dDu$A" to="b83y:2_58u12eLE0" resolve="JudgmentDeclaration2" />
+      </node>
+    </node>
+  </node>
+  <node concept="1M2fIO" id="2_58u12AErP">
+    <property role="3GE5qa" value="judgment" />
+    <ref role="1M2myG" to="b83y:2_58u12ePfb" resolve="JudgmentInstance3" />
+    <node concept="1N5Pfh" id="2_58u12AErQ" role="1Mr941">
+      <ref role="1N5Vy1" to="b83y:2_58u12ePfc" resolve="judgment" />
+      <node concept="1dDu$B" id="2_58u12AErT" role="1N6uqs">
+        <ref role="1dDu$A" to="b83y:2_58u12eLEb" resolve="JudgmentDeclaration3" />
+      </node>
+    </node>
   </node>
 </model>
 

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

@@ -197,7 +197,7 @@
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
         <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
+        <property id="709746936026609029" name="linkRole" index="3V$3am" />
       </concept>
       <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
         <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
@@ -848,6 +848,12 @@
       </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">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="lj46D" id="2_58u12_ODq" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="3F1sOY" id="2_58u12fi2f" role="3EZMnx">
         <ref role="1NtTu8" to="b83y:2_58u12eLDS" resolve="sort1" />

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

@@ -121,6 +121,9 @@
     <node concept="PrWs8" id="2_58u12cYEW" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
+    <node concept="PrWs8" id="2_58u12AyzU" role="PzmwI">
+      <ref role="PrY4T" to="tpck:3fifI_xCcJN" resolve="ScopeProvider" />
+    </node>
   </node>
   <node concept="1TIwiD" id="2_58u12eCWN">
     <property role="EcuMT" value="2973820376015605555" />

inca-translation/languages/VariantTypes/VariantTypes.mpl

@@ -89,7 +89,6 @@
     <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />

inca-translation/solutions/FORecursiveTypes_Checker/FORecursiveTypes_Checker.msd

@@ -55,7 +55,6 @@
     <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="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" 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="642f71f8-327a-425b-84f9-44ad58786d27(jetbrains.mps.lang.project.modules)" version="0" />

inca-translation/solutions/RecordTypes_Checker/RecordTypes_Checker.msd

@@ -60,7 +60,6 @@
     <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="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" version="0" />
-    <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" 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" />

inca-translation/solutions/STLCN_Checker/STLCN_Checker.msd

@@ -46,7 +46,6 @@
     <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" 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" />

inca-translation/solutions/SumTypes_Checker/SumTypes_Checker.msd

@@ -50,7 +50,6 @@
     <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" 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" />

inca-translation/solutions/TypeLangTest/models/test.mps

@@ -110,7 +110,7 @@
       <node concept="1FtGIX" id="2_58u12mvK9" role="1FvzSA" />
     </node>
     <node concept="1FvzHw" id="6G$bWLkr_oa" role="1FufQt">
-      <property role="TrG5h" value="check_notype" />
+      <property role="TrG5h" value="check" />
       <node concept="1FtGIX" id="6G$bWLkr_oc" role="1FvzHx" />
       <node concept="1FtGBS" id="6G$bWLkr_oe" role="1FvzHy">
         <ref role="1FtGBW" to="5va7:2_58u12slaZ" resolve="Context" />
@@ -234,7 +234,7 @@
         </node>
       </node>
       <node concept="1FvxpS" id="6G$bWLksp0E" role="1FvUVk">
-        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check_notype" />
+        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLksp1j" role="1FvxpU">
           <property role="TrG5h" value="C" />
         </node>
@@ -368,7 +368,7 @@
         </node>
       </node>
       <node concept="1FvxpS" id="6G$bWLkspkN" role="1FvUVk">
-        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check_notype" />
+        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLksplL" role="1FvxpU">
           <property role="TrG5h" value="C" />
         </node>
@@ -441,7 +441,7 @@
         </node>
       </node>
       <node concept="1FvxpS" id="6G$bWLksptS" role="1FvUVk">
-        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check_notype" />
+        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLkspv_" role="1FvxpV">
           <property role="TrG5h" value="t" />
         </node>
@@ -468,7 +468,7 @@
         </node>
       </node>
       <node concept="1FvxpS" id="6G$bWLkspnB" role="1FvUUP">
-        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check_notype" />
+        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLkspo1" role="1FvxpU">
           <property role="TrG5h" value="C" />
         </node>
@@ -530,7 +530,7 @@
         </node>
       </node>
       <node concept="1FvxpS" id="6G$bWLkspmA" role="1FvUUP">
-        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check_notype" />
+        <ref role="1FvxpT" node="6G$bWLkr_oa" resolve="check" />
         <node concept="1FvUUU" id="6G$bWLkspn0" role="1FvxpU">
           <property role="TrG5h" value="C" />
         </node>
@@ -696,7 +696,7 @@
       </node>
       <node concept="1FtGBS" id="6G$bWLkr_bv" role="1FvzHI">
         <ref role="1FtGBW" to="5va7:1Da9ityUTbh" resolve="Term" />
-        <node concept="Zlr9x" id="6G$bWLktexH" role="1FtGIM" />
+        <node concept="Zlr9x" id="2_58u12BQGh" role="1FtGIM" />
       </node>
       <node concept="1FtGIX" id="6G$bWLkr_bx" role="1FsQh1">
         <property role="1FtGIY" value="&lt;=" />

inca-translation/solutions/VariantTypes_Checker/VariantTypes_Checker.msd

@@ -52,7 +52,6 @@
     <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" 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" />