Skip to content

Rewrite line number computation in WSL #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jrmuizel wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −9
Open

Rewrite line number computation in WSL #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions WSL/Lexer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@ class Lexer {
this._text = text;
this._index = 0;
this._stack = [];
this._lineNumber = lineNumberOffset;
}

get lineNumber()
{
return this.lineNumberForIndex(this._index);
return this._lineNumber;
}

get origin() { return this._origin; }
Expand All @@ -51,17 +52,22 @@ class Lexer {

get originKind() { return this._originKind; }

lineNumberForIndex(index)
_countNewlines(str, length)
{
let matches = this._text.substring(0, index).match(/\n/g);
return (matches ? matches.length : 0) + this._lineNumberOffset;
let count = 0;
for (let i = 0; i < length; i++) {
if (str.charCodeAt(i) === 10)
count++;
}
return count;
}

get state() { return {index: this._index, stack: this._stack.concat()}; }
get state() { return {index: this._index, stack: this._stack.concat(), lineNumber: this._lineNumber}; }
set state(value)
{
this._index = value.index;
this._stack = value.stack;
this._lineNumber = value.lineNumber;
}

static _textIsIdentifierImpl(text)
Expand All @@ -87,7 +93,7 @@ class Lexer {

let result = (kind) => {
let text = RegExp.lastMatch;
let token = new LexerToken(this, this._index, kind, text);
let token = new LexerToken(this, this._index, kind, text, this._lineNumber);
this._index += text.length;
return token;
};
Expand All @@ -96,13 +102,16 @@ class Lexer {
for (;;) {
relevantText = this._text.substring(this._index);
if (/^\s+/.test(relevantText)) {
this._index += RegExp.lastMatch.length;
let ws = RegExp.lastMatch;
this._lineNumber += this._countNewlines(ws, ws.length);
this._index += ws.length;
continue;
}
if (/^\/\*/.test(relevantText)) {
let endIndex = relevantText.search(/\*\//);
if (endIndex < 0)
this.fail("Unterminated comment");
this._lineNumber += this._countNewlines(relevantText, endIndex);
this._index += endIndex;
continue;
}
Expand Down
5 changes: 3 additions & 2 deletions WSL/LexerToken.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@
"use strict";

class LexerToken {
constructor(lexer, index, kind, text)
constructor(lexer, index, kind, text, lineNumber)
{
this._lexer = lexer;
this._index = index;
this._kind = kind;
this._text = text;
this._lineNumber = lineNumber;
}

get lexer()
Expand Down Expand Up @@ -65,7 +66,7 @@ class LexerToken {

get lineNumber()
{
return this._lexer.lineNumberForIndex(this._index);
return this._lineNumber;
}

get originString()
Expand Down