@7mind.io/baboon 0.0.166 → 0.0.168

package/io.septimalmind.baboon.typer.-Scope-Builder.js

@@ -34,45 +34,45 @@ import * as $j_scala$002ecollection$002eimmutable$002e$002dQueue from "./scala.c
 var $p;
 function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimalmind_baboon_parser_model_RawDefn__Z__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__O($thiz, member, isRoot, gen) {
   if ((member instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace)) {
-    var col = member.JQ;
+    var col = member.K9;
     var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
     var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
     var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
     var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-    var iterator = col.o();
+    var iterator = col.p();
     var good = init;
     var allGood = true;
     while (iterator.f()) {
       var x0 = iterator.e();
-      var x1 = $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimalmind_baboon_parser_model_RawDefn__Z__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__O($thiz, x0.sb(), x0.xr(), gen);
+      var x1 = $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimalmind_baboon_parser_model_RawDefn__Z__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__O($thiz, x0.sk(), x0.xB(), gen);
       if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
         var e = x1.aj;
         allGood = false;
         $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
       } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-        var v = x1.G;
-        good = good.gz(v);
+        var v = x1.H;
+        good = good.gA(v);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
       }
     }
-    var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aT(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.lL);
+    var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), $thiz.lP);
     var r = this$9.a1;
     if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b = r.G;
-      var this$12 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O($thiz, member, b, member, gen, isRoot), $thiz.lL);
+      var b = r.H;
+      var this$12 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O($thiz, member, b, member, gen, isRoot), $thiz.lP);
       var r$1 = this$12.a1;
-      return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$1.G) : r$1);
+      return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$1.H) : r$1);
     } else {
       return r;
     }
   } else if ((member instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt)) {
-    var col$1 = member.D1.bG(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder$0024$0024anonfun$0024build$002dScope$002412.$c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$buildScope$12($thiz)).N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((m$2$2) => $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimalmind_baboon_parser_model_RawDefn__Z__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__O($thiz, m$2$2.afq(), false, gen))));
+    var col$1 = member.De.bG(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder$0024$0024anonfun$0024build$002dScope$002412.$c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$buildScope$12($thiz)).O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((m$2$2) => $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimalmind_baboon_parser_model_RawDefn__Z__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__O($thiz, m$2$2.ag0(), false, gen))));
     var buildR$1 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
     var buildL$1 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
     var init$1 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
     var bad$1 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$1);
-    var iterator$1 = col$1.o();
+    var iterator$1 = col$1.p();
     var good$1 = init$1;
     var allGood$1 = true;
     while (iterator$1.f()) {
@@ -82,32 +82,32 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
         allGood$1 = false;
         $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$1, e$1.ay);
       } else if ((x0$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-        var v$1 = x0$3.G;
-        good$1 = good$1.gz(v$1);
+        var v$1 = x0$3.H;
+        good$1 = good$1.gA(v$1);
       } else {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$3);
       }
     }
-    var this$24 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aT(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$1.bc()))), $thiz.lL);
+    var this$24 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$1 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$1.aS(good$1)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$1.bc()))), $thiz.lP);
     var r$2 = this$24.a1;
     if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b$2 = r$2.G;
-      var this$27 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O($thiz, member, b$2, member, gen, isRoot), $thiz.lL);
+      var b$2 = r$2.H;
+      var this$27 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O($thiz, member, b$2, member, gen, isRoot), $thiz.lP);
       var r$3 = this$27.a1;
-      return ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$3.G) : r$3);
+      return ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$3.H) : r$3);
     } else {
       return r$2;
     }
   } else if ((member instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dService.$c_Lio_septimalmind_baboon_parser_model_RawService)) {
-    var this$32 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(new $j_java$002elang$002e$002dObject.$c_s_util_Right(member.Di.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), defn$2$2, defn$2$2.De.bG(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder$0024$0024anonfun$0024$0024nested$002dInanonfun$0024build$002dScope$002417$00241.$c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$$nestedInanonfun$buildScope$17$1($thiz)))))).bS(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$1$2$2) => x$1$2$2.z().l())))), $thiz.lL);
+    var this$32 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(new $j_java$002elang$002e$002dObject.$c_s_util_Right(member.Dv.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((defn$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), defn$2$2, defn$2$2.Dr.bG(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder$0024$0024anonfun$0024$0024nested$002dInanonfun$0024build$002dScope$002417$00241.$c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$$nestedInanonfun$buildScope$17$1($thiz)))))).bO(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$1$2$2) => x$1$2$2.z().m())))), $thiz.lP);
     var r$4 = this$32.a1;
     if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b$4 = r$4.G;
