@7mind.io/baboon 0.0.167 → 0.0.168

package/io.septimalmind.baboon.typer.-Component-Parsers$-Component-Parsers-Impl.js

@@ -15,8 +15,8 @@ import * as $j_java$002elang$002e$002dObject from "./java.lang.-Object.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_ComponentParsers$ComponentParsersImpl(evidence$1) {
-  this.a4L = null;
-  this.a4L = evidence$1;
+  this.a4J = null;
+  this.a4J = evidence$1;
 }
 export { $c_Lio_septimalmind_baboon_typer_ComponentParsers$ComponentParsersImpl as $c_Lio_septimalmind_baboon_typer_ComponentParsers$ComponentParsersImpl };
 $p = $c_Lio_septimalmind_baboon_typer_ComponentParsers$ComponentParsersImpl.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -26,7 +26,7 @@ function $h_Lio_septimalmind_baboon_typer_ComponentParsers$ComponentParsersImpl(
 }
 export { $h_Lio_septimalmind_baboon_typer_ComponentParsers$ComponentParsersImpl as $h_Lio_septimalmind_baboon_typer_ComponentParsers$ComponentParsersImpl };
 $h_Lio_septimalmind_baboon_typer_ComponentParsers$ComponentParsersImpl.prototype = $p;
-$p.aNa = (function(header) {
+$p.aN3 = (function(header) {
   var seq = header.y3;
   var list = seq.aC();
   var x1 = (list.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$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(list)));
@@ -38,12 +38,12 @@ $p.aNa = (function(header) {
     }
     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$002dEmpty$002dPackage$002dId.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$EmptyPackageId(header), $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$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.a4L);
+  var this$4 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.a4J);
   var r = this$4.a1;
   return ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dPkg.$c_Lio_septimalmind_baboon_typer_model_Pkg(r.H.ay)) : r);
 });
-$p.aNd = (function(version) {
-  var x1 = $j_izumi$002efundamentals$002eplatform$002eversions$002e$002dVersion$0024.$m_Lizumi_fundamentals_platform_versions_Version$().aAj(version.DE);
+$p.aN6 = (function(version) {
+  var x1 = $j_izumi$002efundamentals$002eplatform$002eversions$002e$002dVersion$0024.$m_Lizumi_fundamentals_platform_versions_Version$().aAc(version.DD);
   if ((x1 instanceof $j_izumi$002efundamentals$002eplatform$002eversions$002e$002dVersion$0024$002dCanonical.$c_Lizumi_fundamentals_platform_versions_Version$Canonical)) {
     var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(x1);
   } else if ((x1 instanceof $j_izumi$002efundamentals$002eplatform$002eversions$002e$002dVersion$0024$002dSemver.$c_Lizumi_fundamentals_platform_versions_Version$Semver)) {
@@ -52,9 +52,9 @@ $p.aNd = (function(version) {
     if ((!(x1 instanceof $j_izumi$002efundamentals$002eplatform$002eversions$002e$002dVersion$0024$002dUnknown.$c_Lizumi_fundamentals_platform_versions_Version$Unknown))) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
     }
-    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$002dGeneric$002dTyper$002dIssue.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$GenericTyperIssue((("Bad version format in '" + x1.nZ) + "'"), version.Kh), $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$002dGeneric$002dTyper$002dIssue.$c_Lio_septimalmind_baboon_parser_model_issues_TyperIssue$GenericTyperIssue((("Bad version format in '" + x1.o0) + "'"), version.Kg), $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$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.a4L);
+  var this$5 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_1, this.a4J);
   var r = this$5.a1;
   return ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dVersion.$c_Lio_septimalmind_baboon_typer_model_Version(r.H)) : r);
 });

package/io.septimalmind.baboon.typer.-Scope-Builder$$anon$1.js

@@ -4,7 +4,7 @@ import * as $j_java$002elang$002e$002dObject from "./java.lang.-Object.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anon$1(outer) {
-  this.VU = null;
+  this.VR = null;
   $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dScope$002dBuilder$0024$002dU$002dI$002dD$002dGen.$f_Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__$init$__V(this);
 }
 export { $c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anon$1 as $c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anon$1 };

package/io.septimalmind.baboon.typer.-Scope-Builder$$anonfun$$nested-Inanonfun$build-Scope$17$1.js

@@ -14,17 +14,17 @@ function $h_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$$nestedInanonfun
 }
 export { $h_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$$nestedInanonfun$buildScope$17$1 as $h_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$$nestedInanonfun$buildScope$17$1 };
 $h_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$$nestedInanonfun$buildScope$17$1.prototype = $p;
-$p.aFl = (function(x2, default$1) {
-  return ((x2 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dFunc$002dArg$0024$002dStruct.$c_Lio_septimalmind_baboon_parser_model_RawFuncArg$Struct) ? x2.Dt : default$1.x(x2));
+$p.aFe = (function(x2, default$1) {
+  return ((x2 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dFunc$002dArg$0024$002dStruct.$c_Lio_septimalmind_baboon_parser_model_RawFuncArg$Struct) ? x2.Ds : default$1.x(x2));
 });
-$p.aKo = (function(x2) {
+$p.aKh = (function(x2) {
   return (x2 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dFunc$002dArg$0024$002dStruct.$c_Lio_septimalmind_baboon_parser_model_RawFuncArg$Struct);
 });
 $p.aL = (function(x) {
-  return this.aKo(x);
+  return this.aKh(x);
 });
 $p.aB = (function(x, default$1) {
-  return this.aFl(x, default$1);
+  return this.aFe(x, default$1);
 });
 var $d_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$$nestedInanonfun$buildScope$17$1 = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$$nestedInanonfun$buildScope$17$1, "io.septimalmind.baboon.typer.ScopeBuilder$$anonfun$$nestedInanonfun$buildScope$17$1", ({
   xE: 1,

package/io.septimalmind.baboon.typer.-Scope-Builder$$anonfun$build-Scope$12.js

@@ -13,17 +13,17 @@ function $h_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$buildScope$12()
 }
 export { $h_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$buildScope$12 as $h_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$buildScope$12 };
 $h_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$buildScope$12.prototype = $p;
-$p.afG = (function(x1, default$1) {
+$p.afD = (function(x1, default$1) {
   return ((x1 !== null) ? x1 : default$1.x(x1));
 });
-$p.ah1 = (function(x1) {
+$p.agY = (function(x1) {
   return (x1 !== null);
 });
 $p.aL = (function(x) {
-  return this.ah1(x);
+  return this.agY(x);
 });
 $p.aB = (function(x, default$1) {
-  return this.afG(x, default$1);
+  return this.afD(x, default$1);
 });
 var $d_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$buildScope$12 = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_typer_ScopeBuilder$$anonfun$buildScope$12, "io.septimalmind.baboon.typer.ScopeBuilder$$anonfun$buildScope$12", ({
   xF: 1,

package/io.septimalmind.baboon.typer.-Scope-Builder$-U-I-D-Gen.js

@@ -3,7 +3,7 @@ import * as $j_java$002elang$002e$002dObject from "./java.lang.-Object.js";
 import * as $j_java$002eutil$002econcurrent$002eatomic$002e$002dAtomic$002dInteger from "./java.util.concurrent.atomic.-Atomic-Integer.js";
 var $p;
 function $f_Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__$init$__V($thiz) {
-  $thiz.VU = new $j_java$002eutil$002econcurrent$002eatomic$002e$002dAtomic$002dInteger.$c_ju_concurrent_atomic_AtomicInteger(0);
+  $thiz.VR = new $j_java$002eutil$002econcurrent$002eatomic$002e$002dAtomic$002dInteger.$c_ju_concurrent_atomic_AtomicInteger(0);
 }
 export { $f_Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__$init$__V as $f_Lio_septimalmind_baboon_typer_ScopeBuilder$UIDGen__$init$__V };
 //# sourceMappingURL=io.septimalmind.baboon.typer.-Scope-Builder$-U-I-D-Gen.js.map

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

@@ -34,17 +34,17 @@ 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.Ka;
+    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.sj(), x0.xB(), 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;
@@ -67,12 +67,12 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
       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.Df.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.ag3(), 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()) {
@@ -99,7 +99,7 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
       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.Dw.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.Ds.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 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.H;
@@ -107,7 +107,7 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
       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()) {
@@ -121,7 +121,7 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
         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()) {
@@ -141,7 +141,7 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__buildScope__Lio_septimal
         var r$5 = this$47.a1;
         if ((r$5 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           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.qP), $j_java$002elang$002e$002dObject.$m_sci_Seq$().bN(), func.uS), b$5, member, gen, isRoot), $thiz.lP);
+          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.H) : r$6);
         } else {
@@ -185,14 +185,14 @@ 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.VU;
+  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.VU;
+  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));
@@ -201,14 +201,14 @@ export { $ps_Lio_septimalmind_baboon_typer_ScopeBuilder__mkLeaf$1__Lio_septimalm
 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.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.o();
+  var it = xs.p();
   while (it.f()) {
     var elem = it.e();
     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)) {
@@ -235,7 +235,7 @@ function $p_Lio_septimalmind_baboon_typer_ScopeBuilder__wrapScope$1__Lio_septima
     }
     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.H.pG, 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;
   }
@@ -254,18 +254,18 @@ 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.aFY = (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.sj(), x0.xB(), 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;
@@ -283,14 +283,14 @@ $p.aFY = (function(pkg, members, meta) {
     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.o();
+    var it = xs.p();
     while (it.f()) {
       var elem = it.e();
       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)) {
@@ -306,11 +306,11 @@ $p.aFY = (function(pkg, members, meta) {
     var r$1 = this$21.a1;
     if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b$1 = r$1.H;
-      var this$23 = gen.VU;
+      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.azE(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).aJU(), new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope$002dExt.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScopeExt(out).aK0()))));
+      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;
     }

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.NF = null;
-  this.VV = null;
-  this.NF = suffix;
-  this.VV = 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();
@@ -25,11 +25,11 @@ $p.s = (function() {
 $p.t = (function(x$1) {
   switch (x$1) {
     case 0: {
-      return this.NF;
+      return this.NE;
       break;
     }
     case 1: {
-      return this.VV;
+      return this.VS;
       break;
     }
     default: {
@@ -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.NF;
-    var x$2 = x$1.NF;
+    var x = this.NE;
+    var x$2 = x$1.NE;
     if (((x === null) ? (x$2 === null) : x.b(x$2))) {
-      var x$3 = this.VV;
-      var x$4 = x$1.VV;
+      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;

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

@@ -36,7 +36,7 @@ function $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__lookupN
       var value = x1.af;
       var x1$2 = in$1;
       if ((x1$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$SubScope)) {
-        var x1$3 = x1$2.r0.b2(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(value.gG));
+        var x1$3 = x1$2.r1.b2(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(value.gG));
         if ((x1$3 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
           var value$2 = x1$3.af;
           var temp$names = names.n();
@@ -89,13 +89,13 @@ function $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__pathToO
         x2 = x1$2;
         var value = x2.af;
         if ((value instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$SubScope)) {
-          var x1$3 = value.pk.iD.iE;
+          var x1$3 = value.pl.iD.iE;
           if ((x1$3 instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt)) {
-            var this$11 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.ax0(x1$3.Dg, x1$3.sr), $thiz.i3);
+            var this$11 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($thiz.awU(x1$3.Df, x1$3.ss), $thiz.i3);
             var r$2 = this$11.a1;
             if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
               var b$2 = r$2.H;
-              var this$14 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__pathToOwner__sci_List__Lio_septimalmind_baboon_typer_model_Pkg__O($thiz, defnPath.fF(), pkg), $thiz.i3);
+              var this$14 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__pathToOwner__sci_List__Lio_septimalmind_baboon_typer_model_Pkg__O($thiz, defnPath.fc(), pkg), $thiz.i3);
               var r$3 = this$14.a1;
               var $x_2 = ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dOwner$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Owner$Adt(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_TypeId$User(pkg, r$3.H, b$2))) : r$3);
               break matchEnd9;
@@ -140,13 +140,13 @@ function $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__namespa
       if ((head instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScope)) {
         var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(b);
       } else if ((head instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$SubScope)) {
-        $j_java$002elang$002e$002dObject.$m_s_Predef$().cd((((head.pk.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt) || (head.pk.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace)) || (head.pk.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dService.$c_Lio_septimalmind_baboon_parser_model_RawService)));
-        var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dName.$c_Lio_septimalmind_baboon_typer_model_TypeName(head.sN)])).aY(b));
+        $j_java$002elang$002e$002dObject.$m_s_Predef$().cd((((head.pl.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt) || (head.pl.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace)) || (head.pl.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dService.$c_Lio_septimalmind_baboon_parser_model_RawService)));
+        var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dName.$c_Lio_septimalmind_baboon_typer_model_TypeName(head.sO)])).aY(b));
       } else {
         if ((!(head instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dLeaf$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$LeafScope))) {
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(head);
         }
-        $j_java$002elang$002e$002dObject.$m_s_Predef$().cd((((!(head.qZ.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt)) && (!(head.qZ.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace))) && (!(head.qZ.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dService.$c_Lio_septimalmind_baboon_parser_model_RawService))));
+        $j_java$002elang$002e$002dObject.$m_s_Predef$().cd((((!(head.r0.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dAdt.$c_Lio_septimalmind_baboon_parser_model_RawAdt)) && (!(head.r0.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNamespace.$c_Lio_septimalmind_baboon_parser_model_RawNamespace))) && (!(head.r0.iD.iE instanceof $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dService.$c_Lio_septimalmind_baboon_parser_model_RawService))));
         if ((!tail.m())) {
           throw $j_java$002elang$002e$002dObject.$ct_jl_AssertionError__O__(new $j_java$002elang$002e$002dObject.$c_jl_AssertionError(), "assertion failed: typedefs must terminate type path");
         }
@@ -166,25 +166,25 @@ function $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__namespa
 }
 export { $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__namespaceOf__sci_List__O as $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__namespaceOf__sci_List__O };
 function $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__asPath__Lio_septimalmind_baboon_typer_model_Scope__sci_List($thiz, scope) {
-  return $ps_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List(scope).fF();
+  return $ps_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List(scope).fc();
 }
 export { $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__asPath__Lio_septimalmind_baboon_typer_model_Scope__sci_List as $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__asPath__Lio_septimalmind_baboon_typer_model_Scope__sci_List };
 function $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option($thiz, needles, scope) {
-  var head = needles.i().sK;
+  var head = needles.i().sL;
   if ((scope instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScope)) {
-    var headScope = scope.sJ.b2(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(head));
+    var headScope = scope.sK.b2(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(head));
   } else if ((scope instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dLeaf$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$LeafScope)) {
     var this$2 = new $j_java$002elang$002e$002dObject.$c_s_Some(scope);
     var this$3 = ((this$2.m() || (this$2.af.yE === head)) ? this$2 : $j_java$002elang$002e$002dObject.$m_s_None$());
-    var headScope = (this$3.m() ? $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option($thiz, needles, scope.qZ.ahY(scope)) : this$3);
+    var headScope = (this$3.m() ? $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option($thiz, needles, scope.r0.ahV(scope)) : this$3);
   } else {
     if ((!(scope instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dSub$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$SubScope))) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(scope);
     }
     var this$4 = new $j_java$002elang$002e$002dObject.$c_s_Some(scope);
-    var this$5 = ((this$4.m() || (this$4.af.sN === head)) ? this$4 : $j_java$002elang$002e$002dObject.$m_s_None$());
-    var this$6 = (this$5.m() ? scope.r0.b2(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(head)) : this$5);
-    var headScope = (this$6.m() ? $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option($thiz, needles, scope.pk.ahY(scope)) : this$6);
+    var this$5 = ((this$4.m() || (this$4.af.sO === head)) ? this$4 : $j_java$002elang$002e$002dObject.$m_s_None$());
+    var this$6 = (this$5.m() ? scope.r1.b2(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(head)) : this$5);
+    var headScope = (this$6.m() ? $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option($thiz, needles, scope.pl.ahV(scope)) : this$6);
   }
   var list = needles.n();
   var x1$2 = (list.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$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(list)));
@@ -199,14 +199,14 @@ function $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findSco
 }
 export { $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option as $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option };
 function $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__asBuiltin__Lio_septimalmind_baboon_typer_model_TypeName__s_Option($thiz, name) {
-  var this$1 = $thiz.a4M;
+  var this$1 = $thiz.a4K;
   var id = new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dBuiltin$002dCollection.$c_Lio_septimalmind_baboon_typer_model_TypeId$BuiltinCollection(name);
-  if (this$1.a4N.a5(id)) {
+  if (this$1.a4L.a5(id)) {
     return new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dBuiltin$002dCollection.$c_Lio_septimalmind_baboon_typer_model_TypeId$BuiltinCollection(name));
   } else {
-    var this$2 = $thiz.a4M;
+    var this$2 = $thiz.a4K;
     var id$1 = new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dBuiltin$002dScalar.$c_Lio_septimalmind_baboon_typer_model_TypeId$BuiltinScalar(name);
-    if (this$2.a4R.a5(id$1)) {
+    if (this$2.a4P.a5(id$1)) {
       return new $j_java$002elang$002e$002dObject.$c_s_Some(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dId$0024$002dBuiltin$002dScalar.$c_Lio_septimalmind_baboon_typer_model_TypeId$BuiltinScalar(name));
     } else {
       return $j_java$002elang$002e$002dObject.$m_s_None$();
@@ -218,7 +218,7 @@ function $ps_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__go$1__
   if ((s instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dRoot$002dScope.$c_Lio_septimalmind_baboon_typer_model_Scope$RootScope)) {
     return new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(s, $j_java$002elang$002e$002dObject.$m_sci_Nil$());
   } else if ($j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dNested$002dScope.$is_Lio_septimalmind_baboon_typer_model_Scope$NestedScope(s)) {
-    return $ps_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List(s.xc().ahY(s)).aY(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(s, $j_java$002elang$002e$002dObject.$m_sci_Nil$()));
+    return $ps_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List(s.xc().ahV(s)).aY(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(s, $j_java$002elang$002e$002dObject.$m_sci_Nil$()));
   } else {
     throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(s);
   }
@@ -226,9 +226,9 @@ function $ps_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__go$1__
 export { $ps_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List as $ps_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__go$1__Lio_septimalmind_baboon_typer_model_Scope__sci_List };
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl(types, evidence$1) {
-  this.a4M = null;
+  this.a4K = null;
   this.i3 = null;
-  this.a4M = types;
+  this.a4K = types;
   this.i3 = evidence$1;
 }
 export { $c_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl as $c_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl };
@@ -239,15 +239,15 @@ function $h_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl() {
 }
 export { $h_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl as $h_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl };
 $h_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl.prototype = $p;
-$p.a28 = (function(name, scope, pkg, meta) {
-  var found = $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option(this, new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(name.qR.i().gG), $j_java$002elang$002e$002dObject.$m_sci_Nil$()), scope);
+$p.a26 = (function(name, scope, pkg, meta) {
+  var found = $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option(this, new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(name.qS.i().gG), $j_java$002elang$002e$002dObject.$m_sci_Nil$()), scope);
   if ((found instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
     var found$2 = found.af;
-    var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__lookupName__sci_Seq__Lio_septimalmind_baboon_typer_model_Scope__sci_List__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O(this, name.qR.n(), found$2, $j_java$002elang$002e$002dObject.$m_sci_Nil$(), meta), this.i3);
+    var this$7 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__lookupName__sci_Seq__Lio_septimalmind_baboon_typer_model_Scope__sci_List__Lio_septimalmind_baboon_parser_model_RawNodeMeta__O(this, name.qS.n(), found$2, $j_java$002elang$002e$002dObject.$m_sci_Nil$(), meta), this.i3);
     var r = this$7.a1;
     if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var b = r.H;
-      var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b, $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [found$2])).aY(b.NF)));
+      var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), b, $j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [found$2])).aY(b.NE)));
     } else {
       var $x_1 = r;
     }
