@7mind.io/baboon 0.0.165 → 0.0.166

package/io.septimalmind.baboon.parser.defns.-Def-Foreign.js

@@ -29,8 +29,8 @@ import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefForeign(context, meta) {
-  this.a2F = null;
-  this.a2F = meta;
+  this.a2O = null;
+  this.a2O = meta;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefForeign as $c_Lio_septimalmind_baboon_parser_defns_DefForeign };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefForeign.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -40,21 +40,21 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefForeign() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefForeign as $h_Lio_septimalmind_baboon_parser_defns_DefForeign };
 $h_Lio_septimalmind_baboon_parser_defns_DefForeign.prototype = $p;
-$p.aJU = (function(evidence$1) {
+$p.aK9 = (function(evidence$1) {
   var x1$2 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
   var preLhsIndex$macro$17 = evidence$1.c;
   var input$macro$26 = evidence$1.T;
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
   var preLhsIndex$macro$2 = evidence$1.c;
   var input$macro$11 = evidence$1.T;
-  $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HH(evidence$1);
+  $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HP(evidence$1);
   if ((!evidence$1.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$1.c;
-    var lhsAggregate$macro$6 = evidence$1.v;
-    var lhsMsg$macro$9 = evidence$1.G;
+    var lhsAggregate$macro$6 = evidence$1.s;
+    var lhsMsg$macro$9 = evidence$1.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$1.Q();
+      evidence$1.P();
     }
     var lhsValue$macro$12 = evidence$1.E;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
@@ -65,15 +65,15 @@ $p.aJU = (function(evidence$1) {
         var input = evidence$1.T;
         var index = evidence$1.c;
         if ((input.U(index) && (input.as.charCodeAt(index) === 61))) {
-          evidence$1.aK(((1 + index) | 0));
+          evidence$1.aI(((1 + index) | 0));
         } else {
-          evidence$1.aH();
+          evidence$1.aG();
         }
-        if (evidence$1.D) {
+        if (evidence$1.C) {
           evidence$1.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"=\""))));
         }
-        var rhsAggregate$macro$7 = evidence$1.v;
-        var rhsMsg$macro$8 = evidence$1.G;
+        var rhsAggregate$macro$7 = evidence$1.s;
+        var rhsMsg$macro$8 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$14 = evidence$1;
         } else {
@@ -81,12 +81,12 @@ $p.aJU = (function(evidence$1) {
           var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
           var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
-            evidence$1.Q();
+            evidence$1.P();
           }
           var res$macro$14 = evidence$1.ab(lhsValue$macro$12, nextIndex$macro$13);
         }
-        if (evidence$1.D) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
+        if (evidence$1.C) {
+          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$1.S));
         }
       }
     }
@@ -95,10 +95,10 @@ $p.aJU = (function(evidence$1) {
     var parse0$2 = evidence$1;
   } else {
     var postLhsIndex$macro$18 = evidence$1.c;
-    var lhsAggregate$macro$21 = evidence$1.v;
-    var lhsMsg$macro$24 = evidence$1.G;
+    var lhsAggregate$macro$21 = evidence$1.s;
+    var lhsMsg$macro$24 = evidence$1.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
-      evidence$1.Q();
+      evidence$1.P();
     }
     var lhsValue$macro$27 = evidence$1.E;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$1);
@@ -107,9 +107,9 @@ $p.aJU = (function(evidence$1) {
         var parse0$2 = evidence$1;
       } else {
         var preRhsIndex$macro$19 = evidence$1.c;
-        $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HH(evidence$1);
-        var rhsAggregate$macro$22 = evidence$1.v;
-        var rhsMsg$macro$23 = evidence$1.G;
+        $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HP(evidence$1);
+        var rhsAggregate$macro$22 = evidence$1.s;
+        var rhsMsg$macro$23 = evidence$1.F;
         if ((!evidence$1.d)) {
           var res$macro$29 = evidence$1;
         } else {
@@ -117,12 +117,12 @@ $p.aJU = (function(evidence$1) {
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
           var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
-            evidence$1.Q();
+            evidence$1.P();
           }
           var res$macro$29 = evidence$1.ab(x1$2.aF(lhsValue$macro$27, evidence$1.E), nextIndex$macro$28);
         }
-        if (evidence$1.D) {
-          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$1.S));
+        if (evidence$1.C) {
+          evidence$1.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$1.S));
         }
         var parse0$2 = res$macro$29;
       }
