diff options
author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-12-24 22:23:16 +0100 |
---|---|---|
committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-12-30 11:27:53 +0100 |
commit | 209da90b40fca1be964e25c48352712d519c4dc2 (patch) | |
tree | e8793b525e7705b9dc1d6a4d951757393acea996 /gcc/d | |
parent | ac78516b2758a1a0598c45d0464d18d15661c853 (diff) | |
download | gcc-209da90b40fca1be964e25c48352712d519c4dc2.zip gcc-209da90b40fca1be964e25c48352712d519c4dc2.tar.gz gcc-209da90b40fca1be964e25c48352712d519c4dc2.tar.bz2 |
d: Simplify quoting characters in deps_add_target
The implementation in d-lang.cc was based on what was present in libcpp.
This synchronizes the escaping logic to match the current version.
gcc/d/ChangeLog:
* d-lang.cc (deps_add_target): Handle quoting ':' character.
Reimplement backslash tracking.
Diffstat (limited to 'gcc/d')
-rw-r--r-- | gcc/d/d-lang.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc index fb95716..f20d1f0 100644 --- a/gcc/d/d-lang.cc +++ b/gcc/d/d-lang.cc @@ -114,26 +114,35 @@ deps_add_target (const char *target, bool quoted) } /* Quote characters in target which are significant to Make. */ + unsigned slashes = 0; + for (const char *p = target; *p != '\0'; p++) { switch (*p) { + case '\\': + slashes++; + break; + case ' ': case '\t': - for (const char *q = p - 1; target <= q && *q == '\\'; q--) + while (slashes--) obstack_1grow (&buffer, '\\'); obstack_1grow (&buffer, '\\'); - break; + goto Ldef; case '$': obstack_1grow (&buffer, '$'); - break; + goto Ldef; case '#': + case ':': obstack_1grow (&buffer, '\\'); - break; + goto Ldef; default: + Ldef: + slashes = 0; break; } |