@@ -259,7 +259,7 @@ $p.a28 = (function(name, scope, pkg, meta) {
         throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$1);
       }
       var fullPath$1 = b$1.z();
-      var this$19 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a29(name.qR.bl(), fullPath$1.bl(), pkg, meta), this.i3);
+      var this$19 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.a27(name.qS.bg(), fullPath$1.bg(), pkg, meta), this.i3);
       var r$2 = this$19.a1;
       return ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(r$2.H) : r$2);
     } else {
@@ -271,8 +271,8 @@ $p.a28 = (function(name, scope, pkg, meta) {
     throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(found);
   }
 });
-$p.a29 = (function(name, scope, pkg, meta) {
-  var this$3 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.aii($j_java$002elang$002e$002dObject.$m_sci_Nil$(), name, scope, pkg, meta), this.i3);
+$p.a27 = (function(name, scope, pkg, meta) {
+  var this$3 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.aif($j_java$002elang$002e$002dObject.$m_sci_Nil$(), name, scope, pkg, meta), this.i3);
   var r = this$3.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
@@ -291,20 +291,20 @@ $p.a29 = (function(name, scope, pkg, meta) {
     return r;
   }
 });
-$p.ax0 = (function(raw, meta) {
+$p.awU = (function(raw, meta) {
   var this$3 = 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(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dName.$c_Lio_septimalmind_baboon_typer_model_TypeName(raw.gG)), this.i3);
   var r = this$3.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
-    var this$6 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dSymbol$002dNames$0024.$m_Lio_septimalmind_baboon_typer_SymbolNames$().aQN(b, meta, this.i3), this.i3);
+    var this$6 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dSymbol$002dNames$0024.$m_Lio_septimalmind_baboon_typer_SymbolNames$().aQG(b, meta, this.i3), this.i3);
     var r$1 = this$6.a1;
     return ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right) ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(b) : r$1);
   } else {
     return r;
   }
 });
-$p.aii = (function(prefix, name, scope, pkg, meta) {
-  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.ax0(name, meta), this.i3);
+$p.aif = (function(prefix, name, scope, pkg, meta) {
+  var this$2 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps(this.awU(name, meta), this.i3);
   var r = this$2.a1;
   if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b = r.H;
@@ -342,7 +342,7 @@ $p.aii = (function(prefix, name, scope, pkg, meta) {
       }
       var rassoc$1 = h$1;
     }
-    var needle = $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$().aDp(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(name.gG), $j_java$002elang$002e$002dObject.$m_sci_Nil$()), rassoc$1);
+    var needle = $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$().aDi(new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dScope$0024$002dScope$002dName.$c_Lio_septimalmind_baboon_typer_model_Scope$ScopeName(name.gG), $j_java$002elang$002e$002dObject.$m_sci_Nil$()), rassoc$1);
     var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_java$002elang$002e$002dObject.$c_T3(b, new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(needle), $p_Lio_septimalmind_baboon_typer_ScopeSupport$ScopeSupportImpl__findScope__sci_List__Lio_septimalmind_baboon_typer_model_Scope__s_Option(this, needle, scope)));
   } else {
     var $x_1 = r;