Commit 6ba1fdf7e0d8dfc348a163219b3c3215c3644dd6 | zig

author	Isaac Freund <mail@isaacfreund.com> 2020-10-13 20:17:30+02:00
committer	Isaac Freund <mail@isaacfreund.com> 2020-10-13 20:17:30+02:00
log	6ba1fdf7e0d8dfc348a163219b3c3215c3644dd6
tree	a8e5d328bc8f1dc3f47f8d84fc16ce1582ed673c
parent	f01c3150c19fa3d6c605cc1940f70cce303c5997
signature	Commit is signed but in an unrecognized format.

stage2: use meta.stringToEnum for Color parsing

This requires renaming the variants to be snake_case, which is the new
recommended style anyways.

2 files changed, 15 insertions(+), 27 deletions(-)

src
- Compilation.zig
- main.zig

src/Compilation.zig+3-3

src/main.zig+12-24

 @@ -28,9 +28,9 @@ pub fn fatal(comptime format: []const u8, args: anytype) noreturn {
 pub const max_src_size = 2 * 1024 * 1024 * 1024; // 2 GiB
 pub const Color = enum {
-    Auto,
+    auto,
-    Off,
+    off,
-    On,
+    on,
 };
 const usage =
 @@ -380,7 +380,7 @@ fn buildOutputType(
         run,
     },
 ) !void {
-    var color: Color = .Auto;
+    var color: Color = .auto;
     var optimize_mode: std.builtin.Mode = .Debug;
     var provided_name: ?[]const u8 = null;
     var link_mode: ?std.builtin.LinkMode = null;
 @@ -585,15 +585,9 @@ fn buildOutputType(
                         }
                         i += 1;
                         const next_arg = args[i];
-                        if (mem.eql(u8, next_arg, "auto")) {
+                        color = std.meta.stringToEnum(Color, next_arg) orelse {
-                            color = .Auto;
-                        } else if (mem.eql(u8, next_arg, "on")) {
-                            color = .On;
-                        } else if (mem.eql(u8, next_arg, "off")) {
-                            color = .Off;
-                        } else {
                             fatal("expected [auto|on|off] after --color, found '{}'", .{next_arg});
-                        }
+                        };
                     } else if (mem.eql(u8, arg, "--subsystem")) {
                         if (i + 1 >= args.len) fatal("expected parameter after {}", .{arg});
                         i += 1;
 @@ -2374,7 +2368,7 @@ const Fmt = struct {
 pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
     const stderr_file = io.getStdErr();
-    var color: Color = .Auto;
+    var color: Color = .auto;
     var stdin_flag: bool = false;
     var check_flag: bool = false;
     var input_files = ArrayList([]const u8).init(gpa);
 @@ -2394,15 +2388,9 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
                     }
                     i += 1;
                     const next_arg = args[i];
-                    if (mem.eql(u8, next_arg, "auto")) {
+                    color = std.meta.stringToEnum(Color, next_arg) orelse {
-                        color = .Auto;
-                    } else if (mem.eql(u8, next_arg, "on")) {
-                        color = .On;
-                    } else if (mem.eql(u8, next_arg, "off")) {
-                        color = .Off;
-                    } else {
                         fatal("expected [auto|on|off] after --color, found '{}'", .{next_arg});
-                    }
+                    };
                 } else if (mem.eql(u8, arg, "--stdin")) {
                     stdin_flag = true;
                 } else if (mem.eql(u8, arg, "--check")) {
 @@ -2626,9 +2614,9 @@ fn printErrMsgToFile(
     color: Color,
 ) !void {
     const color_on = switch (color) {
-        .Auto => file.isTty(),
+        .auto => file.isTty(),
-        .On => true,
+        .on => true,
-        .Off => false,
+        .off => false,
     };
     const lok_token = parse_error.loc();
     const span_first = lok_token;

...	@@ -103,7 +103,7 @@ owned_link_dir: ?std.fs.Dir,	...	@@ -103,7 +103,7 @@ owned_link_dir: ?std.fs.Dir,
103		103
104	/// This is for stage1 and should be deleted upon completion of self-hosting.	104	/// This is for stage1 and should be deleted upon completion of self-hosting.
105	/// Don't use this for anything other than stage1 compatibility.	105	/// Don't use this for anything other than stage1 compatibility.
106	color: @import("main.zig").Color = .Auto,	106	color: @import("main.zig").Color = .auto,
107		107
108	test_filter: ?[]const u8,	108	test_filter: ?[]const u8,
109	test_name_prefix: ?[]const u8,	109	test_name_prefix: ?[]const u8,
...	@@ -385,7 +385,7 @@ pub const InitOptions = struct {	...	@@ -385,7 +385,7 @@ pub const InitOptions = struct {
385	machine_code_model: std.builtin.CodeModel = .default,	385	machine_code_model: std.builtin.CodeModel = .default,
386	clang_preprocessor_mode: ClangPreprocessorMode = .no,	386	clang_preprocessor_mode: ClangPreprocessorMode = .no,
387	/// This is for stage1 and should be deleted upon completion of self-hosting.	387	/// This is for stage1 and should be deleted upon completion of self-hosting.
388	color: @import("main.zig").Color = .Auto,	388	color: @import("main.zig").Color = .auto,
389	test_filter: ?[]const u8 = null,	389	test_filter: ?[]const u8 = null,
390	test_name_prefix: ?[]const u8 = null,	390	test_name_prefix: ?[]const u8 = null,
391	subsystem: ?std.Target.SubSystem = null,	391	subsystem: ?std.Target.SubSystem = null,
...	@@ -1179,7 +1179,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor	...	@@ -1179,7 +1179,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
1179	var progress: std.Progress = .{};	1179	var progress: std.Progress = .{};
1180	var main_progress_node = try progress.start("", null);	1180	var main_progress_node = try progress.start("", null);
1181	defer main_progress_node.end();	1181	defer main_progress_node.end();
1182	if (self.color == .Off) progress.terminal = null;	1182	if (self.color == .off) progress.terminal = null;
1183		1183
1184	var c_comp_progress_node = main_progress_node.start("Compile C Objects", self.c_source_files.len);	1184	var c_comp_progress_node = main_progress_node.start("Compile C Objects", self.c_source_files.len);
1185	defer c_comp_progress_node.end();	1185	defer c_comp_progress_node.end();