Merge branch 'caleberi-add-support-for-yaml-bool'

Author: kubkon

src/yaml.zig

@@ -13,6 +13,8 @@ pub const parse = @import("parse.zig");
 const Node = parse.Node;
 const Tree = parse.Tree;
 const ParseError = parse.ParseError;
+const supportedTruthyBooleanValue: [4][]const u8 = .{ "y", "yes", "on", "true" };
+const supportedFalsyBooleanValue: [4][]const u8 = .{ "n", "no", "off", "false" };
 
 pub const YamlError = error{
     UnexpectedNodeType,
@@ -28,6 +30,7 @@ pub const Value = union(enum) {
     empty,
     int: i64,
     float: f64,
+    boolean: bool,
     string: []const u8,
     list: List,
     map: Map,
@@ -47,6 +50,11 @@ pub const Value = union(enum) {
         return self.string;
     }
 
+    pub fn asBool(self: Value) !bool {
+        if (self != .boolean) return error.TypeMismatch;
+        return self.boolean;
+    }
+
     pub fn asList(self: Value) !List {
         if (self != .list) return error.TypeMismatch;
         return self.list;
@@ -68,6 +76,7 @@ pub const Value = union(enum) {
             .int => |int| return writer.print("{}", .{int}),
             .float => |float| return writer.print("{d}", .{float}),
             .string => |string| return writer.print("{s}", .{string}),
+            .boolean => |bool_val| return writer.print("{}", .{bool_val}),
             .list => |list| {
                 const len = list.len;
                 if (len == 0) return;
@@ -190,6 +199,21 @@ pub const Value = union(enum) {
                 return Value{ .float = float };
             }
 
+            if (raw.len <= 5 and raw.len > 0) {
+                const lower_raw = try std.ascii.allocLowerString(arena, raw);
+                for (supportedTruthyBooleanValue) |v| {
+                    if (std.mem.eql(u8, v, lower_raw)) {
+                        return Value{ .boolean = true };
+                    }
+                }
+
+                for (supportedFalsyBooleanValue) |v| {
+                    if (std.mem.eql(u8, v, lower_raw)) {
+                        return Value{ .boolean = false };
+                    }
+                }
+            }
+
             return Value{ .string = try arena.dupe(u8, value.string_value.items) };
         } else {
             log.debug("Unexpected node type: {}", .{node.tag});
@@ -370,6 +394,7 @@ pub const Yaml = struct {
     fn parseValue(self: *Yaml, comptime T: type, value: Value) Error!T {
         return switch (@typeInfo(T)) {
             .int => math.cast(T, try value.asInt()) orelse return error.Overflow,
+            .bool => self.parseBoolean(bool, value),
             .float => if (value.asFloat()) |float| {
                 return math.lossyCast(T, float);
             } else |_| {
@@ -389,6 +414,11 @@ pub const Yaml = struct {
         };
     }
 
+    fn parseBoolean(self: *Yaml, comptime T: type, value: Value) Error!T {
+        _ = self;
+        return value.asBool();
+    }
+
     fn parseUnion(self: *Yaml, comptime T: type, value: Value) Error!T {
         const union_info = @typeInfo(T).@"union";
 

test/simple.yaml

@@ -3,9 +3,12 @@ numbers:
   - 10
   - -8
   - 6
+isyaml: false
+hasBoolean: NO
 nested:
   some: one
   wick: john doe
+  ok: TRUE
 finally: [ 8.17,
            19.78      , 17 ,
            21 ]

test/test.zig

@@ -24,8 +24,11 @@ test "simple" {
         nested: struct {
             some: []const u8,
             wick: []const u8,
+            ok: bool,
         },
         finally: [4]f16,
+        isyaml: bool,
+        hasBoolean: bool,
 
         pub fn eql(self: @This(), other: @This()) bool {
             if (self.names.len != other.names.len) return false;
@@ -61,7 +64,10 @@ test "simple" {
         .nested = .{
             .some = "one",
             .wick = "john doe",
+            .ok = true,
         },
+        .isyaml = false,
+        .hasBoolean = false,
         .finally = [_]f16{ 8.17, 19.78, 17, 21 },
     };
     try testing.expect(result.eql(expected));