natural 5.2.3 → 6.0.0

package/lib/natural/tokenizers/parser_sentence_tokenizer.js

@@ -138,10 +138,19 @@ function peg$parse(input, options) {
 
   var peg$FAILED = {},
 
-      peg$startRuleFunctions = { Sentences: peg$parseSentences },
-      peg$startRuleFunction  = peg$parseSentences,
+      peg$startRuleFunctions = { s: peg$parses },
+      peg$startRuleFunction  = peg$parses,
 
       peg$c0 = function(sentences) {
+      		let result = []
+      		sentences.forEach(sent0 => {
+      			sent0[0].forEach(sent1 => {
+      				result.push(sent1)
+      			})
+      		})
+      		return result
+      	},
+      peg$c1 = function(sentences) {
             //return sentences
             return(
                 sentences.map(sent => {
@@ -152,69 +161,83 @@ function peg$parse(input, options) {
                 })
             )
           },
-      peg$c1 = function(seqs, end) {
+      peg$c2 = function(open, sentences, close) {
+            //return sentences
+            let result = sentences.map(sent => {
+            	//if (sent[1]) {
+            	  sent[0].push(sent[1])
+              //}
+              return sent[0].reduce((accu, str) =>  accu + str).trim()
+            })
+      			result.unshift(open)
+      			if (close) {
+            	result.push(close)
+      			}
+            return result
+          },
+      peg$c3 = function(seqs, end) {
             let res = seqs.reduce((accu, seq) => accu.concat(seq))
             res.push(end)
             return res
           },
-      peg$c2 = function(tokens) {
+      peg$c4 = function(tokens) {
              let result = tokens.map(pair => pair[0] + pair[1])
              return result
            },
-      peg$c3 = function(open, tokens, end, close) {
+      peg$c5 = function(open, tokens, end, close) {
         	  let result = tokens.map(pair => pair[0] + pair[1])
             result.unshift(open)
             result.push(end)
             result.push(close)
             return result
           },
-      peg$c4 = /^[ \t\n\r.?!]/,
-      peg$c5 = peg$classExpectation([" ", "\t", "\n", "\r", ".", "?", "!"], false, false),
-      peg$c6 = function() {
+      peg$c6 = /^[ \t\n\r.?!]/,
+      peg$c7 = peg$classExpectation([" ", "\t", "\n", "\r", ".", "?", "!"], false, false),
+      peg$c8 = function() {
             return text()
           },
-      peg$c7 = /^[ \t\n\r]/,
-      peg$c8 = peg$classExpectation([" ", "\t", "\n", "\r"], false, false),
-      peg$c9 = function(t) {
+      peg$c9 = /^[ \t\n\r]/,
+      peg$c10 = peg$classExpectation([" ", "\t", "\n", "\r"], false, false),
+      peg$c11 = function(t) {
             return t
           },
-      peg$c10 = /^[^ \t\n\r!?([}"`)\]}"`0-9@]/,
-      peg$c11 = peg$classExpectation([" ", "\t", "\n", "\r", "!", "?", "(", "[", "}", "\"", "`", ")", "]", "}", "\"", "`", ["0", "9"], "@"], true, false),
-      peg$c12 = function(word) {
+      peg$c12 = /^[^ \t\n\r!?([}"`)\]}"`0-9@]/,
+      peg$c13 = peg$classExpectation([" ", "\t", "\n", "\r", "!", "?", "(", "[", "}", "\"", "`", ")", "]", "}", "\"", "`", ["0", "9"], "@"], true, false),
+      peg$c14 = function(word) {
               const tmp = word.reduce((accu, elt) => accu + elt)
               return knownAbbreviations.indexOf(tmp) > -1},
-      peg$c13 = function(word) {
+      peg$c15 = function(word) {
           	return text()
           },
-      peg$c14 = /^[^ \t\n\r!?.([}"`)\]}"`0-9@]/,
-      peg$c15 = peg$classExpectation([" ", "\t", "\n", "\r", "!", "?", ".", "(", "[", "}", "\"", "`", ")", "]", "}", "\"", "`", ["0", "9"], "@"], true, false),
-      peg$c16 = function() {
+      peg$c16 = /^[^ \t\n\r!?.([})\]}`"0-9@]/,
+      peg$c17 = peg$classExpectation([" ", "\t", "\n", "\r", "!", "?", ".", "(", "[", "}", ")", "]", "}", "`", "\"", ["0", "9"], "@"], true, false),
+      peg$c18 = function() {
         	  return text()
           },
