Adds fixes for Windows support

Author: Felix "xq" Queißner

.envrc

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest, macos-latest, windows-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/validate.yml

@@ -157,7 +157,7 @@ const ContentWriter = struct {
                     @tagName(data.format),
                 });
                 if (data.label) |label| {
-                    try cw.code.print("  label \"{}\"\n", .{
+                    try cw.code.print("  label {}\n", .{
                         fmtPath(label),
                     });
                 }
@@ -172,16 +172,16 @@ const ContentWriter = struct {
     fn renderFileSystemTree(cw: ContentWriter, fs: FileSystem) !void {
         for (fs.items) |item| {
             switch (item) {
-                .empty_dir => |dir| try cw.code.print("mkdir \"{}\"\n", .{
+                .empty_dir => |dir| try cw.code.print("mkdir {}\n", .{
                     fmtPath(dir),
                 }),
 
-                .copy_dir => |copy| try cw.code.print("copy-dir \"{}\" {}\n", .{
+                .copy_dir => |copy| try cw.code.print("copy-dir {} {}\n", .{
                     fmtPath(copy.destination),
                     cw.fmtLazyPath(copy.source, .directory),
                 }),
 
-                .copy_file => |copy| try cw.code.print("copy-file \"{}\" {}\n", .{
+                .copy_file => |copy| try cw.code.print("copy-file {} {}\n", .{
                     fmtPath(copy.destination),
                     cw.fmtLazyPath(copy.source, .file),
                 }),
@@ -226,7 +226,7 @@ const ContentWriter = struct {
 
                 std.debug.assert(std.fs.path.isAbsolute(full_path));
 
-                try writer.print("\"{}\"", .{
+                try writer.print("{}", .{
                     fmtPath(full_path),
                 });
             },
@@ -271,9 +271,17 @@ const ContentWriter = struct {
         if (is_safe_word) {
             try writer.writeAll(path);
         } else {
-            try writer.print("\"{}\"", .{
-                std.fmt.fmtSliceEscapeLower(path),
-            });
+            try writer.writeAll("\"");
+
+            for (path) |c| {
+                if (c == '\\') {
+                    try writer.writeAll("/");
+                } else {
+                    try writer.print("{}", .{std.zig.fmtEscapes(&[_]u8{c})});
+                }
+            }
+
+            try writer.writeAll("\"");
         }
     }
 };

src/BuildInterface.zig

@@ -17,6 +17,7 @@ pub const Error = Tokenizer.Error || error{
     ExpectedIncludePath,
     UnknownDirective,
     OutOfMemory,
+    InvalidEscapeSequence,
 };
 
 pub const IO = struct {
@@ -197,11 +198,55 @@ fn resolve_value(parser: *Parser, token_type: TokenType, text: []const u8) ![]co
         ),
 
         .string => {
-            for (text) |c| {
+            const content_slice = text[1 .. text.len - 1];
+
+            const has_includes = for (content_slice) |c| {
                 if (c == '\\')
-                    @panic("strings escapes not supported yet!");
+                    break true;
+            } else false;
+
+            if (!has_includes)
+                return content_slice;
+
+            var unescaped: std.ArrayList(u8) = .init(parser.arena.allocator());
+            defer unescaped.deinit();
+
+            try unescaped.ensureTotalCapacityPrecise(content_slice.len);
+
+            {
+                var i: usize = 0;
+                while (i < content_slice.len) {
+                    const c = content_slice[i];
+                    i += 1;
+
+                    if (c != '\\') {
+                        try unescaped.append(c);
+                        continue;
+                    }
+
+                    if (i == content_slice.len)
+                        return error.InvalidEscapeSequence;
+
+                    const esc_code = content_slice[i];
+                    i += 1;
+
+                    errdefer std.log.err("invalid escape sequence: \\{s}", .{[_]u8{esc_code}});
+
+                    switch (esc_code) {
+                        'r' => try unescaped.append('\r'),
+                        'n' => try unescaped.append('\n'),
+                        't' => try unescaped.append('\t'),
+                        '\\' => try unescaped.append('\\'),
+                        '\"' => try unescaped.append('\"'),
+                        '\'' => try unescaped.append('\''),
+                        'e' => try unescaped.append('\x1B'),
+
+                        else => return error.InvalidEscapeSequence,
+                    }
+                }
             }
-            return text[1 .. text.len - 1];
+
+            return try unescaped.toOwnedSlice();
         },
 
         .comment, .directive, .whitespace => unreachable,

src/Parser.zig

@@ -180,7 +180,10 @@ pub fn main() !u8 {
 pub fn declare_file_dependency(path: []const u8) !void {
     const deps_file = global_deps_file orelse return;
 
-    const stat = try std.fs.cwd().statFile(path);
+    const stat = std.fs.cwd().statFile(path) catch |err| switch (err) {
+        error.IsDir => return,
+        else => |e| return e,
+    };
     if (stat.kind != .directory) {
         try deps_file.writeAll(" \\\n    ");
         try deps_file.writeAll(path);
@@ -549,8 +552,8 @@ pub const FileName = struct {
         const realpath = name.root_dir.realpath(
             name.rel_path,
             &buffer,
-        ) catch @panic("failed to determine real path for dependency file!");
-        declare_file_dependency(realpath) catch @panic("Failed to write to deps file!");
+        ) catch |e| std.debug.panic("failed to determine real path for dependency file: {s}", .{@errorName(e)});
+        declare_file_dependency(realpath) catch |e| std.debug.panic("Failed to write to deps file: {s}", .{@errorName(e)});
     }
 
     pub const GetSizeError = error{ FileNotFound, InvalidPath, IoError };