@@ -137,12 +137,12 @@ $p.aJU = (function(evidence$1) {
     if ((x0 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
-    parse0$2.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign$002dEntry$002dAttr.$c_Lio_septimalmind_baboon_parser_model_RawForeignEntryAttr(x0.C(), x0.z());
+    parse0$2.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign$002dEntry$002dAttr.$c_Lio_septimalmind_baboon_parser_model_RawForeignEntryAttr(x0.D(), x0.z());
     return parse0$2;
   }
 });
-$p.aHj = (function(evidence$2) {
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+$p.aHx = (function(evidence$2) {
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
   var preLhsIndex$macro$34 = evidence$2.c;
   var input$macro$43 = evidence$2.T;
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -182,20 +182,20 @@ $p.aHj = (function(evidence$2) {
     var $x_1 = false;
   }
   if ($x_1) {
-    var res = evidence$2.aK(end);
+    var res = evidence$2.aI(end);
   } else {
-    var res = evidence$2.aH();
+    var res = evidence$2.aG();
   }
-  if (evidence$2.D) {
+  if (evidence$2.C) {
     evidence$2.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"with\""))));
   }
   if (instrument) {
     evidence$2.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreignAttrs").B, res.c, res.d);
   }
-  if (res.D) {
+  if (res.C) {
     var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreignAttrs").B)));
     var forceAggregate = (startIndex < res.S);
-    res.K(newshortMsg, res.v, forceAggregate);
+    res.K(newshortMsg, res.s, forceAggregate);
     if ((!res.d)) {
       res.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreignAttrs").B, startIndex), res.Y);
     }
@@ -203,10 +203,10 @@ $p.aHj = (function(evidence$2) {
   if ((!evidence$2.d)) {
   } else {
     var postLhsIndex$macro$5 = evidence$2.c;
-    var lhsAggregate$macro$8 = evidence$2.v;
-    var lhsMsg$macro$11 = evidence$2.G;
+    var lhsAggregate$macro$8 = evidence$2.s;
+    var lhsMsg$macro$11 = evidence$2.F;
     if ((postLhsIndex$macro$5 > preLhsIndex$macro$4)) {
-      evidence$2.Q();
+      evidence$2.P();
     }
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
@@ -216,15 +216,15 @@ $p.aHj = (function(evidence$2) {
         var input$2 = evidence$2.T;
         var index$2$1 = evidence$2.c;
         if ((input$2.U(index$2$1) && (input$2.as.charCodeAt(index$2$1) === 123))) {
-          evidence$2.aK(((1 + index$2$1) | 0));
+          evidence$2.aI(((1 + index$2$1) | 0));
         } else {
-          evidence$2.aH();
+          evidence$2.aG();
         }
-        if (evidence$2.D) {
+        if (evidence$2.C) {
           evidence$2.aw(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
         }
-        var rhsAggregate$macro$9 = evidence$2.v;
-        var rhsMsg$macro$10 = evidence$2.G;
+        var rhsAggregate$macro$9 = evidence$2.s;
+        var rhsMsg$macro$10 = evidence$2.F;
         if ((!evidence$2.d)) {
           var res$macro$16 = evidence$2;
         } else {
@@ -232,12 +232,12 @@ $p.aHj = (function(evidence$2) {
           var rhsMadeProgress$macro$12 = (postRhsIndex$macro$7 > preRhsIndex$macro$6);
           var nextIndex$macro$15 = (((!rhsMadeProgress$macro$12) && input$macro$13.U(postRhsIndex$macro$7)) ? postLhsIndex$macro$5 : postRhsIndex$macro$7);
           if (rhsMadeProgress$macro$12) {
-            evidence$2.Q();
+            evidence$2.P();
           }
           var res$macro$16 = evidence$2.ab((void 0), nextIndex$macro$15);
         }
-        if (evidence$2.D) {
-          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$11, rhsMsg$macro$10), lhsAggregate$macro$8.W(rhsAggregate$macro$9), (preRhsIndex$macro$6 === evidence$2.S));
+        if (evidence$2.C) {
+          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$11, rhsMsg$macro$10), lhsAggregate$macro$8.W(rhsAggregate$macro$9), (preRhsIndex$macro$6 === evidence$2.S));
         }
       }
     }
@@ -245,17 +245,17 @@ $p.aHj = (function(evidence$2) {
   if ((!evidence$2.d)) {
   } else {
     var postLhsIndex$macro$20 = evidence$2.c;
-    var lhsAggregate$macro$23 = evidence$2.v;
-    var lhsMsg$macro$26 = evidence$2.G;
+    var lhsAggregate$macro$23 = evidence$2.s;
+    var lhsMsg$macro$26 = evidence$2.F;
     if ((postLhsIndex$macro$20 > preLhsIndex$macro$19)) {
-      evidence$2.Q();
+      evidence$2.P();
     }
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
     if (evidence$2.d) {
       if (((!evidence$2.d) && evidence$2.p)) {
       } else {
         var preRhsIndex$macro$21 = evidence$2.c;
-        var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
+        var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n6();
         var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
         var this$17 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
         var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
@@ -267,30 +267,30 @@ $p.aHj = (function(evidence$2) {
         var lastAgg = null;
         while (true) {
           evidence$2.p = (!(!(precut | ((count < 0) && outerCut))));
-          this.aJU(evidence$2);
-          var parsedMsg = evidence$2.G;
-          var parsedAgg = evidence$2.v;
+          this.aK9(evidence$2);
+          var parsedMsg = evidence$2.F;
+          var parsedAgg = evidence$2.s;
           var postCut = evidence$2.p;
-          var verboseFailures = evidence$2.D;
+          var verboseFailures = evidence$2.C;
           if ((!evidence$2.d)) {
             if (postCut) {
             } else {
               $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$17, startIndex$1, startIndex$1, count, (!(!(outerCut | postCut))), 0, evidence$2, repeater, acc);
             }
             if (verboseFailures) {
-              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex$1, 0, evidence$2, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$1, 0, evidence$2, sepMsg, parsedMsg, lastAgg, (precut || postCut));
               break;
             } else {
               break;
             }
           } else {
             var beforeSepIndex = evidence$2.c;
-            acc.al(evidence$2.E);
+            acc.am(evidence$2.E);
             var nextCount = ((1 + count) | 0);
             if ((nextCount === 2147483647)) {
               $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$17, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$2, repeater, acc);
               if (verboseFailures) {
-                evidence$2.aw(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(parsedMsg.dC) + ".rep")))(parsedMsg))));
+                evidence$2.aw(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g1(parsedMsg.dL) + ".rep")))(parsedMsg))));
                 break;
               } else {
                 break;
@@ -310,8 +310,8 @@ $p.aHj = (function(evidence$2) {
             }
           }
         }
-        var rhsAggregate$macro$24 = evidence$2.v;
-        var rhsMsg$macro$25 = evidence$2.G;
+        var rhsAggregate$macro$24 = evidence$2.s;
+        var rhsMsg$macro$25 = evidence$2.F;
         if ((!evidence$2.d)) {
           var res$macro$31 = evidence$2;
         } else {
@@ -319,12 +319,12 @@ $p.aHj = (function(evidence$2) {
           var rhsMadeProgress$macro$27 = (postRhsIndex$macro$22 > preRhsIndex$macro$21);
           var nextIndex$macro$30 = (((!rhsMadeProgress$macro$27) && input$macro$28.U(postRhsIndex$macro$22)) ? postLhsIndex$macro$20 : postRhsIndex$macro$22);
           if (rhsMadeProgress$macro$27) {
-            evidence$2.Q();
+            evidence$2.P();
           }
           var res$macro$31 = evidence$2.ab(evidence$2.E, nextIndex$macro$30);
         }
-        if (evidence$2.D) {
-          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$26, rhsMsg$macro$25), lhsAggregate$macro$23.W(rhsAggregate$macro$24), (preRhsIndex$macro$21 === evidence$2.S));
+        if (evidence$2.C) {
+          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$26, rhsMsg$macro$25), lhsAggregate$macro$23.W(rhsAggregate$macro$24), (preRhsIndex$macro$21 === evidence$2.S));
         }
       }
     }
@@ -333,10 +333,10 @@ $p.aHj = (function(evidence$2) {
     var parse0$2 = evidence$2;
   } else {
     var postLhsIndex$macro$35 = evidence$2.c;
-    var lhsAggregate$macro$38 = evidence$2.v;
-    var lhsMsg$macro$41 = evidence$2.G;
+    var lhsAggregate$macro$38 = evidence$2.s;
+    var lhsMsg$macro$41 = evidence$2.F;
     if ((postLhsIndex$macro$35 > preLhsIndex$macro$34)) {
-      evidence$2.Q();
+      evidence$2.P();
     }
     var lhsValue$macro$44 = evidence$2.E;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$2);
@@ -348,15 +348,15 @@ $p.aHj = (function(evidence$2) {
         var input$3 = evidence$2.T;
         var index$3$1 = evidence$2.c;
         if ((input$3.U(index$3$1) && (input$3.as.charCodeAt(index$3$1) === 125))) {
-          evidence$2.aK(((1 + index$3$1) | 0));
+          evidence$2.aI(((1 + index$3$1) | 0));
         } else {
-          evidence$2.aH();
+          evidence$2.aG();
         }
-        if (evidence$2.D) {
+        if (evidence$2.C) {
           evidence$2.aw(index$3$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
         }
-        var rhsAggregate$macro$39 = evidence$2.v;
-        var rhsMsg$macro$40 = evidence$2.G;
+        var rhsAggregate$macro$39 = evidence$2.s;
+        var rhsMsg$macro$40 = evidence$2.F;
         if ((!evidence$2.d)) {
           var res$macro$46 = evidence$2;
         } else {
@@ -364,12 +364,12 @@ $p.aHj = (function(evidence$2) {
           var rhsMadeProgress$macro$42 = (postRhsIndex$macro$37 > preRhsIndex$macro$36);
           var nextIndex$macro$45 = (((!rhsMadeProgress$macro$42) && input$macro$43.U(postRhsIndex$macro$37)) ? postLhsIndex$macro$35 : postRhsIndex$macro$37);
           if (rhsMadeProgress$macro$42) {
-            evidence$2.Q();
+            evidence$2.P();
           }
           var res$macro$46 = evidence$2.ab(lhsValue$macro$44, nextIndex$macro$45);
         }
-        if (evidence$2.D) {
-          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$41, rhsMsg$macro$40), lhsAggregate$macro$38.W(rhsAggregate$macro$39), (preRhsIndex$macro$36 === evidence$2.S));
+        if (evidence$2.C) {
+          evidence$2.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$41, rhsMsg$macro$40), lhsAggregate$macro$38.W(rhsAggregate$macro$39), (preRhsIndex$macro$36 === evidence$2.S));
         }
         var parse0$2 = res$macro$46;
       }
@@ -380,28 +380,28 @@ $p.aHj = (function(evidence$2) {
   if ((!parse0$2.d)) {
     return parse0$2;
   } else {
-    parse0$2.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign$002dEntry$002dAttrs.$c_Lio_septimalmind_baboon_parser_model_RawForeignEntryAttrs(parse0$2.E.aB());
+    parse0$2.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign$002dEntry$002dAttrs.$c_Lio_septimalmind_baboon_parser_model_RawForeignEntryAttrs(parse0$2.E.aC());
     return parse0$2;
   }
 });
-$p.aHl = (function(evidence$3) {
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g4;
+$p.aHz = (function(evidence$3) {
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   var preLhsIndex$macro$32 = evidence$3.c;
   var input$macro$41 = evidence$3.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
   var preLhsIndex$macro$17 = evidence$3.c;
   var input$macro$26 = evidence$3.T;
-  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
   var preLhsIndex$macro$2 = evidence$3.c;
   var input$macro$11 = evidence$3.T;
   $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers.$f_Lio_septimalmind_baboon_parser_defns_base_Identifiers__symbol__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024.$m_Lio_septimalmind_baboon_parser_defns_base_idt$(), evidence$3);
   if ((!evidence$3.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$3.c;
-    var lhsAggregate$macro$6 = evidence$3.v;
-    var lhsMsg$macro$9 = evidence$3.G;
+    var lhsAggregate$macro$6 = evidence$3.s;
+    var lhsMsg$macro$9 = evidence$3.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$3.Q();
+      evidence$3.P();
     }
     var lhsValue$macro$12 = evidence$3.E;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
@@ -412,15 +412,15 @@ $p.aHl = (function(evidence$3) {
         var input = evidence$3.T;
         var index = evidence$3.c;
         if ((input.U(index) && (input.as.charCodeAt(index) === 61))) {
-          evidence$3.aK(((1 + index) | 0));
+          evidence$3.aI(((1 + index) | 0));
         } else {
-          evidence$3.aH();
+          evidence$3.aG();
         }
-        if (evidence$3.D) {
+        if (evidence$3.C) {
           evidence$3.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"=\""))));
         }
-        var rhsAggregate$macro$7 = evidence$3.v;
-        var rhsMsg$macro$8 = evidence$3.G;
+        var rhsAggregate$macro$7 = evidence$3.s;
+        var rhsMsg$macro$8 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$14 = evidence$3;
         } else {
@@ -428,12 +428,12 @@ $p.aHl = (function(evidence$3) {
           var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4);
           var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5);
           if (rhsMadeProgress$macro$10) {
-            evidence$3.Q();
+            evidence$3.P();
           }
           var res$macro$14 = evidence$3.ab(lhsValue$macro$12, nextIndex$macro$13);
         }
-        if (evidence$3.D) {
-          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$3.S));
+        if (evidence$3.C) {
+          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8), lhsAggregate$macro$6.W(rhsAggregate$macro$7), (preRhsIndex$macro$4 === evidence$3.S));
         }
       }
     }
@@ -441,10 +441,10 @@ $p.aHl = (function(evidence$3) {
   if ((!evidence$3.d)) {
   } else {
     var postLhsIndex$macro$18 = evidence$3.c;
-    var lhsAggregate$macro$21 = evidence$3.v;
-    var lhsMsg$macro$24 = evidence$3.G;
+    var lhsAggregate$macro$21 = evidence$3.s;
+    var lhsMsg$macro$24 = evidence$3.F;
     if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
-      evidence$3.Q();
+      evidence$3.P();
     }
     var lhsValue$macro$27 = evidence$3.E;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
@@ -452,9 +452,9 @@ $p.aHl = (function(evidence$3) {
       if (((!evidence$3.d) && evidence$3.p)) {
       } else {
         var preRhsIndex$macro$19 = evidence$3.c;
-        $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HH(evidence$3);
-        var rhsAggregate$macro$22 = evidence$3.v;
-        var rhsMsg$macro$23 = evidence$3.G;
+        $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dLiterals$0024$002dLiterals$0024.$m_Lio_septimalmind_baboon_parser_defns_base_Literals$Literals$().HP(evidence$3);
+        var rhsAggregate$macro$22 = evidence$3.s;
+        var rhsMsg$macro$23 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$29 = evidence$3;
         } else {
@@ -462,12 +462,12 @@ $p.aHl = (function(evidence$3) {
           var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
           var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
           if (rhsMadeProgress$macro$25) {
-            evidence$3.Q();
+            evidence$3.P();
           }
           var res$macro$29 = evidence$3.ab(x1$4.aF(lhsValue$macro$27, evidence$3.E), nextIndex$macro$28);
         }
-        if (evidence$3.D) {
-          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$3.S));
+        if (evidence$3.C) {
+          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$3.S));
         }
       }
     }
@@ -476,10 +476,10 @@ $p.aHl = (function(evidence$3) {
     var parse0$4 = evidence$3;
   } else {
     var postLhsIndex$macro$33 = evidence$3.c;
-    var lhsAggregate$macro$36 = evidence$3.v;
-    var lhsMsg$macro$39 = evidence$3.G;
+    var lhsAggregate$macro$36 = evidence$3.s;
+    var lhsMsg$macro$39 = evidence$3.F;
     if ((postLhsIndex$macro$33 > preLhsIndex$macro$32)) {
-      evidence$3.Q();
+      evidence$3.P();
     }
     var lhsValue$macro$42 = evidence$3.E;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$3);
@@ -488,11 +488,11 @@ $p.aHl = (function(evidence$3) {
         var parse0$4 = evidence$3;
       } else {
         var preRhsIndex$macro$34 = evidence$3.c;
-        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AM();
+        $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AN();
         var startPos = evidence$3.c;
         var startCut = evidence$3.p;
         evidence$3.p = false;
-        this.aHj(evidence$3);
+        this.aHx(evidence$3);
         var postSuccess = evidence$3.d;
         if (postSuccess) {
           var res$2 = evidence$3.jY(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$3.E));
@@ -502,14 +502,14 @@ $p.aHl = (function(evidence$3) {
           var res$3 = evidence$3.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
           res$3.p = (!(!(res$3.p | startCut)));
         }
-        if (evidence$3.D) {
-          var msg = evidence$3.G;
+        if (evidence$3.C) {
+          var msg = evidence$3.F;
           if ((!postSuccess)) {
-            evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(msg.dC) + ".?")))), evidence$3.v, false);
+            evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g1(msg.dL) + ".?")))), evidence$3.s, false);
           }
         }
