emblem-source 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02bed63eb769eaed1374016b2b63ff0435a02edc
-  data.tar.gz: 6e01bc1dc9f5d1cf486b4137bc5c7b8f9b7701a6
+  metadata.gz: 86d053ef4e7fa0649853147b95fa78c2b48125da
+  data.tar.gz: 84be5b0b61d7540091dc0fed4da9492055464e5a
 SHA512:
-  metadata.gz: 305832b4c5515872c834ba31db9b672fdd2ad4b067c99e0bd5d6233b0fec483f68d2c94591e5a8cedc14ea213247e115077d9959c5e6c84f48cc19a92262e8a4
-  data.tar.gz: 442f4e451498c90d3b59ff04ab5a160297902f1c1e3b0634a8e154e0a0befbbe0d1c8ff19a7935a61d43a19e4cf8e23bc87b9c25a3d1ca83af3320008fc3ffdc
+  metadata.gz: 662413661b0e50010cb857446a13d329512a2c63d941a0646518b6e338fc2832586dbae752a93210ffb9661305189f5cfb8f0a03bce09bc82bac6467c96e1471
+  data.tar.gz: fd18a46c4739ffcbb6d9a7f15b1a8c3e56bd73bf9eb94c5c878b6454c1aea2d3a6853226b8e014fcf6dc8d39c343491ce3e642c8c37cb65f2f9cda4e84c81a59

data/dist/emblem.js

@@ -103,7 +103,7 @@ this.Emblem = {};
 
 Emblem = this.Emblem;
 
-Emblem.VERSION = "0.3.13";
+Emblem.VERSION = "0.3.14";
 
 module.exports = Emblem;
 
