@7mind.io/baboon 0.0.165 → 0.0.166

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

@@ -4,21 +4,373 @@ import * as $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024 from "./fastp
 import * as $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024 from "./fastparse.-Implicits$-Sequencer$.js";
 import * as $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024 from "./fastparse.-No-Whitespace$no-Whitespace-Implicit$.js";
 import * as $j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024 from "./fastparse.-Scala-Whitespace$whitespace$.js";
+import * as $j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024 from "./fastparse.-Single-Line-Whitespace$whitespace$.js";
 import * as $j_fastparse$002einternal$002e$002dMsgs from "./fastparse.internal.-Msgs.js";
 import * as $j_fastparse$002einternal$002e$002dRep$002dImpls$0024 from "./fastparse.internal.-Rep-Impls$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers from "./io.septimalmind.baboon.parser.defns.base.-Identifiers.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dKeywords from "./io.septimalmind.baboon.parser.defns.base.-Keywords.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024 from "./io.septimalmind.baboon.parser.defns.base.idt$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002ekw$0024 from "./io.septimalmind.baboon.parser.defns.base.kw$.js";
-import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dDerivation$002dDecl from "./io.septimalmind.baboon.parser.model.-Derivation-Decl.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dMember$002dMeta$0024$002dDerived from "./io.septimalmind.baboon.parser.model.-Raw-Member-Meta$-Derived.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dMember$002dMeta$0024$002dWas from "./io.septimalmind.baboon.parser.model.-Raw-Member-Meta$-Was.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName from "./io.septimalmind.baboon.parser.model.-Raw-Type-Name.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dSimple from "./io.septimalmind.baboon.parser.model.-Raw-Type-Ref$-Simple.js";
 import * as $j_java$002elang$002e$002dObject from "./java.lang.-Object.js";
-import * as $j_scala$002escalajs$002eruntime$002e$002dAnon$002dFunction0$002e$0024$0024$002dLambda$002492a2e254bbb9c06a0a02fc31abab59c51c18ecc1 from "./scala.scalajs.runtime.-Anon-Function0.$$-Lambda$92a2e254bbb9c06a0a02fc31abab59c51c18ecc1.js";
 import * as $j_sourcecode$002e$002dName from "./sourcecode.-Name.js";
 var $p;
