summaryrefslogtreecommitdiffstats
path: root/src/lexer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lexer.cc')
-rw-r--r--src/lexer.cc149
1 files changed, 79 insertions, 70 deletions
diff --git a/src/lexer.cc b/src/lexer.cc
index b3efe22..5d7d185 100644
--- a/src/lexer.cc
+++ b/src/lexer.cc
@@ -30,7 +30,7 @@ bool Lexer::Error(const string& message, string* err) {
context = p + 1;
}
}
- int col = last_token_ ? last_token_ - context : 0;
+ int col = last_token_ ? (int)(last_token_ - context) : 0;
char buf[1024];
snprintf(buf, sizeof(buf), "%s:%d: ", filename_.AsString().c_str(), line);
@@ -90,24 +90,25 @@ const char* Lexer::TokenName(Token t) {
return NULL; // not reached
}
-const char* Lexer::TokenErrorHint(Token t) {
- switch (t) {
- case ERROR: return "";
- case BUILD: return "";
- case COLON: return " ($ also escapes ':')";
- case DEFAULT: return "";
- case EQUALS: return "";
- case IDENT: return "";
- case INCLUDE: return "";
- case INDENT: return "";
- case NEWLINE: return "";
- case PIPE2: return "";
- case PIPE: return "";
- case RULE: return "";
- case SUBNINJA: return "";
- case TEOF: return "";
+const char* Lexer::TokenErrorHint(Token expected) {
+ switch (expected) {
+ case COLON:
+ return " ($ also escapes ':')";
+ default:
+ return "";
+ }
+}
+
+string Lexer::DescribeLastError() {
+ if (last_token_) {
+ switch (last_token_[0]) {
+ case '\r':
+ return "carriage returns are not allowed, use newlines";
+ case '\t':
+ return "tabs are not allowed, use spaces";
+ }
}
- return "";
+ return "lexing error";
}
void Lexer::UnreadToken() {
@@ -127,7 +128,7 @@ Lexer::Token Lexer::ReadToken() {
unsigned int yyaccept = 0;
static const unsigned char yybm[] = {
0, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 0, 64, 64, 64, 64, 64,
+ 64, 64, 0, 64, 64, 0, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64,
192, 64, 64, 64, 64, 64, 64, 64,
@@ -216,7 +217,8 @@ yy3:
yy4:
yyaccept = 1;
yych = *(q = ++p);
- if (yych >= 0x01) goto yy60;
+ if (yych <= 0x00) goto yy5;
+ if (yych != '\r') goto yy60;
yy5:
{ token = ERROR; break; }
yy6:
@@ -354,7 +356,9 @@ yy60:
if (yybm[0+yych] & 64) {
goto yy59;
}
- if (yych >= 0x01) goto yy62;
+ if (yych <= 0x00) goto yy61;
+ if (yych <= '\f') goto yy62;
+yy61:
p = q;
if (yyaccept <= 0) {
goto yy3;
@@ -576,7 +580,7 @@ bool Lexer::ReadEvalString(EvalString* eval, bool path, string* err) {
unsigned char yych;
static const unsigned char yybm[] = {
0, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 0, 128, 128, 128, 128, 128,
+ 128, 128, 0, 128, 128, 0, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
16, 128, 128, 128, 0, 128, 128, 128,
@@ -609,24 +613,25 @@ bool Lexer::ReadEvalString(EvalString* eval, bool path, string* err) {
128, 128, 128, 128, 128, 128, 128, 128,
};
yych = *p;
- if (yych <= '#') {
+ if (yych <= ' ') {
if (yych <= '\n') {
if (yych <= 0x00) goto yy96;
if (yych >= '\n') goto yy92;
} else {
- if (yych == ' ') goto yy92;
+ if (yych == '\r') goto yy98;
+ if (yych >= ' ') goto yy92;
}
} else {
- if (yych <= ':') {
- if (yych <= '$') goto yy94;
- if (yych >= ':') goto yy92;
+ if (yych <= '9') {
+ if (yych == '$') goto yy94;
} else {
+ if (yych <= ':') goto yy92;
if (yych == '|') goto yy92;
}
}
++p;
yych = *p;
- goto yy120;
+ goto yy121;
yy91:
{
eval->AddText(StringPiece(start, p - start));
@@ -649,42 +654,43 @@ yy94:
++p;
if ((yych = *p) <= '/') {
if (yych <= ' ') {
- if (yych == '\n') goto yy109;
- if (yych <= 0x1F) goto yy98;
- goto yy100;
+ if (yych == '\n') goto yy110;
+ if (yych <= 0x1F) goto yy99;
+ goto yy101;
} else {
if (yych <= '$') {
- if (yych <= '#') goto yy98;
- goto yy102;
+ if (yych <= '#') goto yy99;
+ goto yy103;
} else {
- if (yych == '-') goto yy104;
- goto yy98;
+ if (yych == '-') goto yy105;
+ goto yy99;
}
}
} else {
if (yych <= '^') {
if (yych <= ':') {
- if (yych <= '9') goto yy104;
- goto yy106;
+ if (yych <= '9') goto yy105;
+ goto yy107;
} else {
- if (yych <= '@') goto yy98;
- if (yych <= 'Z') goto yy104;
- goto yy98;
+ if (yych <= '@') goto yy99;
+ if (yych <= 'Z') goto yy105;
+ goto yy99;
}
} else {
if (yych <= '`') {
- if (yych <= '_') goto yy104;
- goto yy98;
+ if (yych <= '_') goto yy105;
+ goto yy99;
} else {
- if (yych <= 'z') goto yy104;
- if (yych <= '{') goto yy108;
- goto yy98;
+ if (yych <= 'z') goto yy105;
+ if (yych <= '{') goto yy109;
+ goto yy99;
}
}
}
+yy95:
{
last_token_ = start;
- return Error("lexing error", err);
+ return Error(DescribeLastError(), err);
}
yy96:
++p;
@@ -693,83 +699,86 @@ yy96:
return Error("unexpected EOF", err);
}
yy98:
- ++p;
+ yych = *++p;
+ goto yy95;
yy99:
+ ++p;
+yy100:
{
last_token_ = start;
return Error("bad $-escape (literal $ must be written as $$)", err);
}
-yy100:
+yy101:
++p;
{
eval->AddText(StringPiece(" ", 1));
continue;
}
-yy102:
+yy103:
++p;
{
eval->AddText(StringPiece("$", 1));
continue;
}
-yy104:
+yy105:
++p;
yych = *p;
- goto yy118;
-yy105:
+ goto yy119;
+yy106:
{
eval->AddSpecial(StringPiece(start + 1, p - start - 1));
continue;
}
-yy106:
+yy107:
++p;
{
eval->AddText(StringPiece(":", 1));
continue;
}
-yy108:
+yy109:
yych = *(q = ++p);
if (yybm[0+yych] & 32) {
- goto yy112;
+ goto yy113;
}
- goto yy99;
-yy109:
+ goto yy100;
+yy110:
++p;
yych = *p;
if (yybm[0+yych] & 16) {
- goto yy109;
+ goto yy110;
}
{
continue;
}
-yy112:
+yy113:
++p;
yych = *p;
if (yybm[0+yych] & 32) {
- goto yy112;
+ goto yy113;
}
- if (yych == '}') goto yy115;
+ if (yych == '}') goto yy116;
p = q;
- goto yy99;
-yy115:
+ goto yy100;
+yy116:
++p;
{
eval->AddSpecial(StringPiece(start + 2, p - start - 3));
continue;
}
-yy117:
+yy118:
++p;
yych = *p;
-yy118:
+yy119:
if (yybm[0+yych] & 64) {
- goto yy117;
+ goto yy118;
}
- goto yy105;
-yy119:
+ goto yy106;
+yy120:
++p;
yych = *p;
-yy120:
+yy121:
if (yybm[0+yych] & 128) {
- goto yy119;
+ goto yy120;
}
goto yy91;
}
generated by cgit v0.12 at 2024-08-22 20:30:06 (GMT)