-        var rhsAggregate$macro$37 = evidence$3.v;
-        var rhsMsg$macro$38 = evidence$3.G;
+        var rhsAggregate$macro$37 = evidence$3.s;
+        var rhsMsg$macro$38 = evidence$3.F;
         if ((!evidence$3.d)) {
           var res$macro$44 = evidence$3;
         } else {
@@ -517,12 +517,12 @@ $p.aHl = (function(evidence$3) {
           var rhsMadeProgress$macro$40 = (postRhsIndex$macro$35 > preRhsIndex$macro$34);
           var nextIndex$macro$43 = (((!rhsMadeProgress$macro$40) && input$macro$41.U(postRhsIndex$macro$35)) ? postLhsIndex$macro$33 : postRhsIndex$macro$35);
           if (rhsMadeProgress$macro$40) {
-            evidence$3.Q();
+            evidence$3.P();
           }
           var res$macro$44 = evidence$3.ab(x1$2.aF(lhsValue$macro$42, evidence$3.E), nextIndex$macro$43);
         }
-        if (evidence$3.D) {
-          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$39, rhsMsg$macro$38), lhsAggregate$macro$36.W(rhsAggregate$macro$37), (preRhsIndex$macro$34 === evidence$3.S));
+        if (evidence$3.C) {
+          evidence$3.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$39, rhsMsg$macro$38), lhsAggregate$macro$36.W(rhsAggregate$macro$37), (preRhsIndex$macro$34 === evidence$3.S));
         }
         var parse0$4 = res$macro$44;
       }
