From ab87f9bcbc87010e2b5fe877322cc920d7ebf784 Mon Sep 17 00:00:00 2001 From: Mingun Date: Sat, 23 Jan 2016 23:45:06 +0500 Subject: [PATCH] Optimization: regenerate parser --- lib/parser.js | 810 ++++++++++++++++++-------------------------------- 1 file changed, 288 insertions(+), 522 deletions(-) diff --git a/lib/parser.js b/lib/parser.js index b81d9b326..4acb69af5 100644 --- a/lib/parser.js +++ b/lib/parser.js @@ -645,75 +645,50 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = peg$parse__(); - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - s3 = peg$parseInitializer(); - if (s3 !== peg$FAILED) { - s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - s3 = [s3, s4]; - s2 = s3; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - if (s2 === peg$FAILED) { - s2 = null; - } - if (s2 !== peg$FAILED) { - s3 = []; + s2 = peg$currPos; + s3 = peg$parseInitializer(); + if (s3 !== peg$FAILED) { + s4 = peg$parse__(); + s3 = [s3, s4]; + s2 = s3; + } else { + peg$currPos = s2; + s2 = peg$FAILED; + } + if (s2 === peg$FAILED) { + s2 = null; + } + s3 = []; + s4 = peg$currPos; + s5 = peg$parseRule(); + if (s5 !== peg$FAILED) { + s6 = peg$parse__(); + s5 = [s5, s6]; + s4 = s5; + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + if (s4 !== peg$FAILED) { + while (s4 !== peg$FAILED) { + s3.push(s4); s4 = peg$currPos; s5 = peg$parseRule(); if (s5 !== peg$FAILED) { s6 = peg$parse__(); - if (s6 !== peg$FAILED) { - s5 = [s5, s6]; - s4 = s5; - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } + s5 = [s5, s6]; + s4 = s5; } else { peg$currPos = s4; s4 = peg$FAILED; } - if (s4 !== peg$FAILED) { - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$currPos; - s5 = peg$parseRule(); - if (s5 !== peg$FAILED) { - s6 = peg$parse__(); - if (s6 !== peg$FAILED) { - s5 = [s5, s6]; - s4 = s5; - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c0(s2, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; } + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c0(s2, s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -751,54 +726,34 @@ function peg$parse(input, options) { s1 = peg$parseIdentifierName(); if (s1 !== peg$FAILED) { s2 = peg$parse__(); - if (s2 !== peg$FAILED) { - s3 = peg$currPos; - s4 = peg$parseStringLiteral(); - if (s4 !== peg$FAILED) { - s5 = peg$parse__(); - if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - if (s3 === peg$FAILED) { - s3 = null; - } - if (s3 !== peg$FAILED) { - if (peg$silentFails === 0) { peg$expect(peg$c3); } - if (input.charCodeAt(peg$currPos) === 61) { - s4 = peg$c2; - peg$currPos++; - } else { - s4 = peg$FAILED; - } - if (s4 !== peg$FAILED) { - s5 = peg$parse__(); - if (s5 !== peg$FAILED) { - s6 = peg$parseChoiceExpression(); - if (s6 !== peg$FAILED) { - s7 = peg$parseEOS(); - if (s7 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c4(s1, s3, s6); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + s3 = peg$currPos; + s4 = peg$parseStringLiteral(); + if (s4 !== peg$FAILED) { + s5 = peg$parse__(); + s4 = [s4, s5]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + if (s3 === peg$FAILED) { + s3 = null; + } + if (peg$silentFails === 0) { peg$expect(peg$c3); } + if (input.charCodeAt(peg$currPos) === 61) { + s4 = peg$c2; + peg$currPos++; + } else { + s4 = peg$FAILED; + } + if (s4 !== peg$FAILED) { + s5 = peg$parse__(); + s6 = peg$parseChoiceExpression(); + if (s6 !== peg$FAILED) { + s7 = peg$parseEOS(); + if (s7 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c4(s1, s3, s6); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -828,29 +783,19 @@ function peg$parse(input, options) { s2 = []; s3 = peg$currPos; s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - if (peg$silentFails === 0) { peg$expect(peg$c6); } - if (input.charCodeAt(peg$currPos) === 47) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - } - if (s5 !== peg$FAILED) { - s6 = peg$parse__(); - if (s6 !== peg$FAILED) { - s7 = peg$parseActionExpression(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } + if (peg$silentFails === 0) { peg$expect(peg$c6); } + if (input.charCodeAt(peg$currPos) === 47) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + } + if (s5 !== peg$FAILED) { + s6 = peg$parse__(); + s7 = peg$parseActionExpression(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$FAILED; @@ -863,29 +808,19 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$currPos; s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - if (peg$silentFails === 0) { peg$expect(peg$c6); } - if (input.charCodeAt(peg$currPos) === 47) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - } - if (s5 !== peg$FAILED) { - s6 = peg$parse__(); - if (s6 !== peg$FAILED) { - s7 = peg$parseActionExpression(); - if (s7 !== peg$FAILED) { - s4 = [s4, s5, s6, s7]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } + if (peg$silentFails === 0) { peg$expect(peg$c6); } + if (input.charCodeAt(peg$currPos) === 47) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + } + if (s5 !== peg$FAILED) { + s6 = peg$parse__(); + s7 = peg$parseActionExpression(); + if (s7 !== peg$FAILED) { + s4 = [s4, s5, s6, s7]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$FAILED; @@ -895,13 +830,8 @@ function peg$parse(input, options) { s3 = peg$FAILED; } } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c7(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + peg$savedPos = s0; + s0 = peg$c7(s1, s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -918,15 +848,10 @@ function peg$parse(input, options) { if (s1 !== peg$FAILED) { s2 = peg$currPos; s3 = peg$parse__(); - if (s3 !== peg$FAILED) { - s4 = peg$parseCodeBlock(); - if (s4 !== peg$FAILED) { - s3 = [s3, s4]; - s2 = s3; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } + s4 = peg$parseCodeBlock(); + if (s4 !== peg$FAILED) { + s3 = [s3, s4]; + s2 = s3; } else { peg$currPos = s2; s2 = peg$FAILED; @@ -934,13 +859,8 @@ function peg$parse(input, options) { if (s2 === peg$FAILED) { s2 = null; } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c8(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + peg$savedPos = s0; + s0 = peg$c8(s1, s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -958,15 +878,10 @@ function peg$parse(input, options) { s2 = []; s3 = peg$currPos; s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - s5 = peg$parseLabeledExpression(); - if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } + s5 = peg$parseLabeledExpression(); + if (s5 !== peg$FAILED) { + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$FAILED; @@ -975,27 +890,17 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$currPos; s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - s5 = peg$parseLabeledExpression(); - if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } + s5 = peg$parseLabeledExpression(); + if (s5 !== peg$FAILED) { + s4 = [s4, s5]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$FAILED; } } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c9(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + peg$savedPos = s0; + s0 = peg$c9(s1, s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -1011,29 +916,19 @@ function peg$parse(input, options) { s1 = peg$parseIdentifier(); if (s1 !== peg$FAILED) { s2 = peg$parse__(); - if (s2 !== peg$FAILED) { - if (peg$silentFails === 0) { peg$expect(peg$c11); } - if (input.charCodeAt(peg$currPos) === 58) { - s3 = peg$c10; - peg$currPos++; - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - s5 = peg$parsePrefixedExpression(); - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c12(s1, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + if (peg$silentFails === 0) { peg$expect(peg$c11); } + if (input.charCodeAt(peg$currPos) === 58) { + s3 = peg$c10; + peg$currPos++; + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + s4 = peg$parse__(); + s5 = peg$parsePrefixedExpression(); + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c12(s1, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -1060,15 +955,10 @@ function peg$parse(input, options) { s1 = peg$parsePrefixedOperator(); if (s1 !== peg$FAILED) { s2 = peg$parse__(); - if (s2 !== peg$FAILED) { - s3 = peg$parseSuffixedExpression(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c13(s1, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + s3 = peg$parseSuffixedExpression(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c13(s1, s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -1123,15 +1013,10 @@ function peg$parse(input, options) { s1 = peg$parsePrimaryExpression(); if (s1 !== peg$FAILED) { s2 = peg$parse__(); - if (s2 !== peg$FAILED) { - s3 = peg$parseSuffixedOperator(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c20(s1, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + s3 = peg$parseSuffixedOperator(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c20(s1, s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -1202,29 +1087,19 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { s2 = peg$parse__(); - if (s2 !== peg$FAILED) { - s3 = peg$parseChoiceExpression(); - if (s3 !== peg$FAILED) { - s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - if (peg$silentFails === 0) { peg$expect(peg$c30); } - if (input.charCodeAt(peg$currPos) === 41) { - s5 = peg$c29; - peg$currPos++; - } else { - s5 = peg$FAILED; - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c31(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + s3 = peg$parseChoiceExpression(); + if (s3 !== peg$FAILED) { + s4 = peg$parse__(); + if (peg$silentFails === 0) { peg$expect(peg$c30); } + if (input.charCodeAt(peg$currPos) === 41) { + s5 = peg$c29; + peg$currPos++; + } else { + s5 = peg$FAILED; + } + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c31(s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -1253,47 +1128,32 @@ function peg$parse(input, options) { s1 = peg$parseIdentifierName(); if (s1 !== peg$FAILED) { s2 = peg$currPos; - peg$begin(); - s3 = peg$currPos; - s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - s5 = peg$currPos; - s6 = peg$parseStringLiteral(); - if (s6 !== peg$FAILED) { - s7 = peg$parse__(); - if (s7 !== peg$FAILED) { - s6 = [s6, s7]; - s5 = s6; - } else { - peg$currPos = s5; - s5 = peg$FAILED; - } - } else { - peg$currPos = s5; - s5 = peg$FAILED; - } - if (s5 === peg$FAILED) { - s5 = null; - } - if (s5 !== peg$FAILED) { - if (peg$silentFails === 0) { peg$expect(peg$c3); } - if (input.charCodeAt(peg$currPos) === 61) { - s6 = peg$c2; - peg$currPos++; - } else { - s6 = peg$FAILED; - } - if (s6 !== peg$FAILED) { - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } + peg$begin(); + s3 = peg$currPos; + s4 = peg$parse__(); + s5 = peg$currPos; + s6 = peg$parseStringLiteral(); + if (s6 !== peg$FAILED) { + s7 = peg$parse__(); + s6 = [s6, s7]; + s5 = s6; + } else { + peg$currPos = s5; + s5 = peg$FAILED; + } + if (s5 === peg$FAILED) { + s5 = null; + } + if (peg$silentFails === 0) { peg$expect(peg$c3); } + if (input.charCodeAt(peg$currPos) === 61) { + s6 = peg$c2; + peg$currPos++; + } else { + s6 = peg$FAILED; + } + if (s6 !== peg$FAILED) { + s4 = [s4, s5, s6]; + s3 = s4; } else { peg$currPos = s3; s3 = peg$FAILED; @@ -1327,15 +1187,10 @@ function peg$parse(input, options) { s1 = peg$parseSemanticPredicateOperator(); if (s1 !== peg$FAILED) { s2 = peg$parse__(); - if (s2 !== peg$FAILED) { - s3 = peg$parseCodeBlock(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c33(s1, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + s3 = peg$parseCodeBlock(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c33(s1, s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -1593,20 +1448,15 @@ function peg$parse(input, options) { s3 = peg$FAILED; } } - if (s2 !== peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c52) { - s3 = peg$c52; - peg$currPos += 2; - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - s1 = [s1, s2, s3]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + if (input.substr(peg$currPos, 2) === peg$c52) { + s3 = peg$c52; + peg$currPos += 2; + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + s1 = [s1, s2, s3]; + s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED; @@ -1701,21 +1551,16 @@ function peg$parse(input, options) { s3 = peg$FAILED; } } - if (s2 !== peg$FAILED) { - if (peg$silentFails === 0) { peg$expect(peg$c54); } - if (input.substr(peg$currPos, 2) === peg$c52) { - s3 = peg$c52; - peg$currPos += 2; - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - s1 = [s1, s2, s3]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + if (peg$silentFails === 0) { peg$expect(peg$c54); } + if (input.substr(peg$currPos, 2) === peg$c52) { + s3 = peg$c52; + peg$currPos += 2; + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + s1 = [s1, s2, s3]; + s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED; @@ -1792,13 +1637,8 @@ function peg$parse(input, options) { s3 = peg$FAILED; } } - if (s2 !== peg$FAILED) { - s1 = [s1, s2]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + s1 = [s1, s2]; + s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED; @@ -1852,13 +1692,8 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$parseIdentifierPart(); } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c59(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + peg$savedPos = s0; + s0 = peg$c59(s1, s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2140,13 +1975,8 @@ function peg$parse(input, options) { if (s2 === peg$FAILED) { s2 = null; } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c71(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + peg$savedPos = s0; + s0 = peg$c71(s1, s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2175,20 +2005,15 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$parseDoubleStringCharacter(); } - if (s2 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 34) { - s3 = peg$c73; - peg$currPos++; - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c74(s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + if (input.charCodeAt(peg$currPos) === 34) { + s3 = peg$c73; + peg$currPos++; + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c74(s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2212,20 +2037,15 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$parseSingleStringCharacter(); } - if (s2 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 39) { - s3 = peg$c75; - peg$currPos++; - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c74(s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + if (input.charCodeAt(peg$currPos) === 39) { + s3 = peg$c75; + peg$currPos++; + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c74(s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2406,51 +2226,36 @@ function peg$parse(input, options) { if (s2 === peg$FAILED) { s2 = null; } - if (s2 !== peg$FAILED) { - s3 = []; + s3 = []; + s4 = peg$parseClassCharacterRange(); + if (s4 === peg$FAILED) { + s4 = peg$parseClassCharacter(); + } + while (s4 !== peg$FAILED) { + s3.push(s4); s4 = peg$parseClassCharacterRange(); if (s4 === peg$FAILED) { s4 = peg$parseClassCharacter(); } - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$parseClassCharacterRange(); - if (s4 === peg$FAILED) { - s4 = peg$parseClassCharacter(); - } - } - if (s3 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 93) { - s4 = peg$c80; - peg$currPos++; - } else { - s4 = peg$FAILED; - } - if (s4 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 105) { - s5 = peg$c70; - peg$currPos++; - } else { - s5 = peg$FAILED; - } - if (s5 === peg$FAILED) { - s5 = null; - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c81(s2, s3, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + } + if (input.charCodeAt(peg$currPos) === 93) { + s4 = peg$c80; + peg$currPos++; + } else { + s4 = peg$FAILED; + } + if (s4 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 105) { + s5 = peg$c70; + peg$currPos++; } else { - peg$currPos = s0; - s0 = peg$FAILED; + s5 = peg$FAILED; } + if (s5 === peg$FAILED) { + s5 = null; + } + peg$savedPos = s0; + s0 = peg$c81(s2, s3, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2994,20 +2799,15 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { s2 = peg$parseCode(); - if (s2 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 125) { - s3 = peg$c111; - peg$currPos++; - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$c112(s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + if (input.charCodeAt(peg$currPos) === 125) { + s3 = peg$c111; + peg$currPos++; + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$c112(s2); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3116,20 +2916,15 @@ function peg$parse(input, options) { } if (s3 !== peg$FAILED) { s4 = peg$parseCode(); - if (s4 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 125) { - s5 = peg$c111; - peg$currPos++; - } else { - s5 = peg$FAILED; - } - if (s5 !== peg$FAILED) { - s3 = [s3, s4, s5]; - s2 = s3; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } + if (input.charCodeAt(peg$currPos) === 125) { + s5 = peg$c111; + peg$currPos++; + } else { + s5 = peg$FAILED; + } + if (s5 !== peg$FAILED) { + s3 = [s3, s4, s5]; + s2 = s3; } else { peg$currPos = s2; s2 = peg$FAILED; @@ -3217,20 +3012,15 @@ function peg$parse(input, options) { } if (s3 !== peg$FAILED) { s4 = peg$parseCode(); - if (s4 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 125) { - s5 = peg$c111; - peg$currPos++; - } else { - s5 = peg$FAILED; - } - if (s5 !== peg$FAILED) { - s3 = [s3, s4, s5]; - s2 = s3; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } + if (input.charCodeAt(peg$currPos) === 125) { + s5 = peg$c111; + peg$currPos++; + } else { + s5 = peg$FAILED; + } + if (s5 !== peg$FAILED) { + s3 = [s3, s4, s5]; + s2 = s3; } else { peg$currPos = s2; s2 = peg$FAILED; @@ -3241,11 +3031,7 @@ function peg$parse(input, options) { } } } - if (s1 !== peg$FAILED) { - s0 = input.substring(s0, peg$currPos); - } else { - s0 = s1; - } + s0 = input.substring(s0, peg$currPos); return s0; } @@ -4784,21 +4570,16 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = peg$parse__(); - if (s1 !== peg$FAILED) { - if (peg$silentFails === 0) { peg$expect(peg$c209); } - if (input.charCodeAt(peg$currPos) === 59) { - s2 = peg$c208; - peg$currPos++; - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s1 = [s1, s2]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + if (peg$silentFails === 0) { peg$expect(peg$c209); } + if (input.charCodeAt(peg$currPos) === 59) { + s2 = peg$c208; + peg$currPos++; + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s1 = [s1, s2]; + s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4806,24 +4587,14 @@ function peg$parse(input, options) { if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = peg$parse_(); - if (s1 !== peg$FAILED) { - s2 = peg$parseSingleLineComment(); - if (s2 === peg$FAILED) { - s2 = null; - } - if (s2 !== peg$FAILED) { - s3 = peg$parseLineTerminatorSequence(); - if (s3 !== peg$FAILED) { - s1 = [s1, s2, s3]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + s2 = peg$parseSingleLineComment(); + if (s2 === peg$FAILED) { + s2 = null; + } + s3 = peg$parseLineTerminatorSequence(); + if (s3 !== peg$FAILED) { + s1 = [s1, s2, s3]; + s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4831,15 +4602,10 @@ function peg$parse(input, options) { if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = peg$parse__(); - if (s1 !== peg$FAILED) { - s2 = peg$parseEOF(); - if (s2 !== peg$FAILED) { - s1 = [s1, s2]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + s2 = peg$parseEOF(); + if (s2 !== peg$FAILED) { + s1 = [s1, s2]; + s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED;