From eceda8b5e86e1993a331ecf0a363e90710571cab Mon Sep 17 00:00:00 2001
From: David Majda <david@majda.cz>
Date: Sun, 18 Sep 2011 18:08:58 +0200
Subject: [PATCH] Use correct disjunction operator in |computeErrorPosition|

Original patch by Wolfgang Kluge:

  https://github.com/WolfgangKluge/pegjs/commit/6b793b33dfa43468bf8f4a2bc215757bd5725bd4
---
 src/emitter.js | 2 +-
 src/parser.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/emitter.js b/src/emitter.js
index 296d5d4..74ef92d 100644
--- a/src/emitter.js
+++ b/src/emitter.js
@@ -247,7 +247,7 @@ PEG.compiler.emitter = function(ast) {
         "            if (!seenCR) { line++; }",
         "            column = 1;",
         "            seenCR = false;",
-        "          } else if (ch === '\\r' | ch === '\\u2028' || ch === '\\u2029') {",
+        "          } else if (ch === '\\r' || ch === '\\u2028' || ch === '\\u2029') {",
         "            line++;",
         "            column = 1;",
         "            seenCR = true;",
diff --git a/src/parser.js b/src/parser.js
index efafb7c..d065c46 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -3684,7 +3684,7 @@ PEG.parser = (function(){
             if (!seenCR) { line++; }
             column = 1;
             seenCR = false;
-          } else if (ch === '\r' | ch === '\u2028' || ch === '\u2029') {
+          } else if (ch === '\r' || ch === '\u2028' || ch === '\u2029') {
             line++;
             column = 1;
             seenCR = true;