Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch from nanto@moon.email.ne.jp for misordered alternates in string-lexing regexp, and lack of IE /[/]/ compat in regexp-lexing regexp (433831, r=me, NPOTB).

Browse Source
This commit is contained in:
brendan@mozilla.org 2008-05-21 15:38:18 -07:00
parent 7f43c5d089
commit 0b62c0a1e4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/narcissus/jsparse.js
View File

@ -55,6 +55,9 @@ var opRegExp = new RegExp(opRegExpSrc);
// A regexp to match floating point literals (but not integer literals).
var fpRegExp = /^\d+\.\d*(?:[eE][-+]?\d+)?|^\d+(?:\.\d*)?[eE][-+]?\d+|^\.\d+(?:[eE][-+]?\d+)?/;
// A regexp to match regexp literals.
var reRegExp = /^\/((?:\\.|\[(?:\\.|[^\]])*\]|[^\/])+)\/([gimy]*)/;
function Tokenizer(s, f, l) {
this.cursor = 0;
this.source = String(s);
@ -161,11 +164,10 @@ Tokenizer.prototype = {
var id = match[0];
token.type = keywords[id] || IDENTIFIER;
token.value = id;
} else if ((match = /^"(?:\\.|[^"])*"|^'(?:[^']|\\.)*'/(input))) { //"){
} else if ((match = /^"(?:\\.|[^"])*"|^'(?:\\.|[^'])*'/(input))) { //"){
token.type = STRING;
token.value = eval(match[0]);
} else if (this.scanOperand &&
(match = /^\/((?:\\.|[^\/])+)\/([gimy]*)/(input))) {
} else if (this.scanOperand && (match = reRegExp(input))) {
token.type = REGEXP;
token.value = new RegExp(match[1], match[2]);
} else if ((match = opRegExp(input))) {