Skip to content

Added offset to the token location #11823

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

Merged
RazvanN7 merged 1 commit into from
Oct 26, 2020
Merged

Added offset to the token location #11823

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
4 changes: 3 additions & 1 deletion dub.sdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ subPackage {
"src/dmd/utf.d" \
"src/dmd/utils.d"

versions "CallbackAPI"
versions \
"CallbackAPI" \
"DMDLIB"

preGenerateCommands `
"$${DUB_EXE}" \
Expand Down
7 changes: 7 additions & 0 deletions src/dmd/globals.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,12 +555,19 @@ alias d_uns32 = uint32_t;
alias d_int64 = int64_t;
alias d_uns64 = uint64_t;

version (DMDLIB)
{
version = LocOffset;
}

// file location
struct Loc
{
const(char)* filename; // either absolute or relative to cwd
uint linnum;
uint charnum;
version (LocOffset)
uint fileOffset;

static immutable Loc initial; /// use for default initialization of const ref Loc's

Expand Down
7 changes: 7 additions & 0 deletions src/dmd/lexer.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ unittest
}
}

version (DMDLIB)
{
version = LocOffset;
}

/***********************************************************
*/
class Lexer
Expand Down Expand Up @@ -2284,6 +2289,8 @@ class Lexer
final Loc loc() pure @nogc
{
scanloc.charnum = cast(uint)(1 + p - line);
version (LocOffset)
scanloc.fileOffset = cast(uint)(p - base);
return scanloc;
}

Expand Down
1 change: 1 addition & 0 deletions test/tools/unit_test_runner.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ void writeCmdfile(string path, string runnerPath, string outputPath,
"-version=GC",
"-version=NoMain",
"-version=MARS",
"-version=DMDLIB",
"-unittest",
"-J" ~ buildOutputPath,
"-J" ~ projectRootDir.buildPath("src/dmd/res"),
Expand Down
Loading