@@ -538,19 +538,19 @@ $p.aHl = (function(evidence$3) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var lang = x0.aY;
-    var tpe = x0.bk;
-    var attrs = x0.br;
-    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign$002dEntry.$c_Lio_septimalmind_baboon_parser_model_RawForeignEntry(lang, tpe, (attrs.l() ? $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign$002dEntry$002dAttrs$0024.$m_Lio_septimalmind_baboon_parser_model_RawForeignEntryAttrs$().aGl() : attrs.a0()));
+    var tpe = x0.bm;
+    var attrs = x0.bs;
+    parse0$4.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign$002dEntry.$c_Lio_septimalmind_baboon_parser_model_RawForeignEntry(lang, tpe, (attrs.l() ? $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign$002dEntry$002dAttrs$0024.$m_Lio_septimalmind_baboon_parser_model_RawForeignEntryAttrs$().aGz() : attrs.Z()));
     return parse0$4;
   }
 });
-$p.afJ = (function(evidence$4) {
+$p.afU = (function(evidence$4) {
   var startIndex = evidence$4.c;
   var instrument = (evidence$4.L !== null);
   if (instrument) {
     evidence$4.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreign").B, startIndex);
   }
-  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
+  var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n6();
   var whitespace = $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$();
   var this$4 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
   var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
@@ -563,26 +563,26 @@ $p.afJ = (function(evidence$4) {
   var x1$2;
   while (true) {
     evidence$4.p = (!(!(precut | ((count < 0) && outerCut))));
-    this.aHl(evidence$4);
-    var parsedMsg = evidence$4.G;
-    var parsedAgg = evidence$4.v;
+    this.aHz(evidence$4);
+    var parsedMsg = evidence$4.F;
+    var parsedAgg = evidence$4.s;
     var postCut = evidence$4.p;
-    var verboseFailures = evidence$4.D;
+    var verboseFailures = evidence$4.C;
     if ((!evidence$4.d)) {
       var res = (postCut ? evidence$4 : $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$4, startIndex$1, startIndex$1, count, (!(!(outerCut | postCut))), 0, evidence$4, repeater, acc));
       if (verboseFailures) {
-        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex$1, 0, evidence$4, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+        $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$1, 0, evidence$4, sepMsg, parsedMsg, lastAgg, (precut || postCut));
       }
       var x1$2 = res;
       break;
     } else {
       var beforeSepIndex = evidence$4.c;
-      acc.al(evidence$4.E);
+      acc.am(evidence$4.E);
       var nextCount = ((1 + count) | 0);
       if ((nextCount === 2147483647)) {
         var res$2 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$3__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$4, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, evidence$4, repeater, acc);
         if (verboseFailures) {
-          evidence$4.aw(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().fD(parsedMsg.dC) + ".rep")))(parsedMsg))));
+          evidence$4.aw(startIndex$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1.$c_sjsr_AnonFunction0_$$Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1(((parsedMsg) => (() => ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().g1(parsedMsg.dL) + ".rep")))(parsedMsg))));
         }
         var x1$2 = res$2;
         break;
