Skip to content
Merged
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions source/lexer.d
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ class Lexer {
string reading;
string extra;

char[char] escapes = [
'n': '\n',
'r': '\r',
't': '\t',
'e': '\x1b',
'"': '"',
'\\': '\\'
];
char[char] escapes;

this() {

escapes = [
'n': '\n',
'r': '\r',
't': '\t',
'e': '\x1b',
'"': '"',
'\\': '\\'
];
}

ErrorInfo GetError() {
Expand Down Expand Up @@ -83,23 +83,23 @@ class Lexer {
if (!reading.OnlyContains("0123456789abcdefABCDEF")) {
Error("Invalid literal");
}

reading = format("%d", reading[2 .. $].to!long(16));
AddToken(TokenType.Integer);
}
else if (reading.startsWith("0b")) {
if (!reading.OnlyContains("01")) {
Error("Invalid binary literal");
}

reading = format("%d", reading[2 .. $].to!long(2));
AddToken(TokenType.Integer);
}
else if (reading.startsWith("0o")) {
if (!reading.OnlyContains("01234567")) {
Error("Invalid octal literal");
}

reading = format("%d", reading[2 .. $].to!long(8));
AddToken(TokenType.Integer);
}
Expand Down Expand Up @@ -214,7 +214,7 @@ class Lexer {

ch = escapes[code[i]];
}

Next();
ExpectChar('\'');

Expand Down