+      var b$4 = r$4.H;
       var buildR$2 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
       var buildL$2 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
       var init$2 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
       var bad$2 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$2);
-      var iterator$2 = b$4.o();
+      var iterator$2 = b$4.p();
       var good$2 = init$2;
       var allGood$2 = true;
       while (iterator$2.f()) {
@@ -115,13 +115,13 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
         if ((x0$6 === null)) {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$6);
         }
-        var func = x0$6.D();
+        var func = x0$6.E();
         var defns = x0$6.z();
         var buildR$3 = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
         var buildL$3 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
         var init$3 = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
         var bad$3 = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL$3);
-        var iterator$3 = defns.o();
+        var iterator$3 = defns.p();
         var good$3 = init$3;
         var allGood$3 = true;
         while (iterator$3.f()) {
@@ -131,19 +131,19 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
             allGood$3 = false;
             $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$3, e$2.ay);
           } else if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-            var v$2 = x1$1.G;
-            good$3 = good$3.gz(v$2);
+            var v$2 = x1$1.H;
+            good$3 = good$3.gA(v$2);
           } else {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
           }
         }
-        var this$47 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$3 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$3.aT(good$3)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$3.bc()))), $thiz.lL);
+        var this$47 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$3 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$3.aS(good$3)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$3.bc()))), $thiz.lP);
         var r$5 = this$47.a1;
         if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-          var b$5 = r$5.G;
-          var this$50 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O($thiz, new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(func.qH), $j_java$002elang$002e$002dObject.$m_sci_Seq$().bN(), func.uJ), b$5, member, gen, isRoot), $thiz.lL);
+          var b$5 = r$5.H;
+          var this$50 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O($thiz, new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(func.qQ), $j_java$002elang$002e$002dObject.$m_sci_Seq$().bN(), func.uS), b$5, member, gen, isRoot), $thiz.lP);
           var r$6 = this$50.a1;
-          var x1$2 = ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$6.G) : r$6);
+          var x1$2 = ((r$6 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$6.H) : r$6);
         } else {
           var x1$2 = r$5;
         }
@@ -152,19 +152,19 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
           allGood$2 = false;
           $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad$2, e$3.ay);
         } else if ((x1$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-          var v$3 = x1$2.G;
-          good$2 = good$2.gz(v$3);
+          var v$3 = x1$2.H;
+          good$2 = good$2.gA(v$3);
         } else {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$2);
         }
       }
-      var this$55 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$2 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$2.aT(good$2)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$2.bc()))), $thiz.lL);
+      var this$55 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood$2 ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR$2.aS(good$2)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad$2.bc()))), $thiz.lP);
       var r$7 = this$55.a1;
       if ((r$7 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-        var b$7 = r$7.G;
-        var this$58 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O($thiz, member, b$7, member, gen, isRoot), $thiz.lL);
+        var b$7 = r$7.H;
+        var this$58 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O($thiz, member, b$7, member, gen, isRoot), $thiz.lP);
         var r$8 = this$58.a1;
-        return ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$8.G) : r$8);
+        return ((r$8 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$8.H) : r$8);
       } else {
         return r$7;
       }