@@ -607,29 +607,29 @@ $p.afJ = (function(evidence$4) {
   if (instrument) {
     evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreign").B, x1$2.c, x1$2.d);
   }
-  if (x1$2.D) {
+  if (x1$2.C) {
     var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreign").B)));
     var forceAggregate = (startIndex < x1$2.S);
-    x1$2.K(newshortMsg, x1$2.v, forceAggregate);
+    x1$2.K(newshortMsg, x1$2.s, forceAggregate);
     if ((!x1$2.d)) {
       x1$2.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreign").B, startIndex), x1$2.Y);
     }
   }
   return x1$2;
 });
-$p.aHk = (function(evidence$5) {
+$p.aHy = (function(evidence$5) {
   var startIndex = evidence$5.c;
   var instrument = (evidence$5.L !== null);
   if (instrument) {
     evidence$5.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreignEnclosed").B, startIndex);
   }
-  var this$1 = this.a2F;
+  var this$1 = this.a2O;
   var startIndex$1 = evidence$5.c;
   var instrument$1 = (evidence$5.L !== null);
   if (instrument$1) {
     evidence$5.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1);
   }
-  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g4;
+  var x1$2 = $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().g5;
   var preLhsIndex$macro$17 = evidence$5.c;
   var input$macro$26 = evidence$5.T;
   var x1$4 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
@@ -639,10 +639,10 @@ $p.aHk = (function(evidence$5) {
   if ((!evidence$5.d)) {
   } else {
     var postLhsIndex$macro$3 = evidence$5.c;
-    var lhsAggregate$macro$6 = evidence$5.v;
-    var lhsMsg$macro$9 = evidence$5.G;
+    var lhsAggregate$macro$6 = evidence$5.s;
+    var lhsMsg$macro$9 = evidence$5.F;
     if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-      evidence$5.Q();
+      evidence$5.P();
     }
     var lhsValue$macro$12 = evidence$5.E;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
@@ -663,11 +663,11 @@ $p.aHk = (function(evidence$5) {
           var x1$4$1 = evidence$5;
         } else {
           var postLhsIndex$macro$3$1 = evidence$5.c;
-          var lhsAggregate$macro$6$1 = evidence$5.v;
-          var lhsMsg$macro$9$1 = evidence$5.G;
+          var lhsAggregate$macro$6$1 = evidence$5.s;
+          var lhsMsg$macro$9$1 = evidence$5.F;
           evidence$5.p = true;
           if ((postLhsIndex$macro$3$1 > preLhsIndex$macro$2$1)) {
-            evidence$5.Q();
+            evidence$5.P();
           }
           $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
           if (evidence$5.d) {
@@ -681,10 +681,10 @@ $p.aHk = (function(evidence$5) {
               $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers.$f_Lio_septimalmind_baboon_parser_defns_base_Identifiers__symbol__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024.$m_Lio_septimalmind_baboon_parser_defns_base_idt$(), evidence$5);
               if (evidence$5.d) {
                 var postLhsIndex$macro$3$2 = evidence$5.c;
-                var lhsAggregate$macro$6$2 = evidence$5.v;
-                var lhsMsg$macro$9$2 = evidence$5.G;
+                var lhsAggregate$macro$6$2 = evidence$5.s;
+                var lhsMsg$macro$9$2 = evidence$5.F;
                 if ((postLhsIndex$macro$3$2 > preLhsIndex$macro$2$2)) {
-                  evidence$5.Q();
+                  evidence$5.P();
                 }
                 var lhsValue$macro$12$2 = evidence$5.E;
                 $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
@@ -694,20 +694,20 @@ $p.aHk = (function(evidence$5) {
                     var x1$2$2 = $j_fastparse$002e$002dLowest$002dPri$002dSequencer.$f_Lfastparse_LowestPriSequencer__Sequencer1__O($j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$());
                     var preLhsIndex$macro$2$3 = evidence$5.c;
                     var input$macro$11$3 = evidence$5.T;
-                    this.a2F.a0d(evidence$5);
+                    this.a2O.a0m(evidence$5);
                     if (evidence$5.d) {
                       var postLhsIndex$macro$3$3 = evidence$5.c;
-                      var lhsAggregate$macro$6$3 = evidence$5.v;
-                      var lhsMsg$macro$9$3 = evidence$5.G;
+                      var lhsAggregate$macro$6$3 = evidence$5.s;
+                      var lhsMsg$macro$9$3 = evidence$5.F;
                       if ((postLhsIndex$macro$3$3 > preLhsIndex$macro$2$3)) {
-                        evidence$5.Q();
+                        evidence$5.P();
                       }
                       var lhsValue$macro$12$3 = evidence$5.E;
                       $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
                       if (evidence$5.d) {
                         if ((!((!evidence$5.d) && evidence$5.p))) {
                           var preRhsIndex$macro$4$3 = evidence$5.c;
-                          var f = (() => this.afJ(evidence$5));
+                          var f = (() => this.afU(evidence$5));
                           var startIndex$3 = evidence$5.c;
                           var instrument$3 = (evidence$5.L !== null);
                           if (instrument$3) {
@@ -721,7 +721,7 @@ $p.aHk = (function(evidence$5) {
                           if (instrument$4) {
                             evidence$5.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4);
                           }
-                          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                           var preLhsIndex$macro$17$1 = evidence$5.c;
                           var input$macro$26$1 = evidence$5.T;
                           $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -730,20 +730,20 @@ $p.aHk = (function(evidence$5) {
                           var input = evidence$5.T;
                           var index = evidence$5.c;
                           if ((input.U(index) && (input.as.charCodeAt(index) === 123))) {
-                            evidence$5.aK(((1 + index) | 0));
+                            evidence$5.aI(((1 + index) | 0));
                           } else {
-                            evidence$5.aH();
+                            evidence$5.aG();
                           }
-                          if (evidence$5.D) {
+                          if (evidence$5.C) {
                             evidence$5.aw(index, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"{\""))));
                           }
                           if ((!evidence$5.d)) {
                           } else {
                             var postLhsIndex$macro$3$4 = evidence$5.c;
-                            var lhsAggregate$macro$6$4 = evidence$5.v;
-                            var lhsMsg$macro$9$4 = evidence$5.G;
+                            var lhsAggregate$macro$6$4 = evidence$5.s;
+                            var lhsMsg$macro$9$4 = evidence$5.F;
                             if ((postLhsIndex$macro$3$4 > preLhsIndex$macro$2$4)) {
-                              evidence$5.Q();
+                              evidence$5.P();
                             }
                             $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
                             if (evidence$5.d) {
@@ -751,8 +751,8 @@ $p.aHk = (function(evidence$5) {
                               } else {
                                 var preRhsIndex$macro$4$4 = evidence$5.c;
                                 f();
-                                var rhsAggregate$macro$7 = evidence$5.v;
-                                var rhsMsg$macro$8 = evidence$5.G;
+                                var rhsAggregate$macro$7 = evidence$5.s;
+                                var rhsMsg$macro$8 = evidence$5.F;
                                 if ((!evidence$5.d)) {
                                   var res$macro$14 = evidence$5;
                                 } else {
@@ -760,12 +760,12 @@ $p.aHk = (function(evidence$5) {
                                   var rhsMadeProgress$macro$10 = (postRhsIndex$macro$5 > preRhsIndex$macro$4$4);
                                   var nextIndex$macro$13 = (((!rhsMadeProgress$macro$10) && input$macro$11$4.U(postRhsIndex$macro$5)) ? postLhsIndex$macro$3$4 : postRhsIndex$macro$5);
                                   if (rhsMadeProgress$macro$10) {
-                                    evidence$5.Q();
+                                    evidence$5.P();
                                   }
                                   var res$macro$14 = evidence$5.ab(evidence$5.E, nextIndex$macro$13);
                                 }
-                                if (evidence$5.D) {
-                                  evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$4, rhsMsg$macro$8), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$4 === evidence$5.S));
+                                if (evidence$5.C) {
+                                  evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$4, rhsMsg$macro$8), lhsAggregate$macro$6$4.W(rhsAggregate$macro$7), (preRhsIndex$macro$4$4 === evidence$5.S));
                                 }
                               }
                             }
@@ -774,10 +774,10 @@ $p.aHk = (function(evidence$5) {
                             var x1$8 = evidence$5;
                           } else {
                             var postLhsIndex$macro$18 = evidence$5.c;
-                            var lhsAggregate$macro$21 = evidence$5.v;
-                            var lhsMsg$macro$24 = evidence$5.G;
+                            var lhsAggregate$macro$21 = evidence$5.s;
+                            var lhsMsg$macro$24 = evidence$5.F;
                             if ((postLhsIndex$macro$18 > preLhsIndex$macro$17$1)) {
-                              evidence$5.Q();
+                              evidence$5.P();
                             }
                             var lhsValue$macro$27 = evidence$5.E;
                             $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
@@ -789,15 +789,15 @@ $p.aHk = (function(evidence$5) {
                                 var input$2 = evidence$5.T;
                                 var index$2 = evidence$5.c;
                                 if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 125))) {
-                                  evidence$5.aK(((1 + index$2) | 0));
+                                  evidence$5.aI(((1 + index$2) | 0));
                                 } else {
-                                  evidence$5.aH();
+                                  evidence$5.aG();
                                 }
-                                if (evidence$5.D) {
+                                if (evidence$5.C) {
                                   evidence$5.aw(index$2, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"}\""))));
                                 }
-                                var rhsAggregate$macro$22 = evidence$5.v;
-                                var rhsMsg$macro$23 = evidence$5.G;
+                                var rhsAggregate$macro$22 = evidence$5.s;
+                                var rhsMsg$macro$23 = evidence$5.F;
                                 if ((!evidence$5.d)) {
                                   var res$macro$29 = evidence$5;
                                 } else {
@@ -805,12 +805,12 @@ $p.aHk = (function(evidence$5) {
                                   var rhsMadeProgress$macro$25 = (postRhsIndex$macro$20 > preRhsIndex$macro$19);
                                   var nextIndex$macro$28 = (((!rhsMadeProgress$macro$25) && input$macro$26$1.U(postRhsIndex$macro$20)) ? postLhsIndex$macro$18 : postRhsIndex$macro$20);
                                   if (rhsMadeProgress$macro$25) {
-                                    evidence$5.Q();
+                                    evidence$5.P();
                                   }
                                   var res$macro$29 = evidence$5.ab(lhsValue$macro$27, nextIndex$macro$28);
                                 }
-                                if (evidence$5.D) {
-                                  evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$5.S));
+                                if (evidence$5.C) {
+                                  evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24, rhsMsg$macro$23), lhsAggregate$macro$21.W(rhsAggregate$macro$22), (preRhsIndex$macro$19 === evidence$5.S));
                                 }
                                 var x1$8 = res$macro$29;
                               }
@@ -821,26 +821,26 @@ $p.aHk = (function(evidence$5) {
                           if (instrument$4) {
                             evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, x1$8.c, x1$8.d);
                           }
-                          if (x1$8.D) {
+                          if (x1$8.C) {
                             var newshortMsg = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B)));
                             var forceAggregate = (startIndex$4 < x1$8.S);
-                            x1$8.K(newshortMsg, x1$8.v, forceAggregate);
+                            x1$8.K(newshortMsg, x1$8.s, forceAggregate);
                             if ((!x1$8.d)) {
                               x1$8.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inCurlyBraces").B, startIndex$4), x1$8.Y);
                             }
                           }
-                          var lhsMsg = evidence$5.G;
-                          var lhsAggregate = evidence$5.v;
+                          var lhsMsg = evidence$5.F;
+                          var lhsAggregate = evidence$5.s;
                           if (evidence$5.d) {
                             evidence$5.p = (!(!(evidence$5.p | oldCut)));
                             var x1$3$3 = evidence$5;
                           } else if (evidence$5.p) {
                             var x1$3$3 = evidence$5;
                           } else {
-                            var verboseFailures = evidence$5.D;
+                            var verboseFailures = evidence$5.C;
                             evidence$5.c = startPos;
                             if (verboseFailures) {
-                              evidence$5.K(lhsMsg, evidence$5.v, false);
+                              evidence$5.K(lhsMsg, evidence$5.s, false);
                             }
                             evidence$5.p = false;
                             var startIndex$5 = evidence$5.c;
@@ -848,7 +848,7 @@ $p.aHk = (function(evidence$5) {
                             if (instrument$5) {
                               evidence$5.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5);
                             }
-                            $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
+                            $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
                             var preLhsIndex$macro$17$2 = evidence$5.c;
                             var input$macro$26$2 = evidence$5.T;
                             $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
@@ -857,20 +857,20 @@ $p.aHk = (function(evidence$5) {
                             var input$1 = evidence$5.T;
                             var index$1 = evidence$5.c;
                             if ((input$1.U(index$1) && (input$1.as.charCodeAt(index$1) === 40))) {
-                              evidence$5.aK(((1 + index$1) | 0));
+                              evidence$5.aI(((1 + index$1) | 0));
                             } else {
-                              evidence$5.aH();
+                              evidence$5.aG();
                             }
-                            if (evidence$5.D) {
+                            if (evidence$5.C) {
                               evidence$5.aw(index$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\"(\""))));
                             }
                             if ((!evidence$5.d)) {
                             } else {
                               var postLhsIndex$macro$3$5 = evidence$5.c;
-                              var lhsAggregate$macro$6$5 = evidence$5.v;
-                              var lhsMsg$macro$9$5 = evidence$5.G;
+                              var lhsAggregate$macro$6$5 = evidence$5.s;
+                              var lhsMsg$macro$9$5 = evidence$5.F;
                               if ((postLhsIndex$macro$3$5 > preLhsIndex$macro$2$5)) {
-                                evidence$5.Q();
+                                evidence$5.P();
                               }
                               $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
                               if (evidence$5.d) {
@@ -878,8 +878,8 @@ $p.aHk = (function(evidence$5) {
                                 } else {
                                   var preRhsIndex$macro$4$5 = evidence$5.c;
                                   f();
-                                  var rhsAggregate$macro$7$1 = evidence$5.v;
-                                  var rhsMsg$macro$8$1 = evidence$5.G;
+                                  var rhsAggregate$macro$7$1 = evidence$5.s;
+                                  var rhsMsg$macro$8$1 = evidence$5.F;
                                   if ((!evidence$5.d)) {
                                     var res$macro$14$1 = evidence$5;
                                   } else {
@@ -887,12 +887,12 @@ $p.aHk = (function(evidence$5) {
                                     var rhsMadeProgress$macro$10$1 = (postRhsIndex$macro$5$1 > preRhsIndex$macro$4$5);
                                     var nextIndex$macro$13$1 = (((!rhsMadeProgress$macro$10$1) && input$macro$11$5.U(postRhsIndex$macro$5$1)) ? postLhsIndex$macro$3$5 : postRhsIndex$macro$5$1);
                                     if (rhsMadeProgress$macro$10$1) {
-                                      evidence$5.Q();
+                                      evidence$5.P();
                                     }
                                     var res$macro$14$1 = evidence$5.ab(evidence$5.E, nextIndex$macro$13$1);
                                   }
-                                  if (evidence$5.D) {
-                                    evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$5, rhsMsg$macro$8$1), lhsAggregate$macro$6$5.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$5 === evidence$5.S));
+                                  if (evidence$5.C) {
+                                    evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$5, rhsMsg$macro$8$1), lhsAggregate$macro$6$5.W(rhsAggregate$macro$7$1), (preRhsIndex$macro$4$5 === evidence$5.S));
                                   }
                                 }
                               }
@@ -901,10 +901,10 @@ $p.aHk = (function(evidence$5) {
                               var x1$8$1 = evidence$5;
                             } else {
                               var postLhsIndex$macro$18$1 = evidence$5.c;
-                              var lhsAggregate$macro$21$1 = evidence$5.v;
-                              var lhsMsg$macro$24$1 = evidence$5.G;
+                              var lhsAggregate$macro$21$1 = evidence$5.s;
+                              var lhsMsg$macro$24$1 = evidence$5.F;
                               if ((postLhsIndex$macro$18$1 > preLhsIndex$macro$17$2)) {
-                                evidence$5.Q();
+                                evidence$5.P();
                               }
                               var lhsValue$macro$27$1 = evidence$5.E;
                               $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
@@ -916,15 +916,15 @@ $p.aHk = (function(evidence$5) {
                                   var input$2$1 = evidence$5.T;
                                   var index$2$1 = evidence$5.c;
                                   if ((input$2$1.U(index$2$1) && (input$2$1.as.charCodeAt(index$2$1) === 41))) {
-                                    evidence$5.aK(((1 + index$2$1) | 0));
+                                    evidence$5.aI(((1 + index$2$1) | 0));
                                   } else {
-                                    evidence$5.aH();
+                                    evidence$5.aG();
                                   }
-                                  if (evidence$5.D) {
+                                  if (evidence$5.C) {
                                     evidence$5.aw(index$2$1, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\")\""))));
                                   }
-                                  var rhsAggregate$macro$22$1 = evidence$5.v;
-                                  var rhsMsg$macro$23$1 = evidence$5.G;
+                                  var rhsAggregate$macro$22$1 = evidence$5.s;
+                                  var rhsMsg$macro$23$1 = evidence$5.F;
                                   if ((!evidence$5.d)) {
                                     var res$macro$29$1 = evidence$5;
                                   } else {
@@ -932,12 +932,12 @@ $p.aHk = (function(evidence$5) {
                                     var rhsMadeProgress$macro$25$1 = (postRhsIndex$macro$20$1 > preRhsIndex$macro$19$1);
                                     var nextIndex$macro$28$1 = (((!rhsMadeProgress$macro$25$1) && input$macro$26$2.U(postRhsIndex$macro$20$1)) ? postLhsIndex$macro$18$1 : postRhsIndex$macro$20$1);
                                     if (rhsMadeProgress$macro$25$1) {
-                                      evidence$5.Q();
+                                      evidence$5.P();
                                     }
                                     var res$macro$29$1 = evidence$5.ab(lhsValue$macro$27$1, nextIndex$macro$28$1);
                                   }
-                                  if (evidence$5.D) {
-                                    evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$5.S));
+                                  if (evidence$5.C) {
+                                    evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$1, rhsMsg$macro$23$1), lhsAggregate$macro$21$1.W(rhsAggregate$macro$22$1), (preRhsIndex$macro$19$1 === evidence$5.S));
                                   }
                                   var x1$8$1 = res$macro$29$1;
                                 }
@@ -948,24 +948,24 @@ $p.aHk = (function(evidence$5) {
                             if (instrument$5) {
                               evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, x1$8$1.c, x1$8$1.d);
                             }
-                            if (x1$8$1.D) {
+                            if (x1$8$1.C) {
                               var newshortMsg$1 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B)));
                               var forceAggregate$1 = (startIndex$5 < x1$8$1.S);
-                              x1$8$1.K(newshortMsg$1, x1$8$1.v, forceAggregate$1);
+                              x1$8$1.K(newshortMsg$1, x1$8$1.s, forceAggregate$1);
                               if ((!x1$8$1.d)) {
                                 x1$8$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("inBraces").B, startIndex$5), x1$8$1.Y);
                               }
                             }
-                            var rhsMsg = evidence$5.G;
+                            var rhsMsg = evidence$5.F;
                             var rhsCut = evidence$5.p;
                             var endCut = (!(!(rhsCut | oldCut)));
                             if (((!evidence$5.d) && (!rhsCut))) {
-                              evidence$5.d3(startPos);
+                              evidence$5.cZ(startPos);
                             }
                             evidence$5.p = endCut;
                             if (verboseFailures) {
                               var $x_1 = lhsMsg.W(rhsMsg);
-                              var rassoc$3 = evidence$5.v;
+                              var rassoc$3 = evidence$5.s;
                               evidence$5.K($x_1, lhsAggregate.W(rassoc$3), false);
                             }
                             var x1$3$3 = evidence$5;
@@ -973,52 +973,52 @@ $p.aHk = (function(evidence$5) {
                           if (instrument$3) {
                             evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, x1$3$3.c, x1$3$3.d);
                           }
-                          if (x1$3$3.D) {
+                          if (x1$3$3.C) {
                             var newshortMsg$3 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B)));
                             var forceAggregate$2 = (startIndex$3 < x1$3$3.S);
-                            x1$3$3.K(newshortMsg$3, x1$3$3.v, forceAggregate$2);
+                            x1$3$3.K(newshortMsg$3, x1$3$3.s, forceAggregate$2);
                             if ((!x1$3$3.d)) {
                               x1$3$3.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("enclosed").B, startIndex$3), x1$3$3.Y);
                             }
                           }
-                          var rhsAggregate$macro$7$2 = evidence$5.v;
-                          var rhsMsg$macro$8$2 = evidence$5.G;
+                          var rhsAggregate$macro$7$2 = evidence$5.s;
+                          var rhsMsg$macro$8$2 = evidence$5.F;
                           if ((!evidence$5.d)) {
                           } else {
                             var postRhsIndex$macro$5$2 = evidence$5.c;
                             var rhsMadeProgress$macro$10$2 = (postRhsIndex$macro$5$2 > preRhsIndex$macro$4$3);
                             var nextIndex$macro$13$2 = (((!rhsMadeProgress$macro$10$2) && input$macro$11$3.U(postRhsIndex$macro$5$2)) ? postLhsIndex$macro$3$3 : postRhsIndex$macro$5$2);
                             if (rhsMadeProgress$macro$10$2) {
-                              evidence$5.Q();
+                              evidence$5.P();
                             }
                             evidence$5.ab(x1$2$2.aF(lhsValue$macro$12$3, evidence$5.E), nextIndex$macro$13$2);
                           }
-                          if (evidence$5.D) {
-                            evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$3, rhsMsg$macro$8$2), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$3 === evidence$5.S));
+                          if (evidence$5.C) {
+                            evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$3, rhsMsg$macro$8$2), lhsAggregate$macro$6$3.W(rhsAggregate$macro$7$2), (preRhsIndex$macro$4$3 === evidence$5.S));
                           }
                         }
                       }
                     }
-                    var rhsAggregate$macro$7$3 = evidence$5.v;
-                    var rhsMsg$macro$8$3 = evidence$5.G;
+                    var rhsAggregate$macro$7$3 = evidence$5.s;
+                    var rhsMsg$macro$8$3 = evidence$5.F;
                     if ((!evidence$5.d)) {
                     } else {
                       var postRhsIndex$macro$5$3 = evidence$5.c;
                       var rhsMadeProgress$macro$10$3 = (postRhsIndex$macro$5$3 > preRhsIndex$macro$4$2);
                       var nextIndex$macro$13$3 = (((!rhsMadeProgress$macro$10$3) && input$macro$11$2.U(postRhsIndex$macro$5$3)) ? postLhsIndex$macro$3$2 : postRhsIndex$macro$5$3);
                       if (rhsMadeProgress$macro$10$3) {
-                        evidence$5.Q();
+                        evidence$5.P();
                       }
                       evidence$5.ab(x1$2$1.aF(lhsValue$macro$12$2, evidence$5.E), nextIndex$macro$13$3);
                     }
-                    if (evidence$5.D) {
-                      evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$2, rhsMsg$macro$8$3), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$2 === evidence$5.S));
+                    if (evidence$5.C) {
+                      evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$2, rhsMsg$macro$8$3), lhsAggregate$macro$6$2.W(rhsAggregate$macro$7$3), (preRhsIndex$macro$4$2 === evidence$5.S));
                     }
                   }
                 }
               }