-      peg$c17 = /^[0-9]/,
-      peg$c18 = peg$classExpectation([["0", "9"]], false, false),
-      peg$c19 = peg$anyExpectation(),
-      peg$c20 = /^[a-z]/,
-      peg$c21 = peg$classExpectation([["a", "z"]], false, false),
-      peg$c22 = /^[@]/,
-      peg$c23 = peg$classExpectation(["@"], false, false),
-      peg$c24 = /^[.]/,
-      peg$c25 = peg$classExpectation(["."], false, false),
-      peg$c26 = "http://",
-      peg$c27 = peg$literalExpectation("http://", false),
-      peg$c28 = "https://",
-      peg$c29 = peg$literalExpectation("https://", false),
-      peg$c30 = /^[a-z0-9]/,
-      peg$c31 = peg$classExpectation([["a", "z"], ["0", "9"]], false, false),
-      peg$c32 = /^[\/]/,
-      peg$c33 = peg$classExpectation(["/"], false, false),
-      peg$c34 = function() {
+      peg$c19 = /^[0-9]/,
+      peg$c20 = peg$classExpectation([["0", "9"]], false, false),
+      peg$c21 = peg$anyExpectation(),
+      peg$c22 = /^[a-z]/,
+      peg$c23 = peg$classExpectation([["a", "z"]], false, false),
+      peg$c24 = /^[@]/,
+      peg$c25 = peg$classExpectation(["@"], false, false),
+      peg$c26 = /^[.]/,
+      peg$c27 = peg$classExpectation(["."], false, false),
+      peg$c28 = "http://",
+      peg$c29 = peg$literalExpectation("http://", false),
+      peg$c30 = "https://",
+      peg$c31 = peg$literalExpectation("https://", false),
+      peg$c32 = /^[a-z0-9]/,
+      peg$c33 = peg$classExpectation([["a", "z"], ["0", "9"]], false, false),
+      peg$c34 = /^[\/]/,
+      peg$c35 = peg$classExpectation(["/"], false, false),
+      peg$c36 = function() {
           return text()
         },
-      peg$c35 = /^[([}"'`\u2018]/,
-      peg$c36 = peg$classExpectation(["(", "[", "}", "\"", "'", "`", "\u2018"], false, false),
-      peg$c37 = /^[)\]}"'`\u2019]/,
-      peg$c38 = peg$classExpectation([")", "]", "}", "\"", "'", "`", "\u2019"], false, false),
+      peg$c37 = /^[([{"'`\u2018]/,
+      peg$c38 = peg$classExpectation(["(", "[", "{", "\"", "'", "`", "\u2018"], false, false),
+      peg$c39 = /^[)\]}"'`\u2019]/,
+      peg$c40 = peg$classExpectation([")", "]", "}", "\"", "'", "`", "\u2019"], false, false),
 
       peg$currPos          = 0,
       peg$savedPos         = 0,
@@ -352,13 +375,13 @@ function peg$parse(input, options) {
     );
   }
 
-  function peg$parseSentences() {
+  function peg$parses() {
     var s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$currPos;
-    s3 = peg$parseSentence();
+    s3 = peg$parseSentences();
     if (s3 !== peg$FAILED) {
       s4 = peg$parseWhitespace();
       if (s4 !== peg$FAILED) {
@@ -372,10 +395,9 @@ function peg$parse(input, options) {
       peg$currPos = s2;
       s2 = peg$FAILED;
     }
-    while (s2 !== peg$FAILED) {
-      s1.push(s2);
+    if (s2 === peg$FAILED) {
       s2 = peg$currPos;
-      s3 = peg$parseSentence();
+      s3 = peg$parseQuotedSentences();
       if (s3 !== peg$FAILED) {
         s4 = peg$parseWhitespace();
         if (s4 !== peg$FAILED) {
@@ -390,6 +412,45 @@ function peg$parse(input, options) {
         s2 = peg$FAILED;
       }
     }
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = peg$currPos;
+        s3 = peg$parseSentences();
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parseWhitespace();
+          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 = peg$currPos;
+          s3 = peg$parseQuotedSentences();
+          if (s3 !== peg$FAILED) {
+            s4 = peg$parseWhitespace();
+            if (s4 !== peg$FAILED) {
+              s3 = [s3, s4];
+              s2 = s3;
+            } else {
+              peg$currPos = s2;
+              s2 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+          }
+        }
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
       s1 = peg$c0(s1);
@@ -399,6 +460,126 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseSentences() {
+    var s0, s1, s2, s3, s4;
+
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$currPos;
+    s3 = peg$parseSentence();
+    if (s3 !== peg$FAILED) {
+      s4 = peg$parseWhitespace();
+      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) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = peg$currPos;
+        s3 = peg$parseSentence();
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parseWhitespace();
+          if (s4 !== peg$FAILED) {
+            s3 = [s3, s4];
+            s2 = s3;
+          } else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
+        }
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$c1(s1);
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parseQuotedSentences() {
+    var s0, s1, s2, s3, s4, s5;
+
+    s0 = peg$currPos;
+    s1 = peg$parseOpenSymbol();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parseSentence();
+      if (s4 !== peg$FAILED) {
+        s5 = peg$parseWhitespace();
+        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) {
+        while (s3 !== peg$FAILED) {
+          s2.push(s3);
+          s3 = peg$currPos;
+          s4 = peg$parseSentence();
+          if (s4 !== peg$FAILED) {
+            s5 = peg$parseWhitespace();
+            if (s5 !== peg$FAILED) {
+              s4 = [s4, s5];
+              s3 = s4;
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+        }
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parseCloseSymbol();
+        if (s3 === peg$FAILED) {
+          s3 = null;
+        }
+        if (s3 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$c2(s1, s2, s3);
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
   function peg$parseSentence() {
     var s0, s1, s2;
 
@@ -423,7 +604,7 @@ function peg$parse(input, options) {
       s2 = peg$parseEndOfSentence();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c1(s1, s2);
+        s1 = peg$c3(s1, s2);
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -481,7 +662,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c2(s1);
+      s1 = peg$c4(s1);
     }
     s0 = s1;
 
@@ -538,7 +719,7 @@ function peg$parse(input, options) {
           s4 = peg$parseCloseSymbol();
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c3(s1, s2, s3, s4);
+            s1 = peg$c5(s1, s2, s3, s4);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -565,26 +746,26 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = [];
-    if (peg$c4.test(input.charAt(peg$currPos))) {
+    if (peg$c6.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c5); }
+      if (peg$silentFails === 0) { peg$fail(peg$c7); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
-      if (peg$c4.test(input.charAt(peg$currPos))) {
+      if (peg$c6.test(input.charAt(peg$currPos))) {
         s2 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c5); }
+        if (peg$silentFails === 0) { peg$fail(peg$c7); }
       }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c6();
+      s1 = peg$c8();
     }
     s0 = s1;
 
@@ -596,26 +777,26 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = [];
-    if (peg$c7.test(input.charAt(peg$currPos))) {
+    if (peg$c9.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c8); }
+      if (peg$silentFails === 0) { peg$fail(peg$c10); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
-      if (peg$c7.test(input.charAt(peg$currPos))) {
+      if (peg$c9.test(input.charAt(peg$currPos))) {
         s2 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c8); }
+        if (peg$silentFails === 0) { peg$fail(peg$c10); }
       }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c6();
+      s1 = peg$c8();
     }
     s0 = s1;
 
@@ -641,7 +822,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c9(s1);
+      s1 = peg$c11(s1);
     }
     s0 = s1;
 
@@ -653,22 +834,22 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = [];
-    if (peg$c10.test(input.charAt(peg$currPos))) {
+    if (peg$c12.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c11); }
+      if (peg$silentFails === 0) { peg$fail(peg$c13); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
-        if (peg$c10.test(input.charAt(peg$currPos))) {
+        if (peg$c12.test(input.charAt(peg$currPos))) {
           s2 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c11); }
+          if (peg$silentFails === 0) { peg$fail(peg$c13); }
         }
       }
     } else {
@@ -676,7 +857,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s2 = peg$c12(s1);
+      s2 = peg$c14(s1);
       if (s2) {
         s2 = void 0;
       } else {
@@ -684,7 +865,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c13(s1);
+        s1 = peg$c15(s1);
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -703,22 +884,22 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = [];
-    if (peg$c14.test(input.charAt(peg$currPos))) {
+    if (peg$c16.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c15); }
+      if (peg$silentFails === 0) { peg$fail(peg$c17); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
-        if (peg$c14.test(input.charAt(peg$currPos))) {
+        if (peg$c16.test(input.charAt(peg$currPos))) {
           s2 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c15); }
+          if (peg$silentFails === 0) { peg$fail(peg$c17); }
         }
       }
     } else {
@@ -726,7 +907,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c16();
+      s1 = peg$c18();
     }
     s0 = s1;
 
@@ -738,22 +919,22 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = [];
-    if (peg$c17.test(input.charAt(peg$currPos))) {
+    if (peg$c19.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c18); }
+      if (peg$silentFails === 0) { peg$fail(peg$c20); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
-        if (peg$c17.test(input.charAt(peg$currPos))) {
+        if (peg$c19.test(input.charAt(peg$currPos))) {
           s2 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c18); }
+          if (peg$silentFails === 0) { peg$fail(peg$c20); }
         }
       }
     } else {
@@ -766,26 +947,26 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c19); }
+        if (peg$silentFails === 0) { peg$fail(peg$c21); }
       }
       if (s3 !== peg$FAILED) {
         s4 = [];
-        if (peg$c17.test(input.charAt(peg$currPos))) {
+        if (peg$c19.test(input.charAt(peg$currPos))) {
           s5 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c18); }
+          if (peg$silentFails === 0) { peg$fail(peg$c20); }
         }
         if (s5 !== peg$FAILED) {
           while (s5 !== peg$FAILED) {
             s4.push(s5);
-            if (peg$c17.test(input.charAt(peg$currPos))) {
+            if (peg$c19.test(input.charAt(peg$currPos))) {
               s5 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c18); }
+              if (peg$silentFails === 0) { peg$fail(peg$c20); }
             }
           }
         } else {
@@ -812,7 +993,7 @@ function peg$parse(input, options) {
         }
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c6();
+          s1 = peg$c8();
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -835,84 +1016,84 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = [];
-    if (peg$c20.test(input.charAt(peg$currPos))) {
+    if (peg$c22.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c21); }
+      if (peg$silentFails === 0) { peg$fail(peg$c23); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
-        if (peg$c20.test(input.charAt(peg$currPos))) {
+        if (peg$c22.test(input.charAt(peg$currPos))) {
           s2 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c21); }
+          if (peg$silentFails === 0) { peg$fail(peg$c23); }
         }
       }
     } else {
       s1 = peg$FAILED;
     }
     if (s1 !== peg$FAILED) {
-      if (peg$c22.test(input.charAt(peg$currPos))) {
+      if (peg$c24.test(input.charAt(peg$currPos))) {
         s2 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c23); }
+        if (peg$silentFails === 0) { peg$fail(peg$c25); }
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
-        if (peg$c20.test(input.charAt(peg$currPos))) {
+        if (peg$c22.test(input.charAt(peg$currPos))) {
           s4 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c21); }
+          if (peg$silentFails === 0) { peg$fail(peg$c23); }
         }
         if (s4 !== peg$FAILED) {
           while (s4 !== peg$FAILED) {
             s3.push(s4);
-            if (peg$c20.test(input.charAt(peg$currPos))) {
+            if (peg$c22.test(input.charAt(peg$currPos))) {
               s4 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c21); }
+              if (peg$silentFails === 0) { peg$fail(peg$c23); }
             }
           }
         } else {
           s3 = peg$FAILED;
         }
         if (s3 !== peg$FAILED) {
-          if (peg$c24.test(input.charAt(peg$currPos))) {
+          if (peg$c26.test(input.charAt(peg$currPos))) {
             s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c25); }
+            if (peg$silentFails === 0) { peg$fail(peg$c27); }
           }
           if (s4 !== peg$FAILED) {
             s5 = [];
-            if (peg$c20.test(input.charAt(peg$currPos))) {
+            if (peg$c22.test(input.charAt(peg$currPos))) {
               s6 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c21); }
+              if (peg$silentFails === 0) { peg$fail(peg$c23); }
             }
             if (s6 !== peg$FAILED) {
               while (s6 !== peg$FAILED) {
                 s5.push(s6);
-                if (peg$c20.test(input.charAt(peg$currPos))) {
+                if (peg$c22.test(input.charAt(peg$currPos))) {
                   s6 = input.charAt(peg$currPos);
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$c21); }
+                  if (peg$silentFails === 0) { peg$fail(peg$c23); }
                 }
               }
             } else {
@@ -920,7 +1101,7 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c6();
+              s1 = peg$c8();
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -950,20 +1131,20 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 7) === peg$c26) {
-      s1 = peg$c26;
+    if (input.substr(peg$currPos, 7) === peg$c28) {
+      s1 = peg$c28;
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c27); }
+      if (peg$silentFails === 0) { peg$fail(peg$c29); }
     }
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 8) === peg$c28) {
-        s1 = peg$c28;
+      if (input.substr(peg$currPos, 8) === peg$c30) {
+        s1 = peg$c30;
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c29); }
+        if (peg$silentFails === 0) { peg$fail(peg$c31); }
       }
     }
     if (s1 === peg$FAILED) {
@@ -971,66 +1152,66 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (peg$c30.test(input.charAt(peg$currPos))) {
+      if (peg$c32.test(input.charAt(peg$currPos))) {
         s3 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c31); }
+        if (peg$silentFails === 0) { peg$fail(peg$c33); }
       }
       if (s3 !== peg$FAILED) {
         while (s3 !== peg$FAILED) {
           s2.push(s3);
-          if (peg$c30.test(input.charAt(peg$currPos))) {
+          if (peg$c32.test(input.charAt(peg$currPos))) {
             s3 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c31); }
+            if (peg$silentFails === 0) { peg$fail(peg$c33); }
           }
         }
       } else {
         s2 = peg$FAILED;
       }
       if (s2 !== peg$FAILED) {
-        if (peg$c24.test(input.charAt(peg$currPos))) {
+        if (peg$c26.test(input.charAt(peg$currPos))) {
           s3 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c25); }
+          if (peg$silentFails === 0) { peg$fail(peg$c27); }
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$currPos;
           s5 = [];
-          if (peg$c30.test(input.charAt(peg$currPos))) {
+          if (peg$c32.test(input.charAt(peg$currPos))) {
             s6 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c31); }
+            if (peg$silentFails === 0) { peg$fail(peg$c33); }
           }
           if (s6 !== peg$FAILED) {
             while (s6 !== peg$FAILED) {
               s5.push(s6);
-              if (peg$c30.test(input.charAt(peg$currPos))) {
+              if (peg$c32.test(input.charAt(peg$currPos))) {
                 s6 = input.charAt(peg$currPos);
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c31); }
+                if (peg$silentFails === 0) { peg$fail(peg$c33); }
               }
             }
           } else {
             s5 = peg$FAILED;
           }
           if (s5 !== peg$FAILED) {
-            if (peg$c24.test(input.charAt(peg$currPos))) {
+            if (peg$c26.test(input.charAt(peg$currPos))) {
               s6 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c25); }
+              if (peg$silentFails === 0) { peg$fail(peg$c27); }
             }
             if (s6 !== peg$FAILED) {
               s5 = [s5, s6];
@@ -1048,22 +1229,22 @@ function peg$parse(input, options) {
           }
           if (s4 !== peg$FAILED) {
             s5 = [];
-            if (peg$c30.test(input.charAt(peg$currPos))) {
+            if (peg$c32.test(input.charAt(peg$currPos))) {
               s6 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c31); }
+              if (peg$silentFails === 0) { peg$fail(peg$c33); }
             }
             if (s6 !== peg$FAILED) {
               while (s6 !== peg$FAILED) {
                 s5.push(s6);
-                if (peg$c30.test(input.charAt(peg$currPos))) {
+                if (peg$c32.test(input.charAt(peg$currPos))) {
                   s6 = input.charAt(peg$currPos);
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$c31); }
+                  if (peg$silentFails === 0) { peg$fail(peg$c33); }
                 }
               }
             } else {
@@ -1073,34 +1254,34 @@ function peg$parse(input, options) {
               s6 = [];
               s7 = peg$currPos;
               s8 = [];
-              if (peg$c30.test(input.charAt(peg$currPos))) {
+              if (peg$c32.test(input.charAt(peg$currPos))) {
                 s9 = input.charAt(peg$currPos);
                 peg$currPos++;
               } else {
                 s9 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c31); }
+                if (peg$silentFails === 0) { peg$fail(peg$c33); }
               }
               if (s9 !== peg$FAILED) {
                 while (s9 !== peg$FAILED) {
                   s8.push(s9);
-                  if (peg$c30.test(input.charAt(peg$currPos))) {
+                  if (peg$c32.test(input.charAt(peg$currPos))) {
                     s9 = input.charAt(peg$currPos);
                     peg$currPos++;
                   } else {
                     s9 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$c31); }
+                    if (peg$silentFails === 0) { peg$fail(peg$c33); }
                   }
                 }
               } else {
                 s8 = peg$FAILED;
               }
               if (s8 !== peg$FAILED) {
-                if (peg$c32.test(input.charAt(peg$currPos))) {
+                if (peg$c34.test(input.charAt(peg$currPos))) {
                   s9 = input.charAt(peg$currPos);
                   peg$currPos++;
                 } else {
                   s9 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$c33); }
+                  if (peg$silentFails === 0) { peg$fail(peg$c35); }
                 }
                 if (s9 !== peg$FAILED) {
                   s8 = [s8, s9];
@@ -1117,34 +1298,34 @@ function peg$parse(input, options) {
                 s6.push(s7);
                 s7 = peg$currPos;
                 s8 = [];
-                if (peg$c30.test(input.charAt(peg$currPos))) {
+                if (peg$c32.test(input.charAt(peg$currPos))) {
                   s9 = input.charAt(peg$currPos);
                   peg$currPos++;
                 } else {
                   s9 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$c31); }
+                  if (peg$silentFails === 0) { peg$fail(peg$c33); }
                 }
                 if (s9 !== peg$FAILED) {
                   while (s9 !== peg$FAILED) {
                     s8.push(s9);
-                    if (peg$c30.test(input.charAt(peg$currPos))) {
+                    if (peg$c32.test(input.charAt(peg$currPos))) {
                       s9 = input.charAt(peg$currPos);
                       peg$currPos++;
                     } else {
                       s9 = peg$FAILED;
-                      if (peg$silentFails === 0) { peg$fail(peg$c31); }
+                      if (peg$silentFails === 0) { peg$fail(peg$c33); }
                     }
                   }
                 } else {
                   s8 = peg$FAILED;
                 }
                 if (s8 !== peg$FAILED) {
-                  if (peg$c32.test(input.charAt(peg$currPos))) {
+                  if (peg$c34.test(input.charAt(peg$currPos))) {
                     s9 = input.charAt(peg$currPos);
                     peg$currPos++;
                   } else {
                     s9 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$c33); }
+                    if (peg$silentFails === 0) { peg$fail(peg$c35); }
                   }
                   if (s9 !== peg$FAILED) {
                     s8 = [s8, s9];
@@ -1160,7 +1341,7 @@ function peg$parse(input, options) {
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c34();
+                s1 = peg$c36();
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -1194,16 +1375,16 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = peg$currPos;
-    if (peg$c35.test(input.charAt(peg$currPos))) {
+    if (peg$c37.test(input.charAt(peg$currPos))) {
       s1 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c36); }
+      if (peg$silentFails === 0) { peg$fail(peg$c38); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c6();
+      s1 = peg$c8();
     }
     s0 = s1;
 
@@ -1214,16 +1395,16 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = peg$currPos;
-    if (peg$c37.test(input.charAt(peg$currPos))) {
+    if (peg$c39.test(input.charAt(peg$currPos))) {
       s1 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$c38); }
+      if (peg$silentFails === 0) { peg$fail(peg$c40); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c6();
+      s1 = peg$c8();
     }
     s0 = s1;