From 4b3d183ba749cd1f81139ffc907a0b1952a406ca Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Tue, 8 Feb 2011 09:19:06 +0100 Subject: [PATCH] reaadd tokenizer check --- lib/ace/tokenizer.js | 10 +++++++--- support/pilot | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/ace/tokenizer.js b/lib/ace/tokenizer.js index fa70e2d5..de31c298 100644 --- a/lib/ace/tokenizer.js +++ b/lib/ace/tokenizer.js @@ -107,10 +107,14 @@ var Tokenizer = function(rules) { } else { token.value += value; } + if (lastIndex == line.length) { - break; - } - lastIndex = re.lastIndex; + break; + } else if (re.lastIndex == lastIndex) { + throw new Error("tokenizer error"); + } + + lastIndex = re.lastIndex; }; if (token.type) { diff --git a/support/pilot b/support/pilot index c0cab19c..67a38030 160000 --- a/support/pilot +++ b/support/pilot @@ -1 +1 @@ -Subproject commit c0cab19cbb5d44df98bae0060c782a6f30464afe +Subproject commit 67a380309e5b139a9603334ad9d9f917659f04bc