@@ -185,57 +185,57 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
 }
 export { $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimalmind_baboon_parser_model_RawDefn__Z__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__O as $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimalmind_baboon_parser_model_RawDefn__Z__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__O };
 function $ps_Lio_septimalmind_baboon_typer_ScopeBuilder__mkSub$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Map__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__Lio_septimalmind_baboon_typer_model_Scope$SubScope(defn, nested, gen$2, isRoot$1) {
-  var this$1 = gen$2.Vx;
-  var old = this$1.wi;
-  this$1.wi = ((1 + old) | 0);
-  return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$SubScope(old, defn.kU().gF, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dFull$002dRaw$002dDefn.$c_Lio_septimalmind_baboon_typer_model_FullRawDefn(defn, isRoot$1), nested);
+  var this$1 = gen$2.VR;
+  var old = this$1.ws;
+  this$1.ws = ((1 + old) | 0);
+  return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$SubScope(old, defn.kY().gG, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dFull$002dRaw$002dDefn.$c_Lio_septimalmind_baboon_typer_model_FullRawDefn(defn, isRoot$1), nested);
 }
 export { $ps_Lio_septimalmind_baboon_typer_ScopeBuilder__mkSub$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Map__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__Lio_septimalmind_baboon_typer_model_Scope$SubScope as $ps_Lio_septimalmind_baboon_typer_ScopeBuilder__mkSub$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Map__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__Lio_septimalmind_baboon_typer_model_Scope$SubScope };
 function $ps_Lio_septimalmind_baboon_typer_ScopeBuilder__mkLeaf$1__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__Lio_septimalmind_baboon_typer_model_Scope$LeafScope(defn, gen$2, isRoot$1) {
-  var this$1 = gen$2.Vx;
-  var old = this$1.wi;
-  this$1.wi = ((1 + old) | 0);
-  return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dLeaf$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$LeafScope(old, defn.kU().gF, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dFull$002dRaw$002dDefn.$c_Lio_septimalmind_baboon_typer_model_FullRawDefn(defn, isRoot$1));
+  var this$1 = gen$2.VR;
+  var old = this$1.ws;
+  this$1.ws = ((1 + old) | 0);
+  return new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dLeaf$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$LeafScope(old, defn.kY().gG, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dFull$002dRaw$002dDefn.$c_Lio_septimalmind_baboon_typer_model_FullRawDefn(defn, isRoot$1));
 }
 export { $ps_Lio_septimalmind_baboon_typer_ScopeBuilder__mkLeaf$1__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__Lio_septimalmind_baboon_typer_model_Scope$LeafScope as $ps_Lio_septimalmind_baboon_typer_ScopeBuilder__mkLeaf$1__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__Lio_septimalmind_baboon_typer_model_Scope$LeafScope };
 function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O($thiz, defn, nested, member$1, gen$2, isRoot$1) {
-  var xs = nested.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((s$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(s$2$2.e1()), s$2$2))));
-  var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aV();
-  var it = xs.o();
+  var xs = nested.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((s$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(s$2$2.e2()), s$2$2))));
+  var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+  var it = xs.p();
   while (it.f()) {
     var elem = it.e();
-    var key = elem.D();
-    m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$4) => (() => this$4.dT()))(xs))).am(elem);
+    var key = elem.E();
+    m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$4) => (() => this$4.dU()))(xs))).am(elem);
   }
   var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-  var mapIt = m.o();
+  var mapIt = m.p();
   while (mapIt.f()) {
     var x1 = mapIt.e();
     if ((x1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
     }
-    var k = x1.D();
+    var k = x1.E();
     var v = x1.z();
-    result = result.ch(k, v.aq());
+    result = result.ci(k, v.aq());
   }
   var grouped = result;
-  var bad = grouped.eT(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-  var this$11 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(xs.eX($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bd)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aN(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dScope.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueScope($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), member$1.kS()), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.lL);
+  var bad = grouped.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
+  var this$11 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(xs.f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dScope.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueScope($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), member$1.kW()), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), $thiz.lP);
   var r = this$11.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b = r.G;
-    var x1$1 = (b.l() ? $j_java$002elang$002e$002dObject.$m_s_None$() : new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dMap.$c_Lizumi_fundamentals_collections_nonempty_NEMap(b)));
+    var b = r.H;
+    var x1$1 = (b.m() ? $j_java$002elang$002e$002dObject.$m_s_None$() : new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dMap.$c_Lizumi_fundamentals_collections_nonempty_NEMap(b)));
     if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
       var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(x1$1.af);
     } else {
       if (($j_java$002elang$002e$002dObject.$m_s_None$() !== x1$1)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
       }
-      var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aN(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dScope$002dCannot$002dBe$002dEmpty.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ScopeCannotBeEmpty(member$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())));
+      var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dScope$002dCannot$002dBe$002dEmpty.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$ScopeCannotBeEmpty(member$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())));
     }
-    var this$16 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.lL);
+    var this$16 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, $thiz.lP);
     var r$1 = this$16.a1;
-    return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($ps_Lio_septimalmind_baboon_typer_ScopeBuilder__mkSub$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Map__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__Lio_septimalmind_baboon_typer_model_Scope$SubScope(defn, r$1.G.px, gen$2, isRoot$1)) : r$1);
+    return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right($ps_Lio_septimalmind_baboon_typer_ScopeBuilder__mkSub$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Map__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__Lio_septimalmind_baboon_typer_model_Scope$SubScope(defn, r$1.H.pH, gen$2, isRoot$1)) : r$1);
   } else {
     return r;
   }