+function $p_Lio_septimalmind_baboon_parser_defns_DefMeta__simpleTypeRef__Lfastparse_ParsingRun__Lfastparse_ParsingRun($thiz, evidence$1) {
+  var parse0 = $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dIdentifiers.$f_Lio_septimalmind_baboon_parser_defns_base_Identifiers__symbolSeq__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002eidt$0024.$m_Lio_septimalmind_baboon_parser_defns_base_idt$(), evidence$1);
+  if ((!parse0.d)) {
+    return parse0;
+  } else {
+    var x0 = parse0.E;
+    var parts = x0.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((name$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dName.$c_Lio_septimalmind_baboon_parser_model_RawTypeName(name$2$2)))).aC();
+    parse0.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dType$002dRef$0024$002dSimple.$c_Lio_septimalmind_baboon_parser_model_RawTypeRef$Simple(parts.bj(), parts.fC());
+    return parse0;
+  }
+}
+export { $p_Lio_septimalmind_baboon_parser_defns_DefMeta__simpleTypeRef__Lfastparse_ParsingRun__Lfastparse_ParsingRun as $p_Lio_septimalmind_baboon_parser_defns_DefMeta__simpleTypeRef__Lfastparse_ParsingRun__Lfastparse_ParsingRun };
+function $p_Lio_septimalmind_baboon_parser_defns_DefMeta__derivedAnnotation__Lfastparse_ParsingRun__Lfastparse_ParsingRun($thiz, evidence$2) {
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
+  var preLhsIndex$macro$32 = evidence$2.c;
+  var input$macro$41 = evidence$2.T;
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
+  var preLhsIndex$macro$17 = evidence$2.c;
+  var input$macro$26 = evidence$2.T;
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
+  var preLhsIndex$macro$2 = evidence$2.c;
+  var input$macro$11 = evidence$2.T;
+  $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dKeywords.$f_Lio_septimalmind_baboon_parser_defns_base_Keywords__kw__T__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002ekw$0024.$m_Lio_septimalmind_baboon_parser_defns_base_kw$(), "derived", evidence$2);
+  if ((!evidence$2.d)) {
+  } else {
+    var postLhsIndex$macro$3 = evidence$2.c;
+    var lhsAggregate$macro$6 = evidence$2.s;
+    var lhsMsg$macro$9 = evidence$2.F;
+    if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
+      evidence$2.P();
+    }
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$2);
+    if (evidence$2.d) {
+      if (((!evidence$2.d) && evidence$2.p)) {
+      } else {
+        var preRhsIndex$macro$4 = evidence$2.c;
+        var input = evidence$2.T;
+        var index = evidence$2.c;
+        if ((input.U(index) && (input.as.charCodeAt(index) === 91))) {
+          evidence$2.aI(((1 + index) | 0));
+        } else {
+          evidence$2.aG();
+        }
+        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((() => "\"[\""))));
+        }
+        var rhsAggregate$macro$7 = evidence$2.s;
+        var rhsMsg$macro$8 = evidence$2.F;
+        if ((!evidence$2.d)) {
+          var res$macro$14 = evidence$2;
+        } else {
+          var postRhsIndex$macro$5 = evidence$2.c;
+          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$2.P();
+          }
+          var res$macro$14 = evidence$2.ab((void 0), nextIndex$macro$13);
+        }
+        if (evidence$2.C) {
+          evidence$2.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$2.S));
+        }
+      }
+    }
+  }
+  if ((!evidence$2.d)) {
+  } else {
+    var postLhsIndex$macro$18 = evidence$2.c;
+    var lhsAggregate$macro$21 = evidence$2.s;
+    var lhsMsg$macro$24 = evidence$2.F;
+    if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
+      evidence$2.P();
+    }
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$2);
+    if (evidence$2.d) {
+      if (((!evidence$2.d) && evidence$2.p)) {
+      } else {
+        var preRhsIndex$macro$19 = evidence$2.c;
+        $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$2);
+        var rhsAggregate$macro$22 = evidence$2.s;
+        var rhsMsg$macro$23 = evidence$2.F;
+        if ((!evidence$2.d)) {
+          var res$macro$29 = evidence$2;
+        } else {
+          var postRhsIndex$macro$20 = evidence$2.c;
+          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$2.P();
+          }
+          var res$macro$29 = evidence$2.ab(evidence$2.E, nextIndex$macro$28);
+        }
+        if (evidence$2.C) {
+          evidence$2.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$2.S));
+        }
+      }
+    }
+  }
+  if ((!evidence$2.d)) {
+    var parse0$3 = evidence$2;
+  } else {
+    var postLhsIndex$macro$33 = evidence$2.c;
+    var lhsAggregate$macro$36 = evidence$2.s;
+    var lhsMsg$macro$39 = evidence$2.F;
+    if ((postLhsIndex$macro$33 > preLhsIndex$macro$32)) {
+      evidence$2.P();
+    }
+    var lhsValue$macro$42 = evidence$2.E;
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$2);
+    if (evidence$2.d) {
+      if (((!evidence$2.d) && evidence$2.p)) {
+        var parse0$3 = evidence$2;
+      } else {
+        var preRhsIndex$macro$34 = evidence$2.c;
+        var input$2 = evidence$2.T;
+        var index$2 = evidence$2.c;
+        if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 93))) {
+          evidence$2.aI(((1 + index$2) | 0));
+        } else {
+          evidence$2.aG();
+        }
+        if (evidence$2.C) {
+          evidence$2.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$37 = evidence$2.s;
+        var rhsMsg$macro$38 = evidence$2.F;
+        if ((!evidence$2.d)) {
+          var res$macro$44 = evidence$2;
+        } else {
+          var postRhsIndex$macro$35 = evidence$2.c;
+          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$2.P();
+          }
+          var res$macro$44 = evidence$2.ab(lhsValue$macro$42, nextIndex$macro$43);
+        }
+        if (evidence$2.C) {
+          evidence$2.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$2.S));
+        }
+        var parse0$3 = res$macro$44;
+      }
+    } else {
+      var parse0$3 = evidence$2;
+    }
+  }
+  if ((!parse0$3.d)) {
+    return parse0$3;
+  } else {
+    parse0$3.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dMember$002dMeta$0024$002dDerived.$c_Lio_septimalmind_baboon_parser_model_RawMemberMeta$Derived(parse0$3.E);
+    return parse0$3;
+  }
+}
+export { $p_Lio_septimalmind_baboon_parser_defns_DefMeta__derivedAnnotation__Lfastparse_ParsingRun__Lfastparse_ParsingRun as $p_Lio_septimalmind_baboon_parser_defns_DefMeta__derivedAnnotation__Lfastparse_ParsingRun__Lfastparse_ParsingRun };
+function $p_Lio_septimalmind_baboon_parser_defns_DefMeta__wasAnnotation__Lfastparse_ParsingRun__Lfastparse_ParsingRun($thiz, evidence$3) {
+  $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().es();
+  var preLhsIndex$macro$32 = evidence$3.c;
+  var input$macro$41 = evidence$3.T;
+  $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$();
+  var preLhsIndex$macro$2 = evidence$3.c;
+  var input$macro$11 = evidence$3.T;
+  $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dKeywords.$f_Lio_septimalmind_baboon_parser_defns_base_Keywords__kw__T__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002ekw$0024.$m_Lio_septimalmind_baboon_parser_defns_base_kw$(), "was", evidence$3);
+  if ((!evidence$3.d)) {
+  } else {
+    var postLhsIndex$macro$3 = evidence$3.c;
+    var lhsAggregate$macro$6 = evidence$3.s;
+    var lhsMsg$macro$9 = evidence$3.F;
+    if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
+      evidence$3.P();
+    }
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$3);
+    if (evidence$3.d) {
+      if (((!evidence$3.d) && evidence$3.p)) {
+      } else {
+        var preRhsIndex$macro$4 = evidence$3.c;
+        var input = evidence$3.T;
+        var index = evidence$3.c;
+        if ((input.U(index) && (input.as.charCodeAt(index) === 91))) {
+          evidence$3.aI(((1 + index) | 0));
+        } else {
+          evidence$3.aG();
+        }
+        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.s;
+        var rhsMsg$macro$8 = evidence$3.F;
+        if ((!evidence$3.d)) {
+          var res$macro$14 = evidence$3;
+        } else {
+          var postRhsIndex$macro$5 = evidence$3.c;
+          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.P();
+          }
+          var res$macro$14 = evidence$3.ab((void 0), nextIndex$macro$13);
+        }
+        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));
+        }
+      }
+    }
+  }
+  if ((!evidence$3.d)) {
+  } else {
+    var postLhsIndex$macro$18 = evidence$3.c;
+    var lhsAggregate$macro$21 = evidence$3.s;
+    var lhsMsg$macro$24 = evidence$3.F;
+    if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
+      evidence$3.P();
+    }
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$3);
+    if (evidence$3.d) {
+      if (((!evidence$3.d) && evidence$3.p)) {
+      } else {
+        var preRhsIndex$macro$19 = evidence$3.c;
+        $p_Lio_septimalmind_baboon_parser_defns_DefMeta__simpleTypeRef__Lfastparse_ParsingRun__Lfastparse_ParsingRun($thiz, 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 {
+          var postRhsIndex$macro$20 = evidence$3.c;
+          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.P();
+          }
+          var res$macro$29 = evidence$3.ab(evidence$3.E, nextIndex$macro$28);
+        }
+        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));
+        }
+      }
+    }
+  }
+  if ((!evidence$3.d)) {
+    var parse0$3 = evidence$3;
+  } else {
+    var postLhsIndex$macro$33 = evidence$3.c;
+    var lhsAggregate$macro$36 = evidence$3.s;
+    var lhsMsg$macro$39 = evidence$3.F;
+    if ((postLhsIndex$macro$33 > preLhsIndex$macro$32)) {
+      evidence$3.P();
+    }
+    var lhsValue$macro$42 = evidence$3.E;
+    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dSingle$002dLine$002dWhitespace$0024whitespace$0024.$m_Lfastparse_SingleLineWhitespace$whitespace$(), evidence$3);
+    if (evidence$3.d) {
+      if (((!evidence$3.d) && evidence$3.p)) {
+        var parse0$3 = evidence$3;
+      } else {
+        var preRhsIndex$macro$34 = evidence$3.c;
+        var input$2 = evidence$3.T;
+        var index$2 = evidence$3.c;
+        if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 93))) {
+          evidence$3.aI(((1 + index$2) | 0));
+        } else {
+          evidence$3.aG();
+        }
+        if (evidence$3.C) {
+          evidence$3.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$37 = evidence$3.s;
+        var rhsMsg$macro$38 = evidence$3.F;
+        if ((!evidence$3.d)) {
+          var res$macro$44 = evidence$3;
+        } else {
+          var postRhsIndex$macro$35 = evidence$3.c;
+          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.P();
+          }
+          var res$macro$44 = evidence$3.ab(lhsValue$macro$42, nextIndex$macro$43);
+        }
+        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$3 = res$macro$44;
+      }
+    } else {
+      var parse0$3 = evidence$3;
+    }
+  }
+  if ((!parse0$3.d)) {
+    return parse0$3;
+  } else {
+    parse0$3.E = new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dRaw$002dMember$002dMeta$0024$002dWas.$c_Lio_septimalmind_baboon_parser_model_RawMemberMeta$Was(parse0$3.E);
+    return parse0$3;
+  }
+}
+export { $p_Lio_septimalmind_baboon_parser_defns_DefMeta__wasAnnotation__Lfastparse_ParsingRun__Lfastparse_ParsingRun as $p_Lio_septimalmind_baboon_parser_defns_DefMeta__wasAnnotation__Lfastparse_ParsingRun__Lfastparse_ParsingRun };
+function $p_Lio_septimalmind_baboon_parser_defns_DefMeta__memberMeta__Lfastparse_ParsingRun__Lfastparse_ParsingRun($thiz, 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("memberMeta").B, startIndex);
+  }
+  var oldCut = evidence$4.p;
+  evidence$4.p = false;
+  var startPos = evidence$4.c;
+  $p_Lio_septimalmind_baboon_parser_defns_DefMeta__derivedAnnotation__Lfastparse_ParsingRun__Lfastparse_ParsingRun($thiz, evidence$4);
+  var lhsMsg = evidence$4.F;
+  var lhsAggregate = evidence$4.s;
+  if (evidence$4.d) {
+    evidence$4.p = (!(!(evidence$4.p | oldCut)));
+    var x1$3 = evidence$4;
+  } else if (evidence$4.p) {
+    var x1$3 = evidence$4;
+  } else {
+    var verboseFailures = evidence$4.C;
+    evidence$4.c = startPos;
+    if (verboseFailures) {
+      evidence$4.K(lhsMsg, evidence$4.s, false);
+    }
+    evidence$4.p = false;
+    $p_Lio_septimalmind_baboon_parser_defns_DefMeta__wasAnnotation__Lfastparse_ParsingRun__Lfastparse_ParsingRun($thiz, evidence$4);
+    var rhsMsg = evidence$4.F;
+    var rhsCut = evidence$4.p;
+    var endCut = (!(!(rhsCut | oldCut)));
+    if (((!evidence$4.d) && (!rhsCut))) {
+      evidence$4.cZ(startPos);
+    }
+    evidence$4.p = endCut;
+    if (verboseFailures) {
+      var $x_1 = lhsMsg.W(rhsMsg);
+      var rassoc$3 = evidence$4.s;
+      evidence$4.K($x_1, lhsAggregate.W(rassoc$3), false);
+    }
+    var x1$3 = evidence$4;
+  }
+  if (instrument) {
+    evidence$4.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("memberMeta").B, x1$3.c, x1$3.d);
+  }
+  if (x1$3.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("memberMeta").B)));
+    var forceAggregate = (startIndex < x1$3.S);
+    x1$3.K(newshortMsg$1, x1$3.s, forceAggregate);
+    if ((!x1$3.d)) {
+      x1$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("memberMeta").B, startIndex), x1$3.Y);
+    }
+  }
+  return x1$3;
+}
+export { $p_Lio_septimalmind_baboon_parser_defns_DefMeta__memberMeta__Lfastparse_ParsingRun__Lfastparse_ParsingRun as $p_Lio_septimalmind_baboon_parser_defns_DefMeta__memberMeta__Lfastparse_ParsingRun__Lfastparse_ParsingRun };
 /** @constructor */
 function $c_Lio_septimalmind_baboon_parser_defns_DefMeta(context) {
-  this.bq = null;
-  this.bq = context;
+  this.br = null;
+  this.br = context;
 }
 export { $c_Lio_septimalmind_baboon_parser_defns_DefMeta as $c_Lio_septimalmind_baboon_parser_defns_DefMeta };
 $p = $c_Lio_septimalmind_baboon_parser_defns_DefMeta.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -28,228 +380,96 @@ function $h_Lio_septimalmind_baboon_parser_defns_DefMeta() {
 }
 export { $h_Lio_septimalmind_baboon_parser_defns_DefMeta as $h_Lio_septimalmind_baboon_parser_defns_DefMeta };
 $h_Lio_septimalmind_baboon_parser_defns_DefMeta.prototype = $p;