-              var rhsAggregate$macro$7$4 = evidence$5.v;
-              var rhsMsg$macro$8$4 = evidence$5.G;
+              var rhsAggregate$macro$7$4 = evidence$5.s;
+              var rhsMsg$macro$8$4 = evidence$5.F;
               if ((!evidence$5.d)) {
                 evidence$5.p = true;
                 var res$macro$14$4 = evidence$5;
@@ -1027,12 +1027,12 @@ $p.aHk = (function(evidence$5) {
                 var rhsMadeProgress$macro$10$4 = (postRhsIndex$macro$5$4 > preRhsIndex$macro$4$1);
                 var nextIndex$macro$13$4 = (((!rhsMadeProgress$macro$10$4) && input$macro$11$1.U(postRhsIndex$macro$5$4)) ? postLhsIndex$macro$3$1 : postRhsIndex$macro$5$4);
                 if (rhsMadeProgress$macro$10$4) {
-                  evidence$5.Q();
+                  evidence$5.P();
                 }
                 var res$macro$14$4 = evidence$5.ab(evidence$5.E, nextIndex$macro$13$4);
               }
-              if (evidence$5.D) {
-                evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9$1, rhsMsg$macro$8$4), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$1 === evidence$5.S));
+              if (evidence$5.C) {
+                evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9$1, rhsMsg$macro$8$4), lhsAggregate$macro$6$1.W(rhsAggregate$macro$7$4), (preRhsIndex$macro$4$1 === evidence$5.S));
               }
               var x1$4$1 = res$macro$14$4;
             }