@@ -243,8 +243,8 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septima
 export { $p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O as $p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septimalmind_baboon_parser_model_RawDefn__sci_Seq__Lio_septimalmind_baboon_parser_model_RawDefn__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__Z__O };
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_ScopeBuilder(evidence$1) {
-  this.lL = null;
-  this.lL = evidence$1;
+  this.lP = null;
+  this.lP = evidence$1;
 }
 export { $c_Lio_septimalmind_baboon_typer_ScopeBuilder as $c_Lio_septimalmind_baboon_typer_ScopeBuilder };
 $p = $c_Lio_septimalmind_baboon_typer_ScopeBuilder.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -254,63 +254,63 @@ function $h_Lio_septimalmind_baboon_typer_ScopeBuilder() {
 }
 export { $h_Lio_septimalmind_baboon_typer_ScopeBuilder as $h_Lio_septimalmind_baboon_typer_ScopeBuilder };
 $h_Lio_septimalmind_baboon_typer_ScopeBuilder.prototype = $p;
-$p.aEP = (function(pkg, members, meta) {
+$p.aFR = (function(pkg, members, meta) {
   var gen = new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder$0024$0024anon$00241.$c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anon$1(this);
   var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_Seq$());
   var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
   var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
   var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-  var iterator = members.o();
+  var iterator = members.p();
   var good = init;
   var allGood = true;
   while (iterator.f()) {
     var x0 = iterator.e();
-    var x1 = $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimalmind_baboon_parser_model_RawDefn__Z__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__O(this, x0.sb(), x0.xr(), gen);
+    var x1 = $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimalmind_baboon_parser_model_RawDefn__Z__Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__O(this, x0.sk(), x0.xB(), gen);
     if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
       var e = x1.aj;
       allGood = false;
       $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
     } else if ((x1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var v = x1.G;
-      good = good.gz(v);
+      var v = x1.H;
+      good = good.gA(v);
     } else {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
     }
   }
-  var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aT(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), this.lL);
+  var this$9 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), this.lP);
   var r = this$9.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-    var b = r.G;
-    var xs = b.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((s$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(s$2$2.e1()), s$2$2))));
-    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aV();
-    var it = xs.o();
+    var b = r.H;
+    var xs = b.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((s$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(s$2$2.e2()), s$2$2))));
+    var m = $j_java$002elang$002e$002dObject.$m_scm_Map$().aW();
+    var it = xs.p();
     while (it.f()) {
       var elem = it.e();
-      var key = elem.D();
-      m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$14) => (() => this$14.dT()))(xs))).am(elem);
+      var key = elem.E();
+      m.cq(key, new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855(((this$14) => (() => this$14.dU()))(xs))).am(elem);
     }
     var result = $j_java$002elang$002e$002dObject.$m_sci_HashMap$().bW;
-    var mapIt = m.o();
+    var mapIt = m.p();
     while (mapIt.f()) {
       var x1$1 = mapIt.e();
       if ((x1$1 === null)) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
       }
-      var k = x1$1.D();
+      var k = x1$1.E();
       var v$1 = x1$1.z();
-      result = result.ch(k, v$1.aq());
+      result = result.ci(k, v$1.aq());
     }
     var grouped = result;
-    var bad$1 = grouped.eT(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
-    var this$21 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$1.l() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(xs.eX($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bd)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aN(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dScope.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueScope($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), this.lL);
+    var bad$1 = grouped.eU(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$4$2$2) => (x$4$2$2.z().a2() > 1))), false);
+    var this$21 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((bad$1.m() ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(xs.f0($j_scala$002e$0024less$0024colon$0024less$0024.$m_s_$less$colon$less$().bb)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dTyper$002dIssue$0024$002dNon$002dUnique$002dScope.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$NonUniqueScope($j_java$002elang$002e$002dObject.$m_sci_Map$().al(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$MapValues(new $j_scala$002ecollection$002e$002dAbstract$002dMap$002dView.$c_sc_MapView$Id(bad$1), new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$5$2$2) => x$5$2$2.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$6$2$2) => x$6$2$2.z()))).aC())))), meta), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dTyper$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WTyperIssue$())))), this.lP);
     var r$1 = this$21.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
-      var b$1 = r$1.G;
-      var this$23 = gen.Vx;
-      var old = this$23.wi;
-      this$23.wi = ((1 + old) | 0);
+      var b$1 = r$1.H;
+      var this$23 = gen.VR;
+      var old = this$23.ws;
+      this$23.ws = ((1 + old) | 0);
       var out = new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScope(old, pkg, b$1);