-$p.a0d = (function(v) {
-  $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AM();
-  var startPos = v.c;
-  var startCut = v.p;
-  v.p = false;
-  var startIndex = v.c;
-  var instrument = (v.L !== null);
+$p.a0m = (function(evidence$5) {
+  $j_fastparse$002e$002dImplicits$0024$002dOptioner$0024.$m_Lfastparse_Implicits$Optioner$().AN();
+  var startPos = evidence$5.c;
+  var startCut = evidence$5.p;
+  evidence$5.p = false;
+  var startIndex = evidence$5.c;
+  var instrument = (evidence$5.L !== null);
   if (instrument) {
-    v.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("derived").B, startIndex);
+    evidence$5.L.av(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("derived").B, startIndex);
   }
   $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
-  var preLhsIndex$macro$47 = v.c;
-  var input$macro$56 = v.T;
-  var input = v.T;
-  var index = v.c;
+  var preLhsIndex$macro$2 = evidence$5.c;
+  var input$macro$11 = evidence$5.T;
+  var input = evidence$5.T;
+  var index = evidence$5.c;
   if ((input.U(index) && (input.as.charCodeAt(index) === 58))) {
-    v.aK(((1 + index) | 0));
+    evidence$5.aI(((1 + index) | 0));
   } else {
-    v.aH();
+    evidence$5.aG();
   }
-  if (v.D) {
-    v.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.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 ((!v.d)) {
-    var x1$7 = v;
+  if ((!evidence$5.d)) {
+    var x1$7 = evidence$5;
   } else {
-    var postLhsIndex$macro$48 = v.c;
-    var lhsAggregate$macro$51 = v.v;
-    var lhsMsg$macro$54 = v.G;
-    if ((postLhsIndex$macro$48 > preLhsIndex$macro$47)) {
-      v.Q();
+    var postLhsIndex$macro$3 = evidence$5.c;
+    var lhsAggregate$macro$6 = evidence$5.s;
+    var lhsMsg$macro$9 = evidence$5.F;
+    if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
+      evidence$5.P();
     }
-    $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), v);
-    if (v.d) {
-      if (((!v.d) && v.p)) {
-        var x1$7 = v;
+    $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 x1$7 = evidence$5;
       } else {
-        var preRhsIndex$macro$49 = v.c;
-        var repeater = $j_fastparse$002e$002dImplicits$0024$002dRepeater$0024.$m_Lfastparse_Implicits$Repeater$().n5();
+        var preRhsIndex$macro$4 = evidence$5.c;
+        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$8 = $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$m_Lfastparse_internal_RepImpls$();
         var acc = $j_java$002elang$002e$002dObject.$m_scm_Buffer$().bN();
-        var startIndex$1 = v.c;
+        var startIndex$1 = evidence$5.c;
         var count = 0;
         var precut = false;
-        var outerCut = v.p;
+        var outerCut = evidence$5.p;
         var sepMsg = null;
         var lastAgg = null;
         while (true) {
-          v.p = (!(!(precut | ((count < 0) && outerCut))));
-          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$().eN();
-          var preLhsIndex$macro$32 = v.c;
-          var input$macro$41 = v.T;
-          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
-          var preLhsIndex$macro$17 = v.c;
-          var input$macro$26 = v.T;
-          $j_fastparse$002e$002dImplicits$0024$002dSequencer$0024.$m_Lfastparse_Implicits$Sequencer$();
-          var preLhsIndex$macro$2 = v.c;
-          var input$macro$11 = v.T;
-          $j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002e$002dKeywords.$f_Lio_septimalmind_baboon_parser_defns_base_Keywords__kw__T__Lfastparse_ParsingRun__Lfastparse_ParsingRun($j_io$002eseptimalmind$002ebaboon$002eparser$002edefns$002ebase$002ekw$0024.$m_Lio_septimalmind_baboon_parser_defns_base_kw$(), "derived", v);
-          if ((!v.d)) {
-          } else {
-            var postLhsIndex$macro$3 = v.c;
-            var lhsAggregate$macro$6 = v.v;
-            var lhsMsg$macro$9 = v.G;
-            if ((postLhsIndex$macro$3 > preLhsIndex$macro$2)) {
-              v.Q();
-            }
-            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), v);
-            if (v.d) {
-              if (((!v.d) && v.p)) {
-              } else {
-                var preRhsIndex$macro$4 = v.c;
-                var input$1 = v.T;
-                var index$1 = v.c;
-                if ((input$1.U(index$1) && (input$1.as.charCodeAt(index$1) === 91))) {
-                  v.aK(((1 + index$1) | 0));
-                } else {
-                  v.aH();
-                }
-                if (v.D) {
-                  v.aw(index$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$7 = v.v;
-                var rhsMsg$macro$8 = v.G;
-                if ((!v.d)) {
-                  var res$macro$14 = v;
-                } else {
-                  var postRhsIndex$macro$5 = v.c;
-                  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) {
-                    v.Q();
-                  }
-                  var res$macro$14 = v.ab((void 0), nextIndex$macro$13);
-                }
-                if (v.D) {
-                  v.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 === v.S));
-                }
-              }
-            }
-          }
-          if ((!v.d)) {
-          } else {
-            var postLhsIndex$macro$18 = v.c;
-            var lhsAggregate$macro$21 = v.v;
-            var lhsMsg$macro$24 = v.G;
-            if ((postLhsIndex$macro$18 > preLhsIndex$macro$17)) {
-              v.Q();
-            }
-            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), v);
-            if (v.d) {
-              if (((!v.d) && v.p)) {
-              } else {
-                var preRhsIndex$macro$19 = v.c;
-                $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$(), v);
-                var rhsAggregate$macro$22 = v.v;
-                var rhsMsg$macro$23 = v.G;
-                if ((!v.d)) {
-                  var res$macro$29 = v;
-                } else {
-                  var postRhsIndex$macro$20 = v.c;
-                  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) {
-                    v.Q();
-                  }
-                  var res$macro$29 = v.ab(v.E, nextIndex$macro$28);
-                }
-                if (v.D) {
-                  v.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 === v.S));
-                }
-              }
-            }
-          }
-          if (v.d) {
-            var postLhsIndex$macro$33 = v.c;
-            var lhsAggregate$macro$36 = v.v;
-            var lhsMsg$macro$39 = v.G;
-            if ((postLhsIndex$macro$33 > preLhsIndex$macro$32)) {
-              v.Q();
-            }
-            var lhsValue$macro$42 = v.E;
-            $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac($j_fastparse$002e$002dScala$002dWhitespace$0024whitespace$0024.$m_Lfastparse_ScalaWhitespace$whitespace$(), v);
-            if (v.d) {
-              if ((!((!v.d) && v.p))) {
-                var preRhsIndex$macro$34 = v.c;
-                var input$2 = v.T;
-                var index$2 = v.c;
-                if ((input$2.U(index$2) && (input$2.as.charCodeAt(index$2) === 93))) {
-                  v.aK(((1 + index$2) | 0));
-                } else {
-                  v.aH();
-                }
-                if (v.D) {
-                  v.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$37 = v.v;
-                var rhsMsg$macro$38 = v.G;
-                if ((!v.d)) {
-                } else {
-                  var postRhsIndex$macro$35 = v.c;
-                  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) {
-                    v.Q();
-                  }
-                  v.ab(lhsValue$macro$42, nextIndex$macro$43);
-                }
-                if (v.D) {
-                  v.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 === v.S));
-                }
-              }
-            }
-          }
-          var parsedMsg = v.G;
-          var parsedAgg = v.v;
-          var postCut = v.p;
-          var verboseFailures = v.D;
-          if ((!v.d)) {
+          evidence$5.p = (!(!(precut | ((count < 1) && outerCut))));
+          $p_Lio_septimalmind_baboon_parser_defns_DefMeta__memberMeta__Lfastparse_ParsingRun__Lfastparse_ParsingRun(this, evidence$5);
+          var parsedMsg = evidence$5.F;
+          var parsedAgg = evidence$5.s;
+          var postCut = evidence$5.p;
+          var verboseFailures = evidence$5.C;
+          if ((!evidence$5.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$8, startIndex$1, startIndex$1, count, (!(!(outerCut | postCut))), 0, v, repeater, acc);
+              $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$4__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$8, startIndex$1, startIndex$1, count, (!(!(outerCut | postCut))), 1, evidence$5, repeater, acc);
             }
             if (verboseFailures) {
-              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex$1, 0, v, sepMsg, parsedMsg, lastAgg, (precut || postCut));
+              $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$1, 1, evidence$5, sepMsg, parsedMsg, lastAgg, (precut || postCut));
               break;
             } else {
               break;
             }
           } else {
-            var beforeSepIndex = v.c;
-            acc.al(v.E);
+            var beforeSepIndex = evidence$5.c;
+            acc.am(evidence$5.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$8, beforeSepIndex, beforeSepIndex, nextCount, (!(!(outerCut | postCut))), 0, v, repeater, acc);
-              if (verboseFailures) {
-                v.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))));
-                break;
-              } else {
-                break;
-              }
-            } else if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, v), (!((!v.d) && v.p))))) {
-              v.p = false;
-              var input$3 = v.T;
-              var index$3 = v.c;
-              var res$4 = ((input$3.U(index$3) && (input$3.as.charCodeAt(index$3) === 44)) ? v.aK(((1 + index$3) | 0)) : v.aH());
-              if (v.D) {
-                v.aw(index$3, $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Msgs$().X(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction0_$$Lambda$a02b774b97db8234e08c6a02dd06557c99779855((() => "\",\""))));
+            if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, evidence$5), (!((!evidence$5.d) && evidence$5.p))))) {
+              evidence$5.p = false;
+              var input$1 = evidence$5.T;
+              var index$1 = evidence$5.c;
+              var res$2 = ((input$1.U(index$1) && (input$1.as.charCodeAt(index$1) === 44)) ? evidence$5.aI(((1 + index$1) | 0)) : evidence$5.aG());
+              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((() => "\",\""))));
               }