@@ -1043,16 +1043,16 @@ $p.aHk = (function(evidence$5) {
         if (instrument$2) {
           evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, x1$4$1.c, x1$4$1.d);
         }
-        if (x1$4$1.D) {
+        if (x1$4$1.C) {
           var newshortMsg$4 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B)));
           var forceAggregate$3 = (startIndex$2 < x1$4$1.S);
-          x1$4$1.K(newshortMsg$4, x1$4$1.v, forceAggregate$3);
+          x1$4$1.K(newshortMsg$4, x1$4$1.s, forceAggregate$3);
           if ((!x1$4$1.d)) {
             x1$4$1.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("apply").B, startIndex$2), x1$4$1.Y);
           }
         }
-        var rhsAggregate$macro$7$5 = evidence$5.v;
-        var rhsMsg$macro$8$5 = evidence$5.G;
+        var rhsAggregate$macro$7$5 = evidence$5.s;
+        var rhsMsg$macro$8$5 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$14$5 = evidence$5;
         } else {
@@ -1060,12 +1060,12 @@ $p.aHk = (function(evidence$5) {
           var rhsMadeProgress$macro$10$5 = (postRhsIndex$macro$5$5 > preRhsIndex$macro$4);
           var nextIndex$macro$13$5 = (((!rhsMadeProgress$macro$10$5) && input$macro$11.U(postRhsIndex$macro$5$5)) ? postLhsIndex$macro$3 : postRhsIndex$macro$5$5);
           if (rhsMadeProgress$macro$10$5) {
-            evidence$5.Q();
+            evidence$5.P();
           }
           var res$macro$14$5 = evidence$5.ab(x1$4.aF((lhsValue$macro$12 | 0), evidence$5.E), nextIndex$macro$13$5);
         }
-        if (evidence$5.D) {
-          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$9, rhsMsg$macro$8$5), lhsAggregate$macro$6.W(rhsAggregate$macro$7$5), (preRhsIndex$macro$4 === evidence$5.S));
+        if (evidence$5.C) {
+          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$9, rhsMsg$macro$8$5), lhsAggregate$macro$6.W(rhsAggregate$macro$7$5), (preRhsIndex$macro$4 === evidence$5.S));
         }
       }
     }
