authorgravatar for mike@windows10mike <mike@windows10> 2022-11-13 13:52:55-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-11-15 22:12:52-05:00
loga93fa29d8f808da58371a58f0a7b8ecd462584b3
tree9d3b88a7413c5e85042d6df6f4dbbfc8ee5aa1e4
parent024bac7f531e75e2428a20aac1a88a883eaa7e8e

zig-cache: support windows drive + fwd-slash paths

closes #13539

1 files changed, 12 insertions(+), 2 deletions(-)

src/DepTokenizer.zig+12-2
...@@ -82,7 +82,7 @@ pub fn next(self: *Tokenizer) ?Token {...@@ -82,7 +82,7 @@ pub fn next(self: *Tokenizer) ?Token {
82 // silently ignore null target82 // silently ignore null target
83 self.state = .lhs;83 self.state = .lhs;
84 },84 },
85 '\\' => {85 '/', '\\' => {
86 self.state = .target_colon_reverse_solidus;86 self.state = .target_colon_reverse_solidus;
87 self.index += 1;87 self.index += 1;
88 },88 },
...@@ -706,7 +706,7 @@ test "windows mixed prereqs" {...@@ -706,7 +706,7 @@ test "windows mixed prereqs" {
706 );706 );
707}707}
708708
709test "funky targets" {709test "windows funky targets" {
710 try depTokenizer(710 try depTokenizer(
711 \\C:\Users\anon\foo.o:711 \\C:\Users\anon\foo.o:
712 \\C:\Users\anon\foo\ .o:712 \\C:\Users\anon\foo\ .o:
...@@ -728,6 +728,16 @@ test "funky targets" {...@@ -728,6 +728,16 @@ test "funky targets" {
728 );728 );
729}729}
730730
731test "windows drive and forward slashes" {
732 try depTokenizer(
733 \\C:/msys64/what/zig-cache\tmp\48ac4d78dd531abd-cxa_thread_atexit.obj: \
734 \\ C:/msys64/opt/zig3/lib/zig/libc/mingw/crt/cxa_thread_atexit.c
735 ,
736 \\target = {C:/msys64/what/zig-cache\tmp\48ac4d78dd531abd-cxa_thread_atexit.obj}
737 \\prereq = {C:/msys64/opt/zig3/lib/zig/libc/mingw/crt/cxa_thread_atexit.c}
738 );
739}
740
731test "error incomplete escape - reverse_solidus" {741test "error incomplete escape - reverse_solidus" {
732 try depTokenizer("\\",742 try depTokenizer("\\",
733 \\ERROR: illegal char '\' at position 0: incomplete escape743 \\ERROR: illegal char '\' at position 0: incomplete escape