-              var sepCut = v.p;
+              var sepCut = evidence$5.p;
               var endCut = (!(!((!(!(outerCut | postCut))) | sepCut)));
-              if ((res$4 === null)) {
+              if ((res$2 === null)) {
                 startIndex$1 = beforeSepIndex;
                 count = nextCount;
                 precut = false;
                 outerCut = endCut;
                 sepMsg = null;
                 lastAgg = parsedAgg;
-              } else if (v.d) {
-                var sepMsg$2 = v.G;
-                if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, v), (!((!v.d) && (sepCut || v.p)))))) {
+              } else if (evidence$5.d) {
+                var sepMsg$2 = evidence$5.F;
+                if (((whitespace === $j_fastparse$002e$002dNo$002dWhitespace$0024no$002dWhitespace$002dImplicit$0024.$m_Lfastparse_NoWhitespace$noWhitespaceImplicit$()) || ($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ac(whitespace, evidence$5), (!((!evidence$5.d) && (sepCut || evidence$5.p)))))) {
                   startIndex$1 = beforeSepIndex;
                   count = nextCount;
                   precut = sepCut;
@@ -261,12 +481,12 @@ $p.a0d = (function(v) {
                 }
               } else {
                 if (sepCut) {
-                  v.B7(beforeSepIndex, endCut);
+                  evidence$5.B8(beforeSepIndex, endCut);
                 } 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$8, beforeSepIndex, beforeSepIndex, nextCount, endCut, 0, v, repeater, acc);
+                  $j_fastparse$002einternal$002e$002dRep$002dImpls$0024.$p_Lfastparse_internal_RepImpls$__end$4__I__I__I__Z__I__Lfastparse_ParsingRun__Lfastparse_Implicits$Repeater__O__Lfastparse_ParsingRun(this$8, beforeSepIndex, beforeSepIndex, nextCount, endCut, 1, evidence$5, repeater, acc);
                 }
                 if (verboseFailures) {
-                  $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().iu(startIndex$1, 0, v, null, parsedMsg, parsedAgg, true);
+                  $j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().it(startIndex$1, 1, evidence$5, null, parsedMsg, parsedAgg, true);
                   break;
                 } else {
                   break;
@@ -277,68 +497,68 @@ $p.a0d = (function(v) {
             }
           }
         }
-        var rhsAggregate$macro$52 = v.v;
-        var rhsMsg$macro$53 = v.G;
-        if ((!v.d)) {
-          var res$macro$59 = v;
+        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 {
-          var postRhsIndex$macro$50 = v.c;
-          var rhsMadeProgress$macro$55 = (postRhsIndex$macro$50 > preRhsIndex$macro$49);
-          var nextIndex$macro$58 = (((!rhsMadeProgress$macro$55) && input$macro$56.U(postRhsIndex$macro$50)) ? postLhsIndex$macro$48 : postRhsIndex$macro$50);
-          if (rhsMadeProgress$macro$55) {
-            v.Q();
+          var postRhsIndex$macro$5 = evidence$5.c;
+          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$5.P();
           }
-          var res$macro$59 = v.ab(v.E, nextIndex$macro$58);
+          var res$macro$14 = evidence$5.ab(evidence$5.E, nextIndex$macro$13);
         }
-        if (v.D) {
-          v.K($j_fastparse$002einternal$002e$002dMsgs.$m_Lfastparse_internal_Util$().ae(lhsMsg$macro$54, rhsMsg$macro$53), lhsAggregate$macro$51.W(rhsAggregate$macro$52), (preRhsIndex$macro$49 === v.S));
+        if (evidence$5.C) {
+          evidence$5.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$5.S));
         }
-        var x1$7 = res$macro$59;
+        var x1$7 = res$macro$14;
       }
     } else {
-      var x1$7 = v;
+      var x1$7 = evidence$5;
     }
   }
   if (instrument) {
-    v.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("derived").B, x1$7.c, x1$7.d);
+    evidence$5.L.au(new $j_sourcecode$002e$002dName.$c_Lsourcecode_Name("derived").B, x1$7.c, x1$7.d);
   }