@@ -1074,10 +1074,10 @@ $p.aHk = (function(evidence$5) {
     var parse0$7 = evidence$5;
   } else {
     var postLhsIndex$macro$18$2 = evidence$5.c;
-    var lhsAggregate$macro$21$2 = evidence$5.v;
-    var lhsMsg$macro$24$2 = evidence$5.G;
+    var lhsAggregate$macro$21$2 = evidence$5.s;
+    var lhsMsg$macro$24$2 = evidence$5.F;
     if ((postLhsIndex$macro$18$2 > preLhsIndex$macro$17)) {
-      evidence$5.Q();
+      evidence$5.P();
     }
     var lhsValue$macro$27$2 = evidence$5.E;
     $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), evidence$5);
@@ -1087,8 +1087,8 @@ $p.aHk = (function(evidence$5) {
       } else {
         var preRhsIndex$macro$19$2 = evidence$5.c;
         $j_fastparse$002e$002dShared$002dPackage$002dDefs.$f_Lfastparse_SharedPackageDefs__Index__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_fastparse$002epackage$0024.$m_Lfastparse_package$(), evidence$5);
-        var rhsAggregate$macro$22$2 = evidence$5.v;
-        var rhsMsg$macro$23$2 = evidence$5.G;
+        var rhsAggregate$macro$22$2 = evidence$5.s;
+        var rhsMsg$macro$23$2 = evidence$5.F;
         if ((!evidence$5.d)) {
           var res$macro$29$2 = evidence$5;
         } else {
@@ -1096,12 +1096,12 @@ $p.aHk = (function(evidence$5) {
           var rhsMadeProgress$macro$25$2 = (postRhsIndex$macro$20$2 > preRhsIndex$macro$19$2);
           var nextIndex$macro$28$2 = (((!rhsMadeProgress$macro$25$2) && input$macro$26.U(postRhsIndex$macro$20$2)) ? postLhsIndex$macro$18$2 : postRhsIndex$macro$20$2);
           if (rhsMadeProgress$macro$25$2) {
-            evidence$5.Q();
+            evidence$5.P();
           }
           var res$macro$29$2 = evidence$5.ab(x1$2.aF(lhsValue$macro$27$2, (evidence$5.E | 0)), nextIndex$macro$28$2);
         }
-        if (evidence$5.D) {
-          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$5.S));
+        if (evidence$5.C) {
+          evidence$5.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ad(lhsMsg$macro$24$2, rhsMsg$macro$23$2), lhsAggregate$macro$21$2.W(rhsAggregate$macro$22$2), (preRhsIndex$macro$19$2 === evidence$5.S));
         }
         var parse0$7 = res$macro$29$2;
       }
@@ -1117,20 +1117,20 @@ $p.aHk = (function(evidence$5) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0);
     }
     var start = (x0.aY | 0);
-    var value = x0.bk;
-    var stop = (x0.br | 0);
-    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, start);
-    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.bq.c8, stop);
-    parse0$7.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.bq.ft, begin, end), value);
+    var value = x0.bm;
+    var stop = (x0.bs | 0);
+    var begin = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, start);
+    var end = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002e$002dDef$002dMeta$0024.$m_Lio_septimalmind_baboon_parser_defns_DefMeta$().cF(this$1.br.c8, stop);
+    parse0$7.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dInput$002dPointer$0024$002dFull.$c_Lio_septimalmind_baboon_parser_model_InputPointer$Full(this$1.br.fu, begin, end), value);
     var x1$2$3 = parse0$7;
   }
   if (instrument$1) {
     evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, x1$2$3.c, x1$2$3.d);
   }
-  if (x1$2$3.D) {
+  if (x1$2$3.C) {
     var newshortMsg$5 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B)));
     var forceAggregate$4 = (startIndex$1 < x1$2$3.S);
-    x1$2$3.K(newshortMsg$5, x1$2$3.v, forceAggregate$4);
+    x1$2$3.K(newshortMsg$5, x1$2$3.s, forceAggregate$4);
     if ((!x1$2$3.d)) {
       x1$2$3.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("withMeta").B, startIndex$1), x1$2$3.Y);
     }
@@ -1142,7 +1142,7 @@ $p.aHk = (function(evidence$5) {
     if ((x0$1 === null)) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1);
     }
-    x1$2$3.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.C()), x0$1.z());
+    x1$2$3.E = $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dNode$002dMeta.$c_Lio_septimalmind_baboon_parser_model_RawNodeMeta(x0$1.D()), x0$1.z());
     var parse0$8 = x1$2$3;
   }
   if ((!parse0$8.d)) {
@@ -1152,10 +1152,10 @@ $p.aHk = (function(evidence$5) {
     matchEnd4$1: {
       var $x_2;
       if ((x0$2 !== null)) {
-        var m = x0$2.C();
+        var m = x0$2.D();
         var p2 = x0$2.z();
         if ((p2 !== null)) {
-          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.C(), p2.z());
+          var $x_2 = new $j_java$002elang$002e$002dObject.$c_T3(m, p2.D(), p2.z());
           break matchEnd4$1;
         }
       }
@@ -1167,10 +1167,10 @@ $p.aHk = (function(evidence$5) {
   if (instrument) {
     evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreignEnclosed").B, x1$2$4.c, x1$2$4.d);
   }
-  if (x1$2$4.D) {
+  if (x1$2$4.C) {
     var newshortMsg$6 = $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreignEnclosed").B)));
     var forceAggregate$5 = (startIndex < x1$2$4.S);
-    x1$2$4.K(newshortMsg$6, x1$2$4.v, forceAggregate$5);
+    x1$2$4.K(newshortMsg$6, x1$2$4.s, forceAggregate$5);
     if ((!x1$2$4.d)) {
       x1$2$4.Y = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("foreignEnclosed").B, startIndex), x1$2$4.Y);
     }
@@ -1183,11 +1183,11 @@ $p.aHk = (function(evidence$5) {
       var $x_3;
       if ((x0$3 !== null)) {
         var meta = x0$3.aY;
-        var name = x0$3.bk;
-        var p2$1 = x0$3.br;
+        var name = x0$3.bm;
+        var p2$1 = x0$3.bs;
         if ((p2$1 !== null)) {
-          var derived = p2$1.C();
-          var $x_3 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign.$c_Lio_septimalmind_baboon_parser_model_RawForeign(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), p2$1.z().aB(), derived, meta);
+          var derived = p2$1.D();
+          var $x_3 = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dForeign.$c_Lio_septimalmind_baboon_parser_model_RawForeign(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name), p2$1.z().aC(), derived, meta);
           break matchEnd4$2;
         }
       }
@@ -1198,7 +1198,7 @@ $p.aHk = (function(evidence$5) {
   }
 });
 var $d_Lio_septimalmind_baboon_parser_defns_DefForeign = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_parser_defns_DefForeign, "io.septimalmind.baboon.parser.defns.DefForeign", ({
-  vu: 1
+  vx: 1
 }));
 export { $d_Lio_septimalmind_baboon_parser_defns_DefForeign as $d_Lio_septimalmind_baboon_parser_defns_DefForeign };
 //# sourceMappingURL=io.septimalmind.baboon.parser.defns.-Def-Foreign.js.map