refactor: don't poll xmlnsOpt in each iteration

rubensworks · Aug 24, 2018 · 1981d7d · 1981d7d
1 parent c8b7ae2
commit 1981d7d
Showing 1 changed file with 31 additions and 12 deletions.
diff --git a/lib/saxes.js b/lib/saxes.js
@@ -968,14 +968,26 @@ class SaxesParser {
     let check = this.piTarget.length === 0 ? isNameStartChar : isNameChar;
     const c = this.captureWhile(
       chunkState,
+      // When namespaces are used, colons are not allowed in pi targets
+      // names.
+      // https://www.w3.org/XML/xml-names-19990114-errata.html
+      // NE08
+      this.xmlnsOpt ?
       (cx) => {
         if (cx !== QUESTION && !isS(cx)) {
-          if (!(check(cx) &&
-                // When namespaces are used, colons are not allowed in entity
-                // names.
-                // https://www.w3.org/XML/xml-names-19990114-errata.html
-                // NE08
-                (!this.xmlnsOpt || cx !== COLON))) {
+          if (!(check(cx) && cx !== COLON)) {
+            this.fail("disallowed characer in processing instruction name.");
+          }
+
+          check = isNameChar;
+          return true;
+        }
+
+        return false;
+      } :
+      (cx) => {
+        if (cx !== QUESTION && !isS(cx)) {
+          if (!check(cx)) {
             this.fail("disallowed characer in processing instruction name.");
           }
 
@@ -1464,13 +1476,20 @@ class SaxesParser {
   sEntity(chunkState) {
     let check = this.entity.length === 0 ? isEntityStartChar : isNameChar;
     const c = this.captureWhile(chunkState,
+                                // When namespaces are used, colons are
+                                // not valid in entity names.
+                                // https://www.w3.org/XML/xml-names-19990114-errata.html
+                                // NE08
+                                this.xmlnsOpt ?
                                 (cx) => {
-                                  if (check(cx) &&
-                                      // When namespaces are used, colons are
-                                      // not valid in entity names.
-                                      // https://www.w3.org/XML/xml-names-19990114-errata.html
-                                      // NE08
-                                      (!this.xmlnsOpt || cx !== COLON)) {
+                                  if (check(cx) && cx !== COLON) {
+                                    check = isNameChar;
+                                    return true;
+                                  }
+
+                                  return false;
+                                } : (cx) => {
+                                  if (check(cx)) {
                                     check = isNameChar;
                                     return true;
                                   }