-  if (x1$7.D) {
+  if (x1$7.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("derived").B)));
     var forceAggregate = (startIndex < x1$7.S);
-    x1$7.K(newshortMsg, x1$7.v, forceAggregate);
+    x1$7.K(newshortMsg, x1$7.s, forceAggregate);
     if ((!x1$7.d)) {
       x1$7.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("derived").B, startIndex), x1$7.Y);
     }
   }
-  var postSuccess = v.d;
+  var postSuccess = evidence$5.d;
   if (postSuccess) {
-    var res$2$2 = v.jY(new $j_java$002elang$002e$002dObject.$c_s_Some(v.E));
+    var res$2$2 = evidence$5.jY(new $j_java$002elang$002e$002dObject.$c_s_Some(evidence$5.E));
     res$2$2.p = (!(!(res$2$2.p | startCut)));
-    var res$4$1 = res$2$2;
-  } else if (v.p) {
-    var res$4$1 = v;
+    var res$4 = res$2$2;
+  } else if (evidence$5.p) {
+    var res$4 = evidence$5;
   } else {
-    var res$3$2 = v.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
-    res$3$2.p = (!(!(res$3$2.p | startCut)));
-    var res$4$1 = res$3$2;
+    var res$3 = evidence$5.ab($j_java$002elang$002e$002dObject.$m_s_None$(), startPos);
+    res$3.p = (!(!(res$3.p | startCut)));
+    var res$4 = res$3;
   }