-      return new $j_java$002elang$002e$002dObject.$c_s_util_Right(out.ays(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((parents, index) => ((defn$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dExtended$002dRaw$002dDefn.$c_Lio_septimalmind_baboon_typer_model_ExtendedRawDefn(defn$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$002dContext.$c_Lio_septimalmind_baboon_typer_model_ScopeContext(parents, index))))(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope$002dExt.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScopeExt(out).aIL(), new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope$002dExt.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScopeExt(out).aIR()))));
+      return new $j_java$002elang$002e$002dObject.$c_s_util_Right(out.azx(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((parents, index) => ((defn$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dExtended$002dRaw$002dDefn.$c_Lio_septimalmind_baboon_typer_model_ExtendedRawDefn(defn$2$2, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$002dContext.$c_Lio_septimalmind_baboon_typer_model_ScopeContext(parents, index))))(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope$002dExt.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScopeExt(out).aJN(), new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope$002dExt.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScopeExt(out).aJT()))));
     } else {
       return r$1;
     }
@@ -319,7 +319,7 @@ $p.aEP = (function(pkg, members, meta) {
   }
 });
 var $d_Lio_septimalmind_baboon_typer_ScopeBuilder = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_typer_ScopeBuilder, "io.septimalmind.baboon.typer.ScopeBuilder", ({
-  xy: 1
+  xC: 1
 }));
 export { $d_Lio_septimalmind_baboon_typer_ScopeBuilder as $d_Lio_septimalmind_baboon_typer_ScopeBuilder };
 //# sourceMappingURL=io.septimalmind.baboon.typer.-Scope-Builder.js.map

package/io.septimalmind.baboon.typer.-Scope-Support$-Lookup-Result.js

@@ -3,10 +3,10 @@ import * as $j_java$002elang$002e$002dObject from "./java.lang.-Object.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult(suffix, scope) {
-  this.Ni = null;
-  this.Vy = null;
-  this.Ni = suffix;
-  this.Vy = scope;
+  this.NE = null;
+  this.VS = null;
+  this.NE = suffix;
+  this.VS = scope;
 }
 export { $c_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult as $c_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult };
 $p = $c_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -19,17 +19,17 @@ $h_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult.prototype = $p;
 $p.r = (function() {
   return "LookupResult";
 });
-$p.t = (function() {
+$p.s = (function() {
   return 2;
 });
-$p.u = (function(x$1) {
+$p.t = (function(x$1) {
   switch (x$1) {
     case 0: {
-      return this.Ni;
+      return this.NE;
       break;
     }
     case 1: {
-      return this.Vy;
+      return this.VS;
       break;
     }
     default: {
@@ -37,11 +37,11 @@ $p.u = (function(x$1) {
     }
   }
 });
-$p.v = (function() {
+$p.u = (function() {
   return new $j_java$002elang$002e$002dObject.$c_sr_ScalaRunTime$$anon$1(this);
 });
 $p.k = (function() {
-  return $j_java$002elang$002e$002dObject.$m_s_util_hashing_MurmurHash3$().H(this, (-889275714), false);
+  return $j_java$002elang$002e$002dObject.$m_s_util_hashing_MurmurHash3$().G(this, (-889275714), false);
 });
 $p.h = (function() {
   return $j_java$002elang$002e$002dObject.$m_sr_ScalaRunTime$().I(this);
@@ -50,11 +50,11 @@ $p.b = (function(x$1) {
   if ((this === x$1)) {
     return true;
   } else if ((x$1 instanceof $c_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult)) {
-    var x = this.Ni;
-    var x$2 = x$1.Ni;
+    var x = this.NE;
+    var x$2 = x$1.NE;
     if (((x === null) ? (x$2 === null) : x.b(x$2))) {
-      var x$3 = this.Vy;
-      var x$4 = x$1.Vy;
+      var x$3 = this.VS;
+      var x$4 = x$1.VS;
       return ((x$3 === null) ? (x$4 === null) : x$3.b(x$4));
     } else {
       return false;
@@ -64,11 +64,11 @@ $p.b = (function(x$1) {
   }
 });
 function $isArrayOf_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult(obj, depth) {
-  return (!(!(((obj && obj.$classData) && (obj.$classData.D === depth)) && obj.$classData.B.n.ji)));
+  return (!(!(((obj && obj.$classData) && (obj.$classData.D === depth)) && obj.$classData.B.n.jm)));
 }
 export { $isArrayOf_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult as $isArrayOf_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult };
 var $d_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_typer_ScopeSupport$LookupResult, "io.septimalmind.baboon.typer.ScopeSupport$LookupResult", ({
-  ji: 1,
+  jm: 1,
   c: 1,
   b: 1,
   a: 1