fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-06-17 08:51:34 +00:00
Code Issues Projects Releases Wiki Activity

Harden regexp parsing a bit

Browse Source
This commit is contained in:
dcodeIO
2018-01-07 18:15:21 +01:00
parent 7c8670ac35
commit 0de05b543b
7 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/tokenizer.ts
View File

@ -901,14 +901,14 @@ export class Tokenizer extends DiagnosticEmitter {
}
}
readRegexpPattern(): string | null {
readRegexpPattern(): string {
var text = this.source.text;
var start = this.pos;
var escaped = false;
while (true) {
if (this.pos >= this.end) {
this.error(DiagnosticCode.Unterminated_regular_expression_literal, this.range(start, this.end));
return null;
break;
}
if (text.charCodeAt(this.pos) == CharCode.BACKSLASH) {
++this.pos;
@ -920,7 +920,7 @@ export class Tokenizer extends DiagnosticEmitter {
break;
if (isLineBreak(c)) {
this.error(DiagnosticCode.Unterminated_regular_expression_literal, this.range(start, this.pos));
return null;
break;
}
++this.pos;
escaped = false;
@ -928,23 +928,35 @@ export class Tokenizer extends DiagnosticEmitter {
return text.substring(start, this.pos);
}
readRegexpModifiers(): string {
readRegexpFlags(): string {
var text = this.source.text;
var start = this.pos;
/a/
var flags = 0;
while (this.pos < this.end) {
switch (text.charCodeAt(this.pos)) {
var c: i32 = text.charCodeAt(this.pos);
if (!isIdentifierPart(c))
break;
++this.pos;
switch (c) {
// make sure each supported flag is unique
case CharCode.g:
flags |= select<i32>(1, -1, !(flags & 1));
break;
case CharCode.i:
flags |= select<i32>(2, -1, !(flags & 2));
break;
case CharCode.m:
++this.pos;
flags |= select<i32>(4, -1, !(flags & 4));
break;
default:
return text.substring(start, this.pos);
flags = -1;
break;
}
}
if (flags == -1)
this.error(DiagnosticCode.Invalid_regular_expression_flags, this.range(start, this.pos));
return text.substring(start, this.pos);
}