From c1b43a6d73ed7e101197a4ce4dda6bf7d3428edb Mon Sep 17 00:00:00 2001 From: hackerg Date: Wed, 23 Dec 2020 16:10:51 +1100 Subject: [PATCH 1/7] Adding {oi'a} to camxes-exp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit △ oi’a [UI] Attitudinal: offended/insulted - unoffended - deserving and accepting — Confer: {jgicro}, .{oi}, .{o’a} --- camxes-exp.js | 861 ++++++++++++++++++++++++----------------------- camxes-exp.peg | 2 +- camxes-exp.pegjs | 2 +- 3 files changed, 447 insertions(+), 418 deletions(-) diff --git a/camxes-exp.js b/camxes-exp.js index 49d4a88..78fd533 100644 --- a/camxes-exp.js +++ b/camxes-exp.js @@ -59806,13 +59806,13 @@ var camxes = (function() { } if (s2 !== peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -59834,22 +59834,16 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { - s8 = peg$parsei(); - if (s8 !== peg$FAILED) { - s4 = [s4, s5, s6, s7, s8]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6, s7]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -59868,15 +59862,15 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { - s8 = peg$parseu(); + s8 = peg$parsei(); if (s8 !== peg$FAILED) { s4 = [s4, s5, s6, s7, s8]; s3 = s4; @@ -59902,16 +59896,22 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; + s8 = peg$parseu(); + if (s8 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -59930,13 +59930,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsex(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsea(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -59960,11 +59960,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -59986,14 +59986,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60010,10 +60016,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60024,18 +60036,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60046,11 +60052,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); + s6 = peg$parsee(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60068,11 +60074,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60094,7 +60100,7 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); + s6 = peg$parseo(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60112,11 +60118,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parsee(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60134,12 +60140,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60150,18 +60162,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60176,7 +60182,7 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60194,7 +60200,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { @@ -60216,12 +60222,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsee(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60232,9 +60244,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -60248,18 +60260,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60270,11 +60276,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60292,12 +60298,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseo(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60308,9 +60320,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -60324,18 +60336,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60346,11 +60352,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60370,10 +60376,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseu(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60384,18 +60396,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60408,10 +60414,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60422,18 +60434,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60446,10 +60452,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseo(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60462,16 +60474,10 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60482,12 +60488,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseu(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60498,9 +60510,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -60514,18 +60526,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60536,11 +60542,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parseo(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60558,12 +60564,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60574,18 +60586,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60600,7 +60606,7 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parsea(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60618,7 +60624,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { @@ -60640,11 +60646,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60662,12 +60668,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseo(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60678,18 +60690,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60700,12 +60706,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseu(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60716,18 +60728,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60738,11 +60744,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60760,20 +60766,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsee(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60788,13 +60788,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60816,13 +60816,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsec(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60844,13 +60844,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60872,13 +60872,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60900,13 +60900,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60928,13 +60928,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60956,13 +60956,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60984,13 +60984,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61012,13 +61012,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61040,7 +61040,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { s5 = peg$parseu(); if (s5 !== peg$FAILED) { @@ -61068,13 +61068,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61096,13 +61096,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61124,13 +61124,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61152,13 +61152,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61180,13 +61180,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61208,9 +61208,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -61236,13 +61236,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61264,13 +61264,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsev(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61292,13 +61292,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsev(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61320,13 +61320,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61348,13 +61348,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61376,13 +61376,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61404,13 +61404,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61432,9 +61432,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -61460,13 +61460,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61488,13 +61488,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61516,13 +61516,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61544,14 +61544,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parsea(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -61566,20 +61572,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -61594,13 +61594,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsen(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61622,13 +61622,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsen(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61650,13 +61650,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61678,13 +61678,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61706,14 +61706,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -61728,20 +61734,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -61756,13 +61756,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61784,13 +61784,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61812,7 +61812,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { s5 = peg$parsei(); if (s5 !== peg$FAILED) { @@ -61840,13 +61840,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61870,11 +61870,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61896,13 +61896,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61930,7 +61930,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61958,7 +61958,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61986,7 +61986,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62014,7 +62014,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62038,11 +62038,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62064,13 +62064,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62092,9 +62092,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -62120,13 +62120,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsef(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62148,14 +62148,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsef(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parsei(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -62170,20 +62176,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseg(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -62198,13 +62198,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parseg(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62226,13 +62226,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62254,13 +62254,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62282,13 +62282,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62316,7 +62316,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62338,13 +62338,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsev(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62366,13 +62366,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsev(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62394,12 +62394,24 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsex(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parsea(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -62410,24 +62422,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseg(); + s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); - if (s6 !== peg$FAILED) { - s7 = peg$parsee(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -62438,13 +62438,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parseg(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62464,6 +62464,35 @@ var camxes = (function() { peg$currPos = s3; s3 = peg$c0; } + if (s3 === peg$FAILED) { + s3 = peg$currPos; + s4 = peg$parseb(); + if (s4 !== peg$FAILED) { + s5 = peg$parseu(); + if (s5 !== peg$FAILED) { + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } } } } diff --git a/camxes-exp.peg b/camxes-exp.peg index 0e339fa..195614f 100644 --- a/camxes-exp.peg +++ b/camxes-exp.peg @@ -1859,7 +1859,7 @@ TUhE <- &cmavo ( t u h e ) &post_word TUhU <- &cmavo ( t u h u ) &post_word #// EXP-ADD: ko'oi, si'au, o'ai, xe'e, xo'o -UI <- &cmavo ( u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word +UI <- &cmavo ( o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word VA <- &cmavo ( v i / v a / v u ) &post_word diff --git a/camxes-exp.pegjs b/camxes-exp.pegjs index bce2192..c30db4e 100644 --- a/camxes-exp.pegjs +++ b/camxes-exp.pegjs @@ -2047,7 +2047,7 @@ TUhE = expr:(&cmavo ( t u h e ) &post_word) {return _node("TUhE", expr);} TUhU = expr:(&cmavo ( t u h u ) &post_word) {return _node("TUhU", expr);} //// EXP-ADD: ko'oi, si'au, o'ai, xe'e, xo'o -UI = expr:(&cmavo ( u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word) {return _node("UI", expr);} +UI = expr:(&cmavo ( o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word) {return _node("UI", expr);} VA = expr:(&cmavo ( v i / v a / v u ) &post_word) {return _node("VA", expr);} From 4808af9175a049d1992701691ebd66042194ee8c Mon Sep 17 00:00:00 2001 From: hackerg Date: Sun, 27 Dec 2020 09:14:19 +1100 Subject: [PATCH 2/7] Adding {co'a'a} and {sau'a} to camxes-exp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit △co’a’a [ZAhO] superfective inchoative; starting too late — Opposite of {xa’o} by {co’a}; also opposite of {co’u’a}. △ sau’a [ZAhO] interval event contour: succeeding at … — See also {snada}. --- camxes-exp.js | 184 +++++++++++++++++++++++++++++++++-------------- camxes-exp.peg | 2 +- camxes-exp.pegjs | 2 +- 3 files changed, 132 insertions(+), 56 deletions(-) diff --git a/camxes-exp.js b/camxes-exp.js index 78fd533..348fcbf 100644 --- a/camxes-exp.js +++ b/camxes-exp.js @@ -64334,30 +64334,18 @@ var camxes = (function() { } if (s2 !== peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsec(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseh(); if (s7 !== peg$FAILED) { - s8 = peg$parseu(); + s8 = peg$parsea(); if (s8 !== peg$FAILED) { - s9 = peg$parseh(); - if (s9 !== peg$FAILED) { - s10 = peg$parsea(); - if (s10 !== peg$FAILED) { - s4 = [s4, s5, s6, s7, s8, s9, s10]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6, s7, s8]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -64380,16 +64368,28 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsex(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; + s8 = peg$parseh(); + if (s8 !== peg$FAILED) { + s9 = peg$parsea(); + if (s9 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8, s9]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -64414,14 +64414,20 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { - s8 = peg$parseh(); + s8 = peg$parseu(); if (s8 !== peg$FAILED) { - s9 = peg$parsea(); + s9 = peg$parseh(); if (s9 !== peg$FAILED) { - s4 = [s4, s5, s6, s7, s8, s9]; - s3 = s4; + s10 = peg$parsea(); + if (s10 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8, s9, s10]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -64448,13 +64454,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsec(); + s4 = peg$parsex(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -64476,16 +64482,28 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; + s8 = peg$parseh(); + if (s8 !== peg$FAILED) { + s9 = peg$parsea(); + if (s9 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8, s9]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -64510,7 +64528,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -64532,13 +64550,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -64562,11 +64580,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsec(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -64588,13 +64606,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsec(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -64616,13 +64634,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -64644,13 +64662,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -64674,7 +64692,7 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -64700,7 +64718,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { @@ -64728,13 +64746,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsex(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -64754,6 +64772,64 @@ var camxes = (function() { peg$currPos = s3; s3 = peg$c0; } + if (s3 === peg$FAILED) { + s3 = peg$currPos; + s4 = peg$parsez(); + if (s4 !== peg$FAILED) { + s5 = peg$parsea(); + if (s5 !== peg$FAILED) { + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + if (s3 === peg$FAILED) { + s3 = peg$currPos; + s4 = peg$parsex(); + if (s4 !== peg$FAILED) { + s5 = peg$parsea(); + if (s5 !== peg$FAILED) { + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } + } } } } diff --git a/camxes-exp.peg b/camxes-exp.peg index 195614f..40bfef2 100644 --- a/camxes-exp.peg +++ b/camxes-exp.peg @@ -1882,7 +1882,7 @@ XI <- &cmavo ( x i ) &post_word Y <- &cmavo ( y+ ) &post_word #// EXP-ADD: xa'o -ZAhO <- &cmavo ( c o h a u h a / x o h u / c o h u h a / c o h i / p u h o / c o h u / m o h u / c a h o / c o h a / d e h a / b a h o / d i h a / z a h o / x a h o ) &post_word +ZAhO <- &cmavo ( s a u h a / c o h a h a / c o h a u h a / x o h u / c o h u h a / c o h i / p u h o / c o h u / m o h u / c a h o / c o h a / d e h a / b a h o / d i h a / z a h o / x a h o ) &post_word ZEhA <- &cmavo ( z e h u / z e h a / z e h i / z e h e ) &post_word diff --git a/camxes-exp.pegjs b/camxes-exp.pegjs index c30db4e..98c21cc 100644 --- a/camxes-exp.pegjs +++ b/camxes-exp.pegjs @@ -2070,7 +2070,7 @@ XI = expr:(&cmavo ( x i ) &post_word) {return _node("XI", expr);} Y = expr:(&cmavo ( y+ ) &post_word) {return _node("Y", expr);} //// EXP-ADD: xa'o -ZAhO = expr:(&cmavo ( c o h a u h a / x o h u / c o h u h a / c o h i / p u h o / c o h u / m o h u / c a h o / c o h a / d e h a / b a h o / d i h a / z a h o / x a h o ) &post_word) {return _node("ZAhO", expr);} +ZAhO = expr:(&cmavo ( s a u h a / c o h a h a / c o h a u h a / x o h u / c o h u h a / c o h i / p u h o / c o h u / m o h u / c a h o / c o h a / d e h a / b a h o / d i h a / z a h o / x a h o ) &post_word) {return _node("ZAhO", expr);} ZEhA = expr:(&cmavo ( z e h u / z e h a / z e h i / z e h e ) &post_word) {return _node("ZEhA", expr);} From da10f83ad39c42ce2c11ffdb230d6bcf7f34c6a1 Mon Sep 17 00:00:00 2001 From: hackerg Date: Tue, 29 Dec 2020 18:39:06 +1100 Subject: [PATCH 3/7] Added {cei'a} to camxes-exp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit △ cei’a [MOI] x1 is the year / era of years indicated by PA (digit string) in calendar system x2 — In the PA string, use PA4 digits as blanks to refer to time ranges. For example: ”lo pasobixo’e cei’a” is the eighties (198X years), ”lo pamuso’ixo’e cei’a” is the late 16th century (high 15XX years). x1 is an event or concept. --- camxes-exp.js | 79 ++++++++++++++++++++++++++++++++++-------------- camxes-exp.peg | 2 +- camxes-exp.pegjs | 2 +- 3 files changed, 59 insertions(+), 24 deletions(-) diff --git a/camxes-exp.js b/camxes-exp.js index 348fcbf..9b3240b 100644 --- a/camxes-exp.js +++ b/camxes-exp.js @@ -54615,7 +54615,7 @@ var camxes = (function() { } function peg$parseMOI() { - var s0, s1, s2, s3, s4, s5, s6, s7; + var s0, s1, s2, s3, s4, s5, s6, s7, s8; var key = peg$currPos * 812 + 755, cached = peg$cache[key]; @@ -54639,14 +54639,26 @@ var camxes = (function() { } if (s2 !== peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parsei(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parseh(); + if (s7 !== peg$FAILED) { + s8 = peg$parsea(); + if (s8 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -54663,7 +54675,7 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parsei(); if (s6 !== peg$FAILED) { @@ -54683,20 +54695,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -54711,13 +54717,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsec(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -54739,13 +54745,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsev(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -54765,6 +54771,35 @@ var camxes = (function() { peg$currPos = s3; s3 = peg$c0; } + if (s3 === peg$FAILED) { + s3 = peg$currPos; + s4 = peg$parsev(); + if (s4 !== peg$FAILED) { + s5 = peg$parsea(); + if (s5 !== peg$FAILED) { + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parsee(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } } } } diff --git a/camxes-exp.peg b/camxes-exp.peg index 40bfef2..bf22a5a 100644 --- a/camxes-exp.peg +++ b/camxes-exp.peg @@ -1788,7 +1788,7 @@ MOhE <- &cmavo ( m o h e ) &post_word MOhI <- &cmavo ( m o h i ) &post_word -MOI <- &cmavo ( m e i / m o i / s i h e / c u h o / v a h e ) &post_word +MOI <- &cmavo ( c e i h a / m e i / m o i / s i h e / c u h o / v a h e ) &post_word NA <- &cmavo ( j a h a / n a ) &post_word diff --git a/camxes-exp.pegjs b/camxes-exp.pegjs index 98c21cc..6195904 100644 --- a/camxes-exp.pegjs +++ b/camxes-exp.pegjs @@ -1976,7 +1976,7 @@ MOhE = expr:(&cmavo ( m o h e ) &post_word) {return _node("MOhE", expr);} MOhI = expr:(&cmavo ( m o h i ) &post_word) {return _node("MOhI", expr);} -MOI = expr:(&cmavo ( m e i / m o i / s i h e / c u h o / v a h e ) &post_word) {return _node("MOI", expr);} +MOI = expr:(&cmavo ( c e i h a / m e i / m o i / s i h e / c u h o / v a h e ) &post_word) {return _node("MOI", expr);} NA = expr:(&cmavo ( j a h a / n a ) &post_word) {return _node("NA", expr);} From fe8fcecf60aff3f636c737d70d7e47838778018a Mon Sep 17 00:00:00 2001 From: hackerg Date: Sun, 3 Jan 2021 12:11:37 +1100 Subject: [PATCH 4/7] Adding {ai'i} to camxes-exp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit △ai’i [UI1] attitudinal: determination - lack of determination - resignation — Expresses an intent/will to act or continue, the lack thereof, or an intent to give up, respectively. Based on {ai} and {a’i}, but unlike {ai}, this makes no implication of decision/indecision. See also {mukti}, {zukte}, {randa}. --- camxes-exp.js | 865 ++++++++++++++++++++++++----------------------- camxes-exp.peg | 2 +- camxes-exp.pegjs | 2 +- 3 files changed, 449 insertions(+), 420 deletions(-) diff --git a/camxes-exp.js b/camxes-exp.js index 9b3240b..106ad26 100644 --- a/camxes-exp.js +++ b/camxes-exp.js @@ -59841,13 +59841,13 @@ var camxes = (function() { } if (s2 !== peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -59869,13 +59869,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -59897,22 +59897,16 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { - s8 = peg$parsei(); - if (s8 !== peg$FAILED) { - s4 = [s4, s5, s6, s7, s8]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6, s7]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -59931,15 +59925,15 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { - s8 = peg$parseu(); + s8 = peg$parsei(); if (s8 !== peg$FAILED) { s4 = [s4, s5, s6, s7, s8]; s3 = s4; @@ -59965,16 +59959,22 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; + s8 = peg$parseu(); + if (s8 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -59993,13 +59993,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsex(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsea(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60023,11 +60023,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60049,14 +60049,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60073,10 +60079,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60087,18 +60099,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60109,11 +60115,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); + s6 = peg$parsee(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60131,11 +60137,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60157,7 +60163,7 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); + s6 = peg$parseo(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60175,11 +60181,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parsee(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60197,12 +60203,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60213,18 +60225,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60239,7 +60245,7 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60257,7 +60263,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { @@ -60279,12 +60285,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsee(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60295,9 +60307,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -60311,18 +60323,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60333,11 +60339,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60355,12 +60361,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseo(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60371,9 +60383,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -60387,18 +60399,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60409,11 +60415,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60433,10 +60439,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseu(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60447,18 +60459,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60471,10 +60477,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60485,18 +60497,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60509,10 +60515,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseo(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60525,16 +60537,10 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60545,12 +60551,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseu(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60561,9 +60573,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -60577,18 +60589,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60599,11 +60605,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parseo(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60621,12 +60627,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60637,18 +60649,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60663,7 +60669,7 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parsea(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60681,7 +60687,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { @@ -60703,11 +60709,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60725,12 +60731,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseo(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60741,18 +60753,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60763,12 +60769,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseu(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60779,18 +60791,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60801,11 +60807,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60823,20 +60829,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsee(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60851,13 +60851,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60879,13 +60879,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsec(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60907,13 +60907,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60935,13 +60935,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60963,13 +60963,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60991,13 +60991,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61019,13 +61019,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61047,13 +61047,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61075,13 +61075,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61103,7 +61103,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { s5 = peg$parseu(); if (s5 !== peg$FAILED) { @@ -61131,13 +61131,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61159,13 +61159,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61187,13 +61187,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61215,13 +61215,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61243,13 +61243,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61271,9 +61271,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -61299,13 +61299,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61327,13 +61327,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsev(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61355,13 +61355,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsev(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61383,13 +61383,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61411,13 +61411,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61439,13 +61439,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61467,13 +61467,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61495,9 +61495,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -61523,13 +61523,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61551,13 +61551,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61579,13 +61579,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61607,14 +61607,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parsea(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -61629,20 +61635,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -61657,13 +61657,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsen(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61685,13 +61685,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsen(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61713,13 +61713,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61741,13 +61741,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61769,14 +61769,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -61791,20 +61797,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -61819,13 +61819,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61847,13 +61847,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61875,7 +61875,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { s5 = peg$parsei(); if (s5 !== peg$FAILED) { @@ -61903,13 +61903,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61933,11 +61933,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61959,13 +61959,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61993,7 +61993,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62021,7 +62021,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62049,7 +62049,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62077,7 +62077,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62101,11 +62101,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62127,13 +62127,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62155,9 +62155,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -62183,13 +62183,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsef(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62211,14 +62211,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsef(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parsei(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -62233,20 +62239,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseg(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -62261,13 +62261,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parseg(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62289,13 +62289,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62317,13 +62317,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62345,13 +62345,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62379,7 +62379,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62401,13 +62401,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsev(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62429,13 +62429,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsev(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62457,12 +62457,24 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsex(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parsea(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -62473,24 +62485,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseg(); + s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); - if (s6 !== peg$FAILED) { - s7 = peg$parsee(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -62501,13 +62501,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parseg(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62527,6 +62527,35 @@ var camxes = (function() { peg$currPos = s3; s3 = peg$c0; } + if (s3 === peg$FAILED) { + s3 = peg$currPos; + s4 = peg$parseb(); + if (s4 !== peg$FAILED) { + s5 = peg$parseu(); + if (s5 !== peg$FAILED) { + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } } } } diff --git a/camxes-exp.peg b/camxes-exp.peg index bf22a5a..0d29419 100644 --- a/camxes-exp.peg +++ b/camxes-exp.peg @@ -1859,7 +1859,7 @@ TUhE <- &cmavo ( t u h e ) &post_word TUhU <- &cmavo ( t u h u ) &post_word #// EXP-ADD: ko'oi, si'au, o'ai, xe'e, xo'o -UI <- &cmavo ( o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word +UI <- &cmavo ( a i h i / o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word VA <- &cmavo ( v i / v a / v u ) &post_word diff --git a/camxes-exp.pegjs b/camxes-exp.pegjs index 6195904..d60fffc 100644 --- a/camxes-exp.pegjs +++ b/camxes-exp.pegjs @@ -2047,7 +2047,7 @@ TUhE = expr:(&cmavo ( t u h e ) &post_word) {return _node("TUhE", expr);} TUhU = expr:(&cmavo ( t u h u ) &post_word) {return _node("TUhU", expr);} //// EXP-ADD: ko'oi, si'au, o'ai, xe'e, xo'o -UI = expr:(&cmavo ( o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word) {return _node("UI", expr);} +UI = expr:(&cmavo ( a i h i / o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word) {return _node("UI", expr);} VA = expr:(&cmavo ( v i / v a / v u ) &post_word) {return _node("VA", expr);} From 33f659cb88ddeb2781b0f0240eacc2edca753fdb Mon Sep 17 00:00:00 2001 From: hackerg Date: Fri, 8 Jan 2021 14:58:37 +1100 Subject: [PATCH 5/7] Added {ju'oi} to camxes-exp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit △ ju’oi [UI2] evidential: I know that… — May also be used to say you know the answer to a question asked to you, or an indirect question ({kau}) you had tagged. See {ju’oinai}, {djuno}, {ju’o} --- camxes-exp.js | 881 ++++++++++++++++++++++++----------------------- camxes-exp.peg | 2 +- camxes-exp.pegjs | 2 +- 3 files changed, 460 insertions(+), 425 deletions(-) diff --git a/camxes-exp.js b/camxes-exp.js index 106ad26..bb1798a 100644 --- a/camxes-exp.js +++ b/camxes-exp.js @@ -59841,16 +59841,22 @@ var camxes = (function() { } if (s2 !== peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; + s8 = peg$parsei(); + if (s8 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -59869,13 +59875,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -59897,13 +59903,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -59925,22 +59931,16 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { - s8 = peg$parsei(); - if (s8 !== peg$FAILED) { - s4 = [s4, s5, s6, s7, s8]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6, s7]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -59959,15 +59959,15 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { - s8 = peg$parseu(); + s8 = peg$parsei(); if (s8 !== peg$FAILED) { s4 = [s4, s5, s6, s7, s8]; s3 = s4; @@ -59993,16 +59993,22 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; + s8 = peg$parseu(); + if (s8 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60021,13 +60027,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsex(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsea(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60051,11 +60057,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60077,14 +60083,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60101,10 +60113,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60115,18 +60133,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60137,11 +60149,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); + s6 = peg$parsee(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60159,11 +60171,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60185,7 +60197,7 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); + s6 = peg$parseo(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60203,11 +60215,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parsee(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60225,12 +60237,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60241,18 +60259,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60267,7 +60279,7 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60285,7 +60297,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { @@ -60307,12 +60319,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsee(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60323,9 +60341,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -60339,18 +60357,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60361,11 +60373,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60383,12 +60395,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseo(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60399,9 +60417,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -60415,18 +60433,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60437,11 +60449,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60461,10 +60473,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseu(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60475,18 +60493,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60499,10 +60511,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60513,18 +60531,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsea(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60537,10 +60549,16 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseo(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60553,16 +60571,10 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60573,12 +60585,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsea(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseu(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60589,9 +60607,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -60605,18 +60623,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60627,11 +60639,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); + s6 = peg$parseo(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60649,12 +60661,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parsea(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60665,18 +60683,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseo(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parsea(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60691,7 +60703,7 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parsea(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60709,7 +60721,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parseo(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { @@ -60731,11 +60743,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseo(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60753,12 +60765,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseo(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60769,18 +60787,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsee(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60791,12 +60803,18 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsee(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseu(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -60807,18 +60825,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsei(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parseh(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60829,11 +60841,11 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseu(); + s4 = peg$parsei(); if (s4 !== peg$FAILED) { s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parsee(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { s4 = [s4, s5, s6]; s3 = s4; @@ -60851,20 +60863,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parseu(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseh(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsee(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -60879,13 +60885,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60907,13 +60913,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsec(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60935,13 +60941,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60963,13 +60969,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -60991,13 +60997,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61019,13 +61025,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61047,13 +61053,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61075,13 +61081,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61103,13 +61109,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61131,7 +61137,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { s5 = peg$parseu(); if (s5 !== peg$FAILED) { @@ -61159,13 +61165,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61187,13 +61193,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61215,13 +61221,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61243,13 +61249,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61271,13 +61277,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61299,9 +61305,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -61327,13 +61333,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61355,13 +61361,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsev(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61383,13 +61389,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsev(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61411,13 +61417,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61439,13 +61445,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61467,13 +61473,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61495,13 +61501,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61523,9 +61529,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -61551,13 +61557,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61579,13 +61585,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61607,13 +61613,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61635,14 +61641,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parsea(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -61657,20 +61669,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -61685,13 +61691,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsen(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61713,13 +61719,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsen(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61741,13 +61747,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61769,13 +61775,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61797,14 +61803,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -61819,20 +61831,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -61847,13 +61853,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61875,13 +61881,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61903,7 +61909,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { s5 = peg$parsei(); if (s5 !== peg$FAILED) { @@ -61931,13 +61937,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsep(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61961,11 +61967,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -61987,13 +61993,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parsep(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62021,7 +62027,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62049,7 +62055,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62077,7 +62083,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62105,7 +62111,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62129,11 +62135,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62155,13 +62161,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsel(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62183,9 +62189,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsej(); + s4 = peg$parsel(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -62211,13 +62217,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsef(); + s4 = peg$parsej(); if (s4 !== peg$FAILED) { s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62239,14 +62245,20 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsef(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parsei(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -62261,20 +62273,14 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseg(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -62289,13 +62295,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parseg(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62317,13 +62323,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62345,13 +62351,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parseb(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62373,13 +62379,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parses(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62407,7 +62413,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62429,13 +62435,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsev(); + s4 = peg$parses(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62457,13 +62463,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsev(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62485,12 +62491,24 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsex(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parsea(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -62501,24 +62519,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseg(); + s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); - if (s6 !== peg$FAILED) { - s7 = peg$parsee(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -62529,13 +62535,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parseb(); + s4 = peg$parseg(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -62555,6 +62561,35 @@ var camxes = (function() { peg$currPos = s3; s3 = peg$c0; } + if (s3 === peg$FAILED) { + s3 = peg$currPos; + s4 = peg$parseb(); + if (s4 !== peg$FAILED) { + s5 = peg$parseu(); + if (s5 !== peg$FAILED) { + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parseo(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } } } } diff --git a/camxes-exp.peg b/camxes-exp.peg index 0d29419..5314558 100644 --- a/camxes-exp.peg +++ b/camxes-exp.peg @@ -1859,7 +1859,7 @@ TUhE <- &cmavo ( t u h e ) &post_word TUhU <- &cmavo ( t u h u ) &post_word #// EXP-ADD: ko'oi, si'au, o'ai, xe'e, xo'o -UI <- &cmavo ( a i h i / o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word +UI <- &cmavo ( j u h o i / a i h i / o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word VA <- &cmavo ( v i / v a / v u ) &post_word diff --git a/camxes-exp.pegjs b/camxes-exp.pegjs index d60fffc..af65fc3 100644 --- a/camxes-exp.pegjs +++ b/camxes-exp.pegjs @@ -2047,7 +2047,7 @@ TUhE = expr:(&cmavo ( t u h e ) &post_word) {return _node("TUhE", expr);} TUhU = expr:(&cmavo ( t u h u ) &post_word) {return _node("TUhU", expr);} //// EXP-ADD: ko'oi, si'au, o'ai, xe'e, xo'o -UI = expr:(&cmavo ( a i h i / o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word) {return _node("UI", expr);} +UI = expr:(&cmavo ( j u h o i / a i h i / o i h a / u e h i / k o h o i / s i h a u / o h a i / x e h e / x o h o / i h a / i e / a h e / u h i / i h o / i h e / a h a / i a / o h i / o h e / e h e / o i / u o / e h i / u h o / a u / u a / a h i / i h u / i i / u h a / u i / a h o / a i / a h u / i u / e i / o h o / e h a / u u / o h a / o h u / u h u / e h o / i o / e h u / u e / i h i / u h e / b a h a / j a h o / c a h e / s u h a / t i h e / k a h u / s e h o / z a h a / p e h i / r u h a / j u h a / t a h o / r a h u / l i h a / b a h u / m u h a / d o h a / t o h u / v a h i / p a h e / z u h u / s a h e / l a h a / k e h u / s a h u / d a h i / j e h u / s a h a / k a u / t a h u / n a h i / j o h a / b i h u / l i h o / p a u / m i h u / k u h i / j i h a / s i h a / p o h o / p e h a / r o h i / r o h e / r o h o / r o h u / r o h a / r e h e / l e h o / j u h o / f u h i / d a i / g a h i / z o h o / b e h u / r i h e / s e h i / s e h a / v u h e / k i h a / x u / g e h e / b u h o ) &post_word) {return _node("UI", expr);} VA = expr:(&cmavo ( v i / v a / v u ) &post_word) {return _node("VA", expr);} From 0a7665b14570f97cd145fa4b3c7f9d74da1d7acf Mon Sep 17 00:00:00 2001 From: hackerg Date: Sat, 9 Jan 2021 19:03:32 +1100 Subject: [PATCH 6/7] Added {xei'e} to camxes-exp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit △ xei’e [KOhA] pro-sumti: the virtual ”here” we are communicating in — It may feel imprecisely metaphorical to use {vi} or {ti} or {stuzi} when talking online and wanting to refer to ”here” (= this call, this server, this chat room). Participants share a virtual space, but are far apart spatially. {xei’e} captures this spatial metaphor precisely: to {zvati} {xei’e} means exactly ”to have access to the current communication channel”. This metaphor then extends itself to {cliva}, {klama}, {stuzi}, {zvakansa}, saying ”{cladu} {fe} {xei’e}”, etc. --- camxes-exp.js | 329 ++++++++++++++++++++++++++--------------------- camxes-exp.peg | 2 +- camxes-exp.pegjs | 2 +- 3 files changed, 184 insertions(+), 149 deletions(-) diff --git a/camxes-exp.js b/camxes-exp.js index bb1798a..9969c95 100644 --- a/camxes-exp.js +++ b/camxes-exp.js @@ -50826,15 +50826,15 @@ var camxes = (function() { } if (s2 !== peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parsex(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseh(); if (s7 !== peg$FAILED) { - s8 = peg$parsei(); + s8 = peg$parsee(); if (s8 !== peg$FAILED) { s4 = [s4, s5, s6, s7, s8]; s3 = s4; @@ -50860,15 +50860,15 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsen(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { - s6 = peg$parseu(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseh(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { - s8 = peg$parseo(); + s8 = peg$parsei(); if (s8 !== peg$FAILED) { s4 = [s4, s5, s6, s7, s8]; s3 = s4; @@ -50894,16 +50894,22 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsen(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parseu(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseh(); if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; + s8 = peg$parseo(); + if (s8 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -50928,7 +50934,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -50952,11 +50958,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -50984,7 +50990,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51008,11 +51014,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51040,7 +51046,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51066,10 +51072,16 @@ var camxes = (function() { if (s4 !== peg$FAILED) { s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); + s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s7 = peg$parsee(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -51086,18 +51098,12 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); + s6 = peg$parsei(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -51112,13 +51118,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51146,16 +51152,10 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { - s8 = peg$parsei(); - if (s8 !== peg$FAILED) { - s4 = [s4, s5, s6, s7, s8]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5, s6, s7]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -51176,14 +51176,20 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { s7 = peg$parsea(); if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; + s8 = peg$parsei(); + if (s8 !== peg$FAILED) { + s4 = [s4, s5, s6, s7, s8]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -51204,7 +51210,7 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { @@ -51230,13 +51236,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51258,13 +51264,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51286,13 +51292,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsef(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51314,13 +51320,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsef(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51348,7 +51354,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51376,7 +51382,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51404,7 +51410,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51426,13 +51432,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsef(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseu(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51460,7 +51466,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51488,7 +51494,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51516,7 +51522,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51538,13 +51544,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsev(); + s4 = peg$parsef(); if (s4 !== peg$FAILED) { s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51572,7 +51578,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsea(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51600,7 +51606,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsei(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51628,7 +51634,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseo(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51656,7 +51662,7 @@ var camxes = (function() { if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51678,12 +51684,24 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parser(); + s4 = peg$parsev(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parseu(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -51696,7 +51714,7 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -51712,7 +51730,7 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parser(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -51726,7 +51744,7 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parset(); + s4 = peg$parser(); if (s4 !== peg$FAILED) { s5 = peg$parsea(); if (s5 !== peg$FAILED) { @@ -51744,7 +51762,7 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parset(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -51760,7 +51778,7 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parset(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -51774,24 +51792,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parset(); if (s4 !== peg$FAILED) { s5 = peg$parsei(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); - if (s6 !== peg$FAILED) { - s7 = peg$parseo(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -51802,13 +51808,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsea(); + s7 = peg$parseo(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51830,12 +51836,24 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parsea(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -51846,24 +51864,12 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsez(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseu(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { - s6 = peg$parseh(); - if (s6 !== peg$FAILED) { - s7 = peg$parsei(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$c0; - } - } else { - peg$currPos = s3; - s3 = peg$c0; - } + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$c0; @@ -51876,11 +51882,11 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parseu(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parsee(); + s7 = peg$parsei(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51902,13 +51908,13 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsec(); + s4 = peg$parsez(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s6 = peg$parseh(); if (s6 !== peg$FAILED) { - s7 = peg$parseu(); + s7 = peg$parsee(); if (s7 !== peg$FAILED) { s4 = [s4, s5, s6, s7]; s3 = s4; @@ -51930,12 +51936,24 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsec(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; + s6 = peg$parseh(); + if (s6 !== peg$FAILED) { + s7 = peg$parseu(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -51948,7 +51966,7 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsee(); + s5 = peg$parsea(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -51964,7 +51982,7 @@ var camxes = (function() { s3 = peg$currPos; s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parsee(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -51978,9 +51996,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsek(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -51994,9 +52012,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsem(); + s4 = peg$parsek(); if (s4 !== peg$FAILED) { - s5 = peg$parsei(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -52010,9 +52028,9 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsed(); + s4 = peg$parsem(); if (s4 !== peg$FAILED) { - s5 = peg$parseo(); + s5 = peg$parsei(); if (s5 !== peg$FAILED) { s4 = [s4, s5]; s3 = s4; @@ -52026,14 +52044,34 @@ var camxes = (function() { } if (s3 === peg$FAILED) { s3 = peg$currPos; - s4 = peg$parsex(); + s4 = peg$parsed(); if (s4 !== peg$FAILED) { - s5 = peg$parsea(); + s5 = peg$parseo(); if (s5 !== peg$FAILED) { - s6 = peg$parsei(); - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; + s4 = [s4, s5]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } + } else { + peg$currPos = s3; + s3 = peg$c0; + } + if (s3 === peg$FAILED) { + s3 = peg$currPos; + s4 = peg$parsex(); + if (s4 !== peg$FAILED) { + s5 = peg$parsea(); + if (s5 !== peg$FAILED) { + s6 = peg$parsei(); + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$c0; + } } else { peg$currPos = s3; s3 = peg$c0; @@ -52042,9 +52080,6 @@ var camxes = (function() { peg$currPos = s3; s3 = peg$c0; } - } else { - peg$currPos = s3; - s3 = peg$c0; } } } diff --git a/camxes-exp.peg b/camxes-exp.peg index 5314558..781be7c 100644 --- a/camxes-exp.peg +++ b/camxes-exp.peg @@ -1736,7 +1736,7 @@ KEI <- &cmavo ( k e i ) &post_word KI <- &cmavo ( k i ) &post_word #// EXP-ADD: xai -KOhA <- &cmavo ( z u h a i / n a u h o / d a h u / d a h e / d i h u / d i h e / d e h u / d e h e / d e i / d o h i / m i h o / m i h a i / m a h a / m i h a / d o h o / k o h a / f o h u / k o h e / k o h i / k o h o / k o h u / f o h a / f o h e / f o h i / f o h o / v o h a / v o h e / v o h i / v o h o / v o h u / r u / r i / r a / t a / t u / t i / z i h o / k e h a / m a / z u h i / z o h e / c e h u / d a / d e / d i / k o / m i / d o / x a i) &post_word +KOhA <- &cmavo ( x e i h e / z u h a i / n a u h o / d a h u / d a h e / d i h u / d i h e / d e h u / d e h e / d e i / d o h i / m i h o / m i h a i / m a h a / m i h a / d o h o / k o h a / f o h u / k o h e / k o h i / k o h o / k o h u / f o h a / f o h e / f o h i / f o h o / v o h a / v o h e / v o h i / v o h o / v o h u / r u / r i / r a / t a / t u / t i / z i h o / k e h a / m a / z u h i / z o h e / c e h u / d a / d e / d i / k o / m i / d o / x a i) &post_word KU <- &cmavo ( k u ) &post_word diff --git a/camxes-exp.pegjs b/camxes-exp.pegjs index af65fc3..ab625ad 100644 --- a/camxes-exp.pegjs +++ b/camxes-exp.pegjs @@ -1924,7 +1924,7 @@ KEI = expr:(&cmavo ( k e i ) &post_word) {return _node("KEI", expr);} KI = expr:(&cmavo ( k i ) &post_word) {return _node("KI", expr);} //// EXP-ADD: xai -KOhA = expr:(&cmavo ( z u h a i / n a u h o / d a h u / d a h e / d i h u / d i h e / d e h u / d e h e / d e i / d o h i / m i h o / m i h a i / m a h a / m i h a / d o h o / k o h a / f o h u / k o h e / k o h i / k o h o / k o h u / f o h a / f o h e / f o h i / f o h o / v o h a / v o h e / v o h i / v o h o / v o h u / r u / r i / r a / t a / t u / t i / z i h o / k e h a / m a / z u h i / z o h e / c e h u / d a / d e / d i / k o / m i / d o / x a i) &post_word) {return _node("KOhA", expr);} +KOhA = expr:(&cmavo ( x e i h e / z u h a i / n a u h o / d a h u / d a h e / d i h u / d i h e / d e h u / d e h e / d e i / d o h i / m i h o / m i h a i / m a h a / m i h a / d o h o / k o h a / f o h u / k o h e / k o h i / k o h o / k o h u / f o h a / f o h e / f o h i / f o h o / v o h a / v o h e / v o h i / v o h o / v o h u / r u / r i / r a / t a / t u / t i / z i h o / k e h a / m a / z u h i / z o h e / c e h u / d a / d e / d i / k o / m i / d o / x a i) &post_word) {return _node("KOhA", expr);} KU = expr:(&cmavo ( k u ) &post_word) {return _node("KU", expr);} From 7cf6cab76a982f23d5932e0a1045d5b8f5268020 Mon Sep 17 00:00:00 2001 From: hackerg Date: Thu, 21 Jan 2021 10:33:52 +1100 Subject: [PATCH 7/7] Removing "mz" as an impermissible consonant pair from camxes-exp. This restriction just makes no sense and I know no Lojbanist who likes it, so I'm experimentally removing it from the sandbox. --- camxes-exp.js | 21 +++------------------ camxes-exp.peg | 2 +- camxes-exp.pegjs | 2 +- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/camxes-exp.js b/camxes-exp.js index 9969c95..37592c0 100644 --- a/camxes-exp.js +++ b/camxes-exp.js @@ -38539,7 +38539,7 @@ var camxes = (function() { } function peg$parsem() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8; + var s0, s1, s2, s3, s4, s5, s6, s7; var key = peg$currPos * 812 + 654, cached = peg$cache[key]; @@ -38599,23 +38599,8 @@ var camxes = (function() { s6 = peg$c0; } if (s6 !== peg$FAILED) { - s7 = peg$currPos; - peg$silentFails++; - s8 = peg$parsez(); - peg$silentFails--; - if (s8 === peg$FAILED) { - s7 = peg$c3; - } else { - peg$currPos = s7; - s7 = peg$c0; - } - if (s7 !== peg$FAILED) { - s2 = [s2, s3, s4, s5, s6, s7]; - s1 = s2; - } else { - peg$currPos = s1; - s1 = peg$c0; - } + s2 = [s2, s3, s4, s5, s6]; + s1 = s2; } else { peg$currPos = s1; s1 = peg$c0; diff --git a/camxes-exp.peg b/camxes-exp.peg index 781be7c..9affeb3 100644 --- a/camxes-exp.peg +++ b/camxes-exp.peg @@ -1563,7 +1563,7 @@ unvoiced <- c / f / k / p / s / t / x l <- comma* [lL] !h !glide !l -m <- comma* [mM] !h !glide !m !z +m <- comma* [mM] !h !glide !m n <- comma* [nN] !h !glide !n !affricate diff --git a/camxes-exp.pegjs b/camxes-exp.pegjs index ab625ad..911cdf6 100644 --- a/camxes-exp.pegjs +++ b/camxes-exp.pegjs @@ -1751,7 +1751,7 @@ unvoiced = expr:(c / f / k / p / s / t / x) {return _node("unvoiced", expr);} l = expr:(comma* [lL] !h !glide !l) {return _node("l", expr);} -m = expr:(comma* [mM] !h !glide !m !z) {return _node("m", expr);} +m = expr:(comma* [mM] !h !glide !m) {return _node("m", expr);} n = expr:(comma* [nN] !h !glide !n !affricate) {return _node("n", expr);}