-  if (v.D) {
-    var msg = v.G;
+  if (evidence$5.C) {
+    var msg = evidence$5.F;
     if ((!postSuccess)) {
-      v.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) + ".?")))), v.v, false);
+      evidence$5.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$5.s, false);
     }
   }
-  if ((!res$4$1.d)) {
-    return res$4$1;
+  if ((!res$4.d)) {
+    return res$4;
   } else {
-    var x0 = res$4$1.E;
-    var this$29 = (x0.l() ? $j_java$002elang$002e$002dObject.$m_s_None$() : new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$m_sci_Set$().a3(x0.a0().O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((id$2$2) => new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002e$002dDerivation$002dDecl.$c_Lio_septimalmind_baboon_parser_model_DerivationDecl(id$2$2)))))));
-    res$4$1.E = (this$29.l() ? $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$() : this$29.a0());
-    return res$4$1;
+    var x0 = res$4.E;
+    var this$18 = (x0.l() ? $j_java$002elang$002e$002dObject.$m_s_None$() : new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$m_sci_Set$().a3(x0.Z())));
+    res$4.E = (this$18.l() ? $j_java$002elang$002e$002dObject.$m_sci_Set$EmptySet$() : this$18.Z());
+    return res$4;
   }
 });
 var $d_Lio_septimalmind_baboon_parser_defns_DefMeta = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_parser_defns_DefMeta, "io.septimalmind.baboon.parser.defns.DefMeta", ({
-  vv: 1
+  vy: 1
 }));
 export { $d_Lio_septimalmind_baboon_parser_defns_DefMeta as $d_Lio_septimalmind_baboon_parser_defns_DefMeta };
 //# sourceMappingURL=io.septimalmind.baboon.parser.defns.-Def-Meta.js.map