@@ -409,8 +409,8 @@ Emblem.Parser = (function() {
         peg$c50 = "\"..\"",
         peg$c51 = ".",
         peg$c52 = "\".\"",
-        peg$c53 = /^[a-zA-Z0-9_$\-!?\^]/,
-        peg$c54 = "[a-zA-Z0-9_$\\-!?\\^]",
+        peg$c53 = /^[a-zA-Z0-9_$\-!?\^@]/,
+        peg$c54 = "[a-zA-Z0-9_$\\-!?\\^@]",
         peg$c55 = function(s) { return s; },
         peg$c56 = "Key",
         peg$c57 = ":",
@@ -430,6 +430,16 @@ Emblem.Parser = (function() {
         peg$c65 = "[\\/.]",
         peg$c66 = function(v) { 
           var last = v[v.length - 1];
+
+          // Support for data keywords that are prefixed with @ in the each
+          // block helper such as @index, @key, @first, @last
+          if (last.part.charAt(0) === '@') {
+            last.part = last.part.slice(1);
+            var idNode = new AST.IdNode(v);
+            var dataNode = new AST.DataNode(idNode);
+            return dataNode;
+          }
+
           var match;
           var suffixModifier;
           if(match = last.part.match(/[!\?\^]$/)) {
@@ -521,60 +531,50 @@ Emblem.Parser = (function() {
         peg$c100 = function(first, tail) { return textNodesResult(first, tail); },
         peg$c101 = "{",
         peg$c102 = "\"{\"",
-        peg$c103 = "@index",
-        peg$c104 = "\"@index\"",
-        peg$c105 = function() {
-
-          var params = {};
-          var idNode = new AST.IdNode([{part: "index"}]);
-          var dataNode = new AST.DataNode(idNode);
-          params = dataNode;
-          return new AST.MustacheNode([params], null, false);
-        },
-        peg$c106 = /^[^}]/,
-        peg$c107 = "[^}]",
-        peg$c108 = function(text) {
+        peg$c103 = /^[^}]/,
+        peg$c104 = "[^}]",
+        peg$c105 = function(text) {
           // Force interpretation as mustache.
           // TODO: change to just parse with a specific rule?
           text = "=" + text;
           return Emblem.parse(text).statements[0];
         },
-        peg$c109 = function(m) { m.escaped = true; return m; },
-        peg$c110 = function(m) { m.escaped = false; return m; },
-        peg$c111 = function(a) { return new AST.ContentNode(a); },
-        peg$c112 = "any character",
-        peg$c113 = "SingleMustacheOpen",
-        peg$c114 = "DoubleMustacheOpen",
-        peg$c115 = "{{",
-        peg$c116 = "\"{{\"",
-        peg$c117 = "TripleMustacheOpen",
-        peg$c118 = "{{{",
-        peg$c119 = "\"{{{\"",
-        peg$c120 = "SingleMustacheClose",
-        peg$c121 = "}",
-        peg$c122 = "\"}\"",
-        peg$c123 = "DoubleMustacheClose",
-        peg$c124 = "}}",
-        peg$c125 = "\"}}\"",
-        peg$c126 = "TripleMustacheClose",
-        peg$c127 = "}}}",
-        peg$c128 = "\"}}}\"",
-        peg$c129 = "SubexpressionOpen",
-        peg$c130 = "(",
-        peg$c131 = "\"(\"",
-        peg$c132 = "SubexpressionClose",
-        peg$c133 = ")",
-        peg$c134 = "\")\"",
-        peg$c135 = "InterpolationOpen",
-        peg$c136 = "#{",
-        peg$c137 = "\"#{\"",
-        peg$c138 = "InterpolationClose",
-        peg$c139 = "==",
-        peg$c140 = "\"==\"",
-        peg$c141 = function() { return false; },
-        peg$c142 = function() { return true; },
-        peg$c143 = function(h, s) { return h || s; },
-        peg$c144 = function(h, inTagMustaches, fullAttributes) {
+        peg$c106 = function(m) { m.escaped = true; return m; },
+        peg$c107 = function(m) { m.escaped = false; return m; },
+        peg$c108 = function(a) { return new AST.ContentNode(a); },
+        peg$c109 = "any character",
+        peg$c110 = "SingleMustacheOpen",
+        peg$c111 = "DoubleMustacheOpen",
+        peg$c112 = "{{",
+        peg$c113 = "\"{{\"",
+        peg$c114 = "TripleMustacheOpen",
+        peg$c115 = "{{{",
+        peg$c116 = "\"{{{\"",
+        peg$c117 = "SingleMustacheClose",
+        peg$c118 = "}",
+        peg$c119 = "\"}\"",
+        peg$c120 = "DoubleMustacheClose",
+        peg$c121 = "}}",
+        peg$c122 = "\"}}\"",
+        peg$c123 = "TripleMustacheClose",
+        peg$c124 = "}}}",
+        peg$c125 = "\"}}}\"",
+        peg$c126 = "SubexpressionOpen",
+        peg$c127 = "(",
+        peg$c128 = "\"(\"",
+        peg$c129 = "SubexpressionClose",
+        peg$c130 = ")",
+        peg$c131 = "\")\"",
+        peg$c132 = "InterpolationOpen",
+        peg$c133 = "#{",
+        peg$c134 = "\"#{\"",
+        peg$c135 = "InterpolationClose",
+        peg$c136 = "==",
+        peg$c137 = "\"==\"",
+        peg$c138 = function() { return false; },
+        peg$c139 = function() { return true; },
+        peg$c140 = function(h, s) { return h || s; },
+        peg$c141 = function(h, inTagMustaches, fullAttributes) {
           var tagName = h[0] || 'div',
               shorthandAttributes = h[1] || [],
               id = shorthandAttributes[0],
@@ -667,9 +667,9 @@ Emblem.Parser = (function() {
             return [tagOpenContent, new AST.ContentNode('</' + tagName + '>')];
           }
         },
-        peg$c145 = function(s) { return { shorthand: s, id: true}; },
-        peg$c146 = function(s) { return { shorthand: s }; },
-        peg$c147 = function(shorthands) {
+        peg$c142 = function(s) { return { shorthand: s, id: true}; },
+        peg$c143 = function(s) { return { shorthand: s }; },
+        peg$c144 = function(shorthands) {
           var id, classes = [];
           for(var i = 0, len = shorthands.length; i < len; ++i) {
             var shorthand = shorthands[i];
@@ -682,42 +682,42 @@ Emblem.Parser = (function() {
 
           return [id, classes];
         },
-        peg$c148 = function(a) {
+        peg$c145 = function(a) {
           if (a.length) {
             return [new AST.ContentNode(' ')].concat(a); 
           } else {
             return [];
           }
         },
-        peg$c149 = /^[A-Za-z.0-9_\-]/,
-        peg$c150 = "[A-Za-z.0-9_\\-]",
-        peg$c151 = function(id) { return createMustacheNode([id], null, true); },
-        peg$c152 = function(event, mustacheNode) {
+        peg$c146 = /^[A-Za-z.0-9_\-]/,
+        peg$c147 = "[A-Za-z.0-9_\\-]",
+        peg$c148 = function(id) { return createMustacheNode([id], null, true); },
+        peg$c149 = function(event, mustacheNode) {
           // Replace the IdNode with a StringNode to prevent unquoted action deprecation warnings
           mustacheNode.id = new AST.StringNode(mustacheNode.id.string);
 
           // Unshift the action helper and augment the hash
           return [unshiftParam(mustacheNode, 'action', [['on', new AST.StringNode(event)]])];
         },
-        peg$c153 = function(key, boolValue) { 
+        peg$c150 = function(key, boolValue) { 
           if (boolValue === 'true') {
             return [ new AST.ContentNode(key) ];
           } else {
             return [];
           }
         },
-        peg$c154 = function(value) { return value.replace(/ *$/, ''); },
-        peg$c155 = "!",
-        peg$c156 = "\"!\"",
-        peg$c157 = function(key, value) { return IS_EMBER; },
-        peg$c158 = function(key, value) { 
+        peg$c151 = function(value) { return value.replace(/ *$/, ''); },
+        peg$c152 = "!",
+        peg$c153 = "\"!\"",
+        peg$c154 = function(key, value) { return IS_EMBER; },
+        peg$c155 = function(key, value) { 
           var hashNode = new AST.HashNode([[key, new AST.StringNode(value)]]);
           var params = [new AST.IdNode([{part: 'bind-attr'}])];
           var mustacheNode = createMustacheNode(params, hashNode);
 
           return [mustacheNode];
         },
-        peg$c159 = function(key, id) { 
+        peg$c156 = function(key, id) { 
           var mustacheNode = createMustacheNode([id], null, true);
 
           if(IS_EMBER && id._emblemSuffixModifier === '!') {
@@ -730,52 +730,52 @@ Emblem.Parser = (function() {
             new AST.ContentNode('"'),
           ];
         },
-        peg$c160 = function(key, nodes) { 
+        peg$c157 = function(key, nodes) { 
           var result = [ new AST.ContentNode(key + '=' + '"') ].concat(nodes);
           return result.concat([new AST.ContentNode('"')]);
         },
-        peg$c161 = "_",
-        peg$c162 = "\"_\"",
-        peg$c163 = "%",
-        peg$c164 = "\"%\"",
-        peg$c165 = "#",
-        peg$c166 = "\"#\"",
-        peg$c167 = function(c) { return c;},
-        peg$c168 = "CSSIdentifier",
-        peg$c169 = /^[_a-zA-Z0-9\-]/,
-        peg$c170 = "[_a-zA-Z0-9\\-]",
-        peg$c171 = /^[_a-zA-Z]/,
-        peg$c172 = "[_a-zA-Z]",
-        peg$c173 = /^[\x80-\xFF]/,
-        peg$c174 = "[\\x80-\\xFF]",
-        peg$c175 = "KnownHTMLTagName",
-        peg$c176 = function(t) { return !!KNOWN_TAGS[t]; },
-        peg$c177 = function(t) { return t; },
-        peg$c178 = "a JS event",
-        peg$c179 = function(t) { return !!KNOWN_EVENTS[t]; },
-        peg$c180 = "INDENT",
-        peg$c181 = "\uEFEF",
-        peg$c182 = "\"\\uEFEF\"",
-        peg$c183 = function() { return ''; },
-        peg$c184 = "DEDENT",
-        peg$c185 = "\uEFFE",
-        peg$c186 = "\"\\uEFFE\"",
-        peg$c187 = "Unmatched DEDENT",
-        peg$c188 = "\uEFEE",
-        peg$c189 = "\"\\uEFEE\"",
-        peg$c190 = "LineEnd",
-        peg$c191 = "\r",
-        peg$c192 = "\"\\r\"",
-        peg$c193 = "\uEFFF",
-        peg$c194 = "\"\\uEFFF\"",
-        peg$c195 = "\n",
-        peg$c196 = "\"\\n\"",
-        peg$c197 = "ANYDEDENT",
-        peg$c198 = "RequiredWhitespace",
-        peg$c199 = "OptionalWhitespace",
-        peg$c200 = "InlineWhitespace",
-        peg$c201 = /^[ \t]/,
-        peg$c202 = "[ \\t]",
+        peg$c158 = "_",
+        peg$c159 = "\"_\"",
+        peg$c160 = "%",
+        peg$c161 = "\"%\"",
+        peg$c162 = "#",
+        peg$c163 = "\"#\"",
+        peg$c164 = function(c) { return c;},
+        peg$c165 = "CSSIdentifier",
+        peg$c166 = /^[_a-zA-Z0-9\-]/,
+        peg$c167 = "[_a-zA-Z0-9\\-]",
+        peg$c168 = /^[_a-zA-Z]/,
+        peg$c169 = "[_a-zA-Z]",
+        peg$c170 = /^[\x80-\xFF]/,
+        peg$c171 = "[\\x80-\\xFF]",
+        peg$c172 = "KnownHTMLTagName",
+        peg$c173 = function(t) { return !!KNOWN_TAGS[t]; },
+        peg$c174 = function(t) { return t; },
+        peg$c175 = "a JS event",
+        peg$c176 = function(t) { return !!KNOWN_EVENTS[t]; },
+        peg$c177 = "INDENT",
+        peg$c178 = "\uEFEF",
+        peg$c179 = "\"\\uEFEF\"",
+        peg$c180 = function() { return ''; },
+        peg$c181 = "DEDENT",
+        peg$c182 = "\uEFFE",
+        peg$c183 = "\"\\uEFFE\"",
+        peg$c184 = "Unmatched DEDENT",
+        peg$c185 = "\uEFEE",
+        peg$c186 = "\"\\uEFEE\"",
+        peg$c187 = "LineEnd",
+        peg$c188 = "\r",
+        peg$c189 = "\"\\r\"",
+        peg$c190 = "\uEFFF",
+        peg$c191 = "\"\\uEFFF\"",
+        peg$c192 = "\n",
+        peg$c193 = "\"\\n\"",
+        peg$c194 = "ANYDEDENT",
+        peg$c195 = "RequiredWhitespace",
+        peg$c196 = "OptionalWhitespace",
+        peg$c197 = "InlineWhitespace",
+        peg$c198 = /^[ \t]/,
+        peg$c199 = "[ \\t]",
 
         peg$currPos          = 0,
         peg$reportedPos      = 0,
@@ -3486,61 +3486,6 @@ Emblem.Parser = (function() {
       return s0;
     }
 
-    function peg$parseeachIndex() {
-      var s0, s1, s2, s3;
-
-      s0 = peg$currPos;
-      s1 = peg$currPos;
-      peg$silentFails++;
-      if (input.charCodeAt(peg$currPos) === 123) {
-        s2 = peg$c101;
-        peg$currPos++;
-      } else {
-        s2 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c102); }
-      }
-      peg$silentFails--;
-      if (s2 === null) {
-        s1 = peg$c1;
-      } else {
-        peg$currPos = s1;
-        s1 = peg$c0;
-      }
-      if (s1 !== null) {
-        s2 = peg$parse_();
-        if (s2 !== null) {
-          if (input.substr(peg$currPos, 6) === peg$c103) {
-            s3 = peg$c103;
-            peg$currPos += 6;
-          } else {
-            s3 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c104); }
-          }
-          if (s3 !== null) {
-            peg$reportedPos = s0;
-            s1 = peg$c105();
-            if (s1 === null) {
-              peg$currPos = s0;
-              s0 = s1;
-            } else {
-              s0 = s1;
-            }
-          } else {
-            peg$currPos = s0;
-            s0 = peg$c0;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$c0;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$c0;
-      }
-
-      return s0;
-    }
-
     function peg$parserecursivelyParsedMustacheContent() {
       var s0, s1, s2, s3, s4;
 
@@ -3564,21 +3509,21 @@ Emblem.Parser = (function() {
       if (s1 !== null) {
         s2 = peg$currPos;
         s3 = [];
-        if (peg$c106.test(input.charAt(peg$currPos))) {
+        if (peg$c103.test(input.charAt(peg$currPos))) {
           s4 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s4 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c107); }
+          if (peg$silentFails === 0) { peg$fail(peg$c104); }
         }
         while (s4 !== null) {
           s3.push(s4);
-          if (peg$c106.test(input.charAt(peg$currPos))) {
+          if (peg$c103.test(input.charAt(peg$currPos))) {
             s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s4 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c107); }
+            if (peg$silentFails === 0) { peg$fail(peg$c104); }
           }
         }
         if (s3 !== null) {
@@ -3587,7 +3532,7 @@ Emblem.Parser = (function() {
         s2 = s3;
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c108(s2);
+          s1 = peg$c105(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -3606,17 +3551,6 @@ Emblem.Parser = (function() {
       return s0;
     }
 
-    function peg$parsemustacheContent() {
-      var s0;
-
-      s0 = peg$parseeachIndex();
-      if (s0 === null) {
-        s0 = peg$parserecursivelyParsedMustacheContent();
-      }
-
-      return s0;
-    }
-
     function peg$parserawMustacheEscaped() {
       var s0, s1, s2, s3, s4, s5;
 
@@ -3625,14 +3559,14 @@ Emblem.Parser = (function() {
       if (s1 !== null) {
         s2 = peg$parse_();
         if (s2 !== null) {
-          s3 = peg$parsemustacheContent();
+          s3 = peg$parserecursivelyParsedMustacheContent();
           if (s3 !== null) {
             s4 = peg$parse_();
             if (s4 !== null) {
               s5 = peg$parsedoubleClose();
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c109(s3);
+                s1 = peg$c106(s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -3665,14 +3599,14 @@ Emblem.Parser = (function() {
         if (s1 !== null) {
           s2 = peg$parse_();
           if (s2 !== null) {
-            s3 = peg$parsemustacheContent();
+            s3 = peg$parserecursivelyParsedMustacheContent();
             if (s3 !== null) {
               s4 = peg$parse_();
               if (s4 !== null) {
                 s5 = peg$parsehashStacheClose();
                 if (s5 !== null) {
                   peg$reportedPos = s0;
-                  s1 = peg$c109(s3);
+                  s1 = peg$c106(s3);
                   if (s1 === null) {
                     peg$currPos = s0;
                     s0 = s1;
@@ -3712,14 +3646,14 @@ Emblem.Parser = (function() {
       if (s1 !== null) {
         s2 = peg$parse_();
         if (s2 !== null) {
-          s3 = peg$parsemustacheContent();
+          s3 = peg$parserecursivelyParsedMustacheContent();
           if (s3 !== null) {
             s4 = peg$parse_();
             if (s4 !== null) {
               s5 = peg$parsetripleClose();
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c110(s3);
+                s1 = peg$c107(s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -3771,7 +3705,7 @@ Emblem.Parser = (function() {
       s1 = s2;
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c111(s1);
+        s1 = peg$c108(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -3804,7 +3738,7 @@ Emblem.Parser = (function() {
       s1 = s2;
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c111(s1);
+        s1 = peg$c108(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -3845,7 +3779,7 @@ Emblem.Parser = (function() {
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c112); }
+          if (peg$silentFails === 0) { peg$fail(peg$c109); }
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
@@ -3897,7 +3831,7 @@ Emblem.Parser = (function() {
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c112); }
+          if (peg$silentFails === 0) { peg$fail(peg$c109); }
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
@@ -3941,7 +3875,7 @@ Emblem.Parser = (function() {
       s1 = s2;
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c111(s1);
+        s1 = peg$c108(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -3973,7 +3907,7 @@ Emblem.Parser = (function() {
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c112); }
+          if (peg$silentFails === 0) { peg$fail(peg$c109); }
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
@@ -4024,14 +3958,14 @@ Emblem.Parser = (function() {
       if (s1 !== null) {
         s2 = peg$parse_();
         if (s2 !== null) {
-          s3 = peg$parsemustacheContent();
+          s3 = peg$parserecursivelyParsedMustacheContent();
           if (s3 !== null) {
             s4 = peg$parse_();
             if (s4 !== null) {
               s5 = peg$parsesingleClose();
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c109(s3);
+                s1 = peg$c106(s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -4090,7 +4024,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c113); }
+        if (peg$silentFails === 0) { peg$fail(peg$c110); }
       }
 
       return s0;
@@ -4100,17 +4034,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c115) {
-        s0 = peg$c115;
+      if (input.substr(peg$currPos, 2) === peg$c112) {
+        s0 = peg$c112;
         peg$currPos += 2;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c116); }
+        if (peg$silentFails === 0) { peg$fail(peg$c113); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c114); }
+        if (peg$silentFails === 0) { peg$fail(peg$c111); }
       }
 
       return s0;
@@ -4120,17 +4054,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 3) === peg$c118) {
-        s0 = peg$c118;
+      if (input.substr(peg$currPos, 3) === peg$c115) {
+        s0 = peg$c115;
         peg$currPos += 3;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c119); }
+        if (peg$silentFails === 0) { peg$fail(peg$c116); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c117); }
+        if (peg$silentFails === 0) { peg$fail(peg$c114); }
       }
 
       return s0;
@@ -4141,16 +4075,16 @@ Emblem.Parser = (function() {
 
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 125) {
-        s0 = peg$c121;
+        s0 = peg$c118;
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c122); }
+        if (peg$silentFails === 0) { peg$fail(peg$c119); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c120); }
+        if (peg$silentFails === 0) { peg$fail(peg$c117); }
       }
 
       return s0;
@@ -4160,17 +4094,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c124) {
-        s0 = peg$c124;
+      if (input.substr(peg$currPos, 2) === peg$c121) {
+        s0 = peg$c121;
         peg$currPos += 2;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c125); }
+        if (peg$silentFails === 0) { peg$fail(peg$c122); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c123); }
+        if (peg$silentFails === 0) { peg$fail(peg$c120); }
       }
 
       return s0;
@@ -4180,17 +4114,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 3) === peg$c127) {
-        s0 = peg$c127;
+      if (input.substr(peg$currPos, 3) === peg$c124) {
+        s0 = peg$c124;
         peg$currPos += 3;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c128); }
+        if (peg$silentFails === 0) { peg$fail(peg$c125); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c126); }
+        if (peg$silentFails === 0) { peg$fail(peg$c123); }
       }
 
       return s0;
@@ -4201,16 +4135,16 @@ Emblem.Parser = (function() {
 
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 40) {
-        s0 = peg$c130;
+        s0 = peg$c127;
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c131); }
+        if (peg$silentFails === 0) { peg$fail(peg$c128); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c129); }
+        if (peg$silentFails === 0) { peg$fail(peg$c126); }
       }
 
       return s0;
@@ -4221,16 +4155,16 @@ Emblem.Parser = (function() {
 
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 41) {
-        s0 = peg$c133;
+        s0 = peg$c130;
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c134); }
+        if (peg$silentFails === 0) { peg$fail(peg$c131); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c132); }
+        if (peg$silentFails === 0) { peg$fail(peg$c129); }
       }
 
       return s0;
@@ -4240,17 +4174,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (input.substr(peg$currPos, 2) === peg$c136) {
-        s0 = peg$c136;
+      if (input.substr(peg$currPos, 2) === peg$c133) {
+        s0 = peg$c133;
         peg$currPos += 2;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c137); }
+        if (peg$silentFails === 0) { peg$fail(peg$c134); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c135); }
+        if (peg$silentFails === 0) { peg$fail(peg$c132); }
       }
 
       return s0;
@@ -4261,16 +4195,16 @@ Emblem.Parser = (function() {
 
       peg$silentFails++;
       if (input.charCodeAt(peg$currPos) === 125) {
-        s0 = peg$c121;
+        s0 = peg$c118;
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c122); }
+        if (peg$silentFails === 0) { peg$fail(peg$c119); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c138); }
+        if (peg$silentFails === 0) { peg$fail(peg$c135); }
       }
 
       return s0;
@@ -4280,12 +4214,12 @@ Emblem.Parser = (function() {
       var s0, s1, s2;
 
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c139) {
-        s1 = peg$c139;
+      if (input.substr(peg$currPos, 2) === peg$c136) {
+        s1 = peg$c136;
         peg$currPos += 2;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c140); }
+        if (peg$silentFails === 0) { peg$fail(peg$c137); }
       }
       if (s1 !== null) {
         if (input.charCodeAt(peg$currPos) === 32) {
@@ -4300,7 +4234,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c141();
+          s1 = peg$c138();
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -4337,7 +4271,7 @@ Emblem.Parser = (function() {
           }
           if (s2 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c142();
+            s1 = peg$c139();
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4383,7 +4317,7 @@ Emblem.Parser = (function() {
           }
           if (s3 !== null) {
             peg$reportedPos = peg$currPos;
-            s4 = peg$c143(s1, s2);
+            s4 = peg$c140(s1, s2);
             if (s4) {
               s4 = peg$c1;
             } else {
@@ -4433,7 +4367,7 @@ Emblem.Parser = (function() {
           }
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c144(s1, s2, s3);
+            s1 = peg$c141(s1, s2, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4465,7 +4399,7 @@ Emblem.Parser = (function() {
       s3 = peg$parseidShorthand();
       if (s3 !== null) {
         peg$reportedPos = s2;
-        s3 = peg$c145(s3);
+        s3 = peg$c142(s3);
       }
       if (s3 === null) {
         peg$currPos = s2;
@@ -4478,7 +4412,7 @@ Emblem.Parser = (function() {
         s3 = peg$parseclassShorthand();
         if (s3 !== null) {
           peg$reportedPos = s2;
-          s3 = peg$c146(s3);
+          s3 = peg$c143(s3);
         }
         if (s3 === null) {
           peg$currPos = s2;
@@ -4494,7 +4428,7 @@ Emblem.Parser = (function() {
           s3 = peg$parseidShorthand();
           if (s3 !== null) {
             peg$reportedPos = s2;
-            s3 = peg$c145(s3);
+            s3 = peg$c142(s3);
           }
           if (s3 === null) {
             peg$currPos = s2;
@@ -4507,7 +4441,7 @@ Emblem.Parser = (function() {
             s3 = peg$parseclassShorthand();
             if (s3 !== null) {
               peg$reportedPos = s2;
-              s3 = peg$c146(s3);
+              s3 = peg$c143(s3);
             }
             if (s3 === null) {
               peg$currPos = s2;
@@ -4522,7 +4456,7 @@ Emblem.Parser = (function() {
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c147(s1);
+        s1 = peg$c144(s1);
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -4576,7 +4510,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c148(s2);
+          s1 = peg$c145(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -4598,12 +4532,12 @@ Emblem.Parser = (function() {
     function peg$parseboundAttributeValueChar() {
       var s0;
 
-      if (peg$c149.test(input.charAt(peg$currPos))) {
+      if (peg$c146.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c150); }
+        if (peg$silentFails === 0) { peg$fail(peg$c147); }
       }
       if (s0 === null) {
         s0 = peg$parsenonSeparatorColon();
@@ -4621,7 +4555,7 @@ Emblem.Parser = (function() {
         s1 = peg$parsepathIdNode();
         if (s1 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c151(s1);
+          s1 = peg$c148(s1);
         }
         if (s1 === null) {
           peg$currPos = s0;
@@ -4737,7 +4671,7 @@ Emblem.Parser = (function() {
           s3 = peg$parseactionValue();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c152(s1, s3);
+            s1 = peg$c149(s1, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4792,7 +4726,7 @@ Emblem.Parser = (function() {
           }
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c153(s1, s3);
+            s1 = peg$c150(s1, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -4866,15 +4800,15 @@ Emblem.Parser = (function() {
             s4 = peg$parse_();
             if (s4 !== null) {
               if (input.charCodeAt(peg$currPos) === 125) {
-                s5 = peg$c121;
+                s5 = peg$c118;
                 peg$currPos++;
               } else {
                 s5 = null;
-                if (peg$silentFails === 0) { peg$fail(peg$c122); }
+                if (peg$silentFails === 0) { peg$fail(peg$c119); }
               }
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c154(s3);
+                s1 = peg$c151(s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -4941,11 +4875,11 @@ Emblem.Parser = (function() {
             s4 = peg$currPos;
             peg$silentFails++;
             if (input.charCodeAt(peg$currPos) === 33) {
-              s5 = peg$c155;
+              s5 = peg$c152;
               peg$currPos++;
             } else {
               s5 = null;
-              if (peg$silentFails === 0) { peg$fail(peg$c156); }
+              if (peg$silentFails === 0) { peg$fail(peg$c153); }
             }
             peg$silentFails--;
             if (s5 === null) {
@@ -4956,7 +4890,7 @@ Emblem.Parser = (function() {
             }
             if (s4 !== null) {
               peg$reportedPos = peg$currPos;
-              s5 = peg$c157(s1, s3);
+              s5 = peg$c154(s1, s3);
               if (s5) {
                 s5 = peg$c1;
               } else {
@@ -4964,7 +4898,7 @@ Emblem.Parser = (function() {
               }
               if (s5 !== null) {
                 peg$reportedPos = s0;
-                s1 = peg$c158(s1, s3);
+                s1 = peg$c155(s1, s3);
                 if (s1 === null) {
                   peg$currPos = s0;
                   s0 = s1;
@@ -5012,7 +4946,7 @@ Emblem.Parser = (function() {
           s3 = peg$parsepathIdNode();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c159(s1, s3);
+            s1 = peg$c156(s1, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -5052,7 +4986,7 @@ Emblem.Parser = (function() {
           s3 = peg$parseattributeTextNodes();
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c160(s1, s3);
+            s1 = peg$c157(s1, s3);
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -5107,11 +5041,11 @@ Emblem.Parser = (function() {
         }
         if (s0 === null) {
           if (input.charCodeAt(peg$currPos) === 95) {
-            s0 = peg$c161;
+            s0 = peg$c158;
             peg$currPos++;
           } else {
             s0 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c162); }
+            if (peg$silentFails === 0) { peg$fail(peg$c159); }
           }
           if (s0 === null) {
             if (input.charCodeAt(peg$currPos) === 45) {
@@ -5133,11 +5067,11 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 37) {
-        s1 = peg$c163;
+        s1 = peg$c160;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c164); }
+        if (peg$silentFails === 0) { peg$fail(peg$c161); }
       }
       if (s1 !== null) {
         s2 = peg$parsecssIdentifier();
@@ -5167,17 +5101,17 @@ Emblem.Parser = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 35) {
-        s1 = peg$c165;
+        s1 = peg$c162;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c166); }
+        if (peg$silentFails === 0) { peg$fail(peg$c163); }
       }
       if (s1 !== null) {
         s2 = peg$parsecssIdentifier();
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c167(s2);
+          s1 = peg$c164(s2);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -5238,7 +5172,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c168); }
+        if (peg$silentFails === 0) { peg$fail(peg$c165); }
       }
 
       return s0;
@@ -5265,12 +5199,12 @@ Emblem.Parser = (function() {
     function peg$parsenmchar() {
       var s0;
 
-      if (peg$c169.test(input.charAt(peg$currPos))) {
+      if (peg$c166.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c170); }
+        if (peg$silentFails === 0) { peg$fail(peg$c167); }
       }
       if (s0 === null) {
         s0 = peg$parsenonascii();
@@ -5282,12 +5216,12 @@ Emblem.Parser = (function() {
     function peg$parsenmstart() {
       var s0;
 
-      if (peg$c171.test(input.charAt(peg$currPos))) {
+      if (peg$c168.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c172); }
+        if (peg$silentFails === 0) { peg$fail(peg$c169); }
       }
       if (s0 === null) {
         s0 = peg$parsenonascii();
@@ -5299,12 +5233,12 @@ Emblem.Parser = (function() {
     function peg$parsenonascii() {
       var s0;
 
-      if (peg$c173.test(input.charAt(peg$currPos))) {
+      if (peg$c170.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c174); }
+        if (peg$silentFails === 0) { peg$fail(peg$c171); }
       }
 
       return s0;
@@ -5338,11 +5272,11 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 37) {
-        s1 = peg$c163;
+        s1 = peg$c160;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c164); }
+        if (peg$silentFails === 0) { peg$fail(peg$c161); }
       }
       if (s1 !== null) {
         s2 = peg$parse_();
@@ -5375,7 +5309,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c175); }
+        if (peg$silentFails === 0) { peg$fail(peg$c172); }
       }
 
       return s0;
@@ -5388,7 +5322,7 @@ Emblem.Parser = (function() {
       s1 = peg$parsetagString();
       if (s1 !== null) {
         peg$reportedPos = peg$currPos;
-        s2 = peg$c176(s1);
+        s2 = peg$c173(s1);
         if (s2) {
           s2 = peg$c1;
         } else {
@@ -5396,7 +5330,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c177(s1);
+          s1 = peg$c174(s1);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -5418,12 +5352,12 @@ Emblem.Parser = (function() {
     function peg$parsetagChar() {
       var s0;
 
-      if (peg$c169.test(input.charAt(peg$currPos))) {
+      if (peg$c166.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c170); }
+        if (peg$silentFails === 0) { peg$fail(peg$c167); }
       }
       if (s0 === null) {
         s0 = peg$parsenonSeparatorColon();
@@ -5489,7 +5423,7 @@ Emblem.Parser = (function() {
       s1 = peg$parsetagString();
       if (s1 !== null) {
         peg$reportedPos = peg$currPos;
-        s2 = peg$c179(s1);
+        s2 = peg$c176(s1);
         if (s2) {
           s2 = peg$c1;
         } else {
@@ -5497,7 +5431,7 @@ Emblem.Parser = (function() {
         }
         if (s2 !== null) {
           peg$reportedPos = s0;
-          s1 = peg$c177(s1);
+          s1 = peg$c174(s1);
           if (s1 === null) {
             peg$currPos = s0;
             s0 = s1;
@@ -5515,7 +5449,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c178); }
+        if (peg$silentFails === 0) { peg$fail(peg$c175); }
       }
 
       return s0;
@@ -5555,15 +5489,15 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61423) {
-        s1 = peg$c181;
+        s1 = peg$c178;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c182); }
+        if (peg$silentFails === 0) { peg$fail(peg$c179); }
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c183();
+        s1 = peg$c180();
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -5574,7 +5508,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c180); }
+        if (peg$silentFails === 0) { peg$fail(peg$c177); }
       }
 
       return s0;
@@ -5586,15 +5520,15 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61438) {
-        s1 = peg$c185;
+        s1 = peg$c182;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c186); }
+        if (peg$silentFails === 0) { peg$fail(peg$c183); }
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c183();
+        s1 = peg$c180();
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -5605,7 +5539,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c184); }
+        if (peg$silentFails === 0) { peg$fail(peg$c181); }
       }
 
       return s0;
@@ -5617,15 +5551,15 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 61422) {
-        s1 = peg$c188;
+        s1 = peg$c185;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c189); }
+        if (peg$silentFails === 0) { peg$fail(peg$c186); }
       }
       if (s1 !== null) {
         peg$reportedPos = s0;
-        s1 = peg$c183();
+        s1 = peg$c180();
       }
       if (s1 === null) {
         peg$currPos = s0;
@@ -5636,7 +5570,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c187); }
+        if (peg$silentFails === 0) { peg$fail(peg$c184); }
       }
 
       return s0;
@@ -5648,34 +5582,34 @@ Emblem.Parser = (function() {
       peg$silentFails++;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 13) {
-        s1 = peg$c191;
+        s1 = peg$c188;
         peg$currPos++;
       } else {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c192); }
+        if (peg$silentFails === 0) { peg$fail(peg$c189); }
       }
       if (s1 === null) {
         s1 = peg$c1;
       }
       if (s1 !== null) {
         if (input.charCodeAt(peg$currPos) === 61439) {
-          s2 = peg$c193;
+          s2 = peg$c190;
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c194); }
+          if (peg$silentFails === 0) { peg$fail(peg$c191); }
         }
         if (s2 !== null) {
           if (input.charCodeAt(peg$currPos) === 10) {
-            s3 = peg$c195;
+            s3 = peg$c192;
             peg$currPos++;
           } else {
             s3 = null;
-            if (peg$silentFails === 0) { peg$fail(peg$c196); }
+            if (peg$silentFails === 0) { peg$fail(peg$c193); }
           }
           if (s3 !== null) {
             peg$reportedPos = s0;
-            s1 = peg$c141();
+            s1 = peg$c138();
             if (s1 === null) {
               peg$currPos = s0;
               s0 = s1;
@@ -5697,7 +5631,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c190); }
+        if (peg$silentFails === 0) { peg$fail(peg$c187); }
       }
 
       return s0;
@@ -5714,7 +5648,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c197); }
+        if (peg$silentFails === 0) { peg$fail(peg$c194); }
       }
 
       return s0;
@@ -5742,7 +5676,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c198); }
+        if (peg$silentFails === 0) { peg$fail(peg$c195); }
       }
 
       return s0;
@@ -5761,7 +5695,7 @@ Emblem.Parser = (function() {
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c199); }
+        if (peg$silentFails === 0) { peg$fail(peg$c196); }
       }
 
       return s0;
@@ -5771,17 +5705,17 @@ Emblem.Parser = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (peg$c201.test(input.charAt(peg$currPos))) {
+      if (peg$c198.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c202); }
+        if (peg$silentFails === 0) { peg$fail(peg$c199); }
       }
       peg$silentFails--;
       if (s0 === null) {
         s1 = null;
-        if (peg$silentFails === 0) { peg$fail(peg$c200); }
+        if (peg$silentFails === 0) { peg$fail(peg$c197); }
       }
 
       return s0;
@@ -5813,7 +5747,7 @@ Emblem.Parser = (function() {
           peg$currPos++;
         } else {
           s2 = null;
-          if (peg$silentFails === 0) { peg$fail(peg$c112); }
+          if (peg$silentFails === 0) { peg$fail(peg$c109); }
         }
         if (s2 !== null) {
           peg$reportedPos = s0;