summaryrefslogtreecommitdiffstats
path: root/src/depfile_parser.cc
diff options
context:
space:
mode:
authorMaxim Kalaev <maximk@il.ibm.com>2012-07-19 05:49:34 (GMT)
committerMaxim Kalaev <maximk@il.ibm.com>2012-07-19 06:05:59 (GMT)
commit73b8aa33f295aa64a8c115d886048a0a06ceee81 (patch)
treef3e7ab852ea83a1577ce0f5117ed2324cbad6f63 /src/depfile_parser.cc
parent8a37bfffcbea27ffbb9168b2740476336cd4963a (diff)
downloadNinja-73b8aa33f295aa64a8c115d886048a0a06ceee81.zip
Ninja-73b8aa33f295aa64a8c115d886048a0a06ceee81.tar.gz
Ninja-73b8aa33f295aa64a8c115d886048a0a06ceee81.tar.bz2
dep file parsing: allow '@' and '=' in paths
Diffstat (limited to 'src/depfile_parser.cc')
-rw-r--r--src/depfile_parser.cc36
1 files changed, 22 insertions, 14 deletions
diff --git a/src/depfile_parser.cc b/src/depfile_parser.cc
index 54b934c..03dad92 100644
--- a/src/depfile_parser.cc
+++ b/src/depfile_parser.cc
@@ -56,8 +56,8 @@ bool DepfileParser::Parse(string* content, string* err) {
0, 0, 0, 0, 0, 0, 0, 0,
128, 128, 0, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 0, 0, 0, 0, 0,
- 0, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 0, 0, 128, 0, 0,
+ 128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 0, 0, 0, 0, 128,
@@ -84,27 +84,35 @@ bool DepfileParser::Parse(string* content, string* err) {
};
yych = *in;
- if (yych <= '[') {
+ if (yych <= 'Z') {
if (yych <= '*') {
if (yych <= 0x00) goto yy6;
if (yych <= '\'') goto yy8;
if (yych <= ')') goto yy4;
goto yy8;
} else {
- if (yych <= ':') goto yy4;
- if (yych <= '@') goto yy8;
- if (yych <= 'Z') goto yy4;
- goto yy8;
+ if (yych <= '<') {
+ if (yych <= ':') goto yy4;
+ goto yy8;
+ } else {
+ if (yych <= '=') goto yy4;
+ if (yych <= '?') goto yy8;
+ goto yy4;
+ }
}
} else {
- if (yych <= '`') {
- if (yych <= '\\') goto yy2;
- if (yych == '_') goto yy4;
- goto yy8;
+ if (yych <= '_') {
+ if (yych == '\\') goto yy2;
+ if (yych <= '^') goto yy8;
+ goto yy4;
} else {
- if (yych <= 'z') goto yy4;
- if (yych == '~') goto yy4;
- goto yy8;
+ if (yych <= 'z') {
+ if (yych <= '`') goto yy8;
+ goto yy4;
+ } else {
+ if (yych == '~') goto yy4;
+ goto yy8;
+ }
}
}
yy2: