update clap, fix logs of optional types (#48)
* update clap, fix logs of optional types * rename empty testwch-ch32v003
parent
242b9300b6
commit
c87a7422fc
@ -1,6 +1,6 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2021 Jimmi Holst Christensen
|
||||
Copyright (c) 2022 Jimmi Holst Christensen
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
@ -0,0 +1,85 @@
|
||||
const std = @import("std");
|
||||
|
||||
const fmt = std.fmt;
|
||||
const testing = std.testing;
|
||||
|
||||
pub const default = .{
|
||||
.string = string,
|
||||
.str = string,
|
||||
.u8 = int(u8, 0),
|
||||
.u16 = int(u16, 0),
|
||||
.u32 = int(u32, 0),
|
||||
.u64 = int(u64, 0),
|
||||
.usize = int(usize, 0),
|
||||
.i8 = int(i8, 0),
|
||||
.i16 = int(i16, 0),
|
||||
.i32 = int(i32, 0),
|
||||
.i64 = int(i64, 0),
|
||||
.isize = int(isize, 0),
|
||||
.f32 = float(f32),
|
||||
.f64 = float(f64),
|
||||
};
|
||||
|
||||
pub fn string(in: []const u8) error{}![]const u8 {
|
||||
return in;
|
||||
}
|
||||
|
||||
test "string" {
|
||||
try testing.expectEqualStrings("aa", try string("aa"));
|
||||
}
|
||||
|
||||
pub fn int(comptime T: type, comptime radix: u8) fn ([]const u8) fmt.ParseIntError!T {
|
||||
return struct {
|
||||
fn parse(in: []const u8) fmt.ParseIntError!T {
|
||||
return fmt.parseInt(T, in, radix);
|
||||
}
|
||||
}.parse;
|
||||
}
|
||||
|
||||
test "int" {
|
||||
try testing.expectEqual(@as(u8, 0), try int(u8, 10)("0"));
|
||||
try testing.expectEqual(@as(u8, 1), try int(u8, 10)("1"));
|
||||
try testing.expectEqual(@as(u8, 10), try int(u8, 10)("10"));
|
||||
try testing.expectEqual(@as(u8, 0x10), try int(u8, 0)("0x10"));
|
||||
try testing.expectEqual(@as(u8, 0b10), try int(u8, 0)("0b10"));
|
||||
}
|
||||
|
||||
pub fn float(comptime T: type) fn ([]const u8) fmt.ParseFloatError!T {
|
||||
return struct {
|
||||
fn parse(in: []const u8) fmt.ParseFloatError!T {
|
||||
return fmt.parseFloat(T, in);
|
||||
}
|
||||
}.parse;
|
||||
}
|
||||
|
||||
test "float" {
|
||||
try testing.expectEqual(@as(f32, 0), try float(f32)("0"));
|
||||
}
|
||||
|
||||
pub const EnumError = error{
|
||||
NameNotPartOfEnum,
|
||||
};
|
||||
|
||||
pub fn enumeration(comptime T: type) fn ([]const u8) EnumError!T {
|
||||
return struct {
|
||||
fn parse(in: []const u8) EnumError!T {
|
||||
return std.meta.stringToEnum(T, in) orelse error.NameNotPartOfEnum;
|
||||
}
|
||||
}.parse;
|
||||
}
|
||||
|
||||
test "enumeration" {
|
||||
const E = enum { a, b, c };
|
||||
try testing.expectEqual(E.a, try enumeration(E)("a"));
|
||||
try testing.expectEqual(E.b, try enumeration(E)("b"));
|
||||
try testing.expectEqual(E.c, try enumeration(E)("c"));
|
||||
try testing.expectError(EnumError.NameNotPartOfEnum, enumeration(E)("d"));
|
||||
}
|
||||
|
||||
fn ReturnType(comptime P: type) type {
|
||||
return @typeInfo(P).Fn.return_type.?;
|
||||
}
|
||||
|
||||
pub fn Result(comptime P: type) type {
|
||||
return @typeInfo(ReturnType(P)).ErrorUnion.payload;
|
||||
}
|
@ -1,48 +0,0 @@
|
||||
const std = @import("std");
|
||||
|
||||
const fmt = std.fmt;
|
||||
|
||||
pub const default = .{
|
||||
.string = string,
|
||||
.str = string,
|
||||
.u8 = int(u8, 0),
|
||||
.u16 = int(u16, 0),
|
||||
.u32 = int(u32, 0),
|
||||
.u64 = int(u64, 0),
|
||||
.usize = int(usize, 0),
|
||||
.i8 = int(i8, 0),
|
||||
.i16 = int(i16, 0),
|
||||
.i32 = int(i32, 0),
|
||||
.i64 = int(i64, 0),
|
||||
.isize = int(isize, 0),
|
||||
.f32 = float(f32),
|
||||
.f64 = float(f64),
|
||||
};
|
||||
|
||||
pub fn string(in: []const u8) error{}![]const u8 {
|
||||
return in;
|
||||
}
|
||||
|
||||
pub fn int(comptime T: type, comptime radix: u8) fn ([]const u8) fmt.ParseIntError!T {
|
||||
return struct {
|
||||
fn parse(in: []const u8) fmt.ParseIntError!T {
|
||||
return fmt.parseInt(T, in, radix);
|
||||
}
|
||||
}.parse;
|
||||
}
|
||||
|
||||
pub fn float(comptime T: type) fn ([]const u8) fmt.ParseFloatError!T {
|
||||
return struct {
|
||||
fn parse(in: []const u8) fmt.ParseFloatError!T {
|
||||
return fmt.parseFloat(T, in);
|
||||
}
|
||||
}.parse;
|
||||
}
|
||||
|
||||
fn ReturnType(comptime P: type) type {
|
||||
return @typeInfo(P).Fn.return_type.?;
|
||||
}
|
||||
|
||||
pub fn Result(comptime P: type) type {
|
||||
return @typeInfo(ReturnType(P)).ErrorUnion.payload;
|
||||
}
|
@ -1,2 +1,2 @@
|
||||
git https://github.com/Hejsil/zig-clap.git master clap.zig 996821a3e1f186c9e5cdfd971d742c9815ea590e
|
||||
git https://github.com/mitchellh/zig-libxml2.git db7805026143d753a1deb84c23580d8050471223 libxml2.zig db7805026143d753a1deb84c23580d8050471223
|
||||
git https://github.com/Hejsil/zig-clap.git master clap.zig 1c09e0dc31918dd716b1032ad3e1d1c080cbbff1
|
||||
|
@ -1,4 +1,4 @@
|
||||
test "" {
|
||||
test "all" {
|
||||
_ = @import("svd.zig");
|
||||
_ = @import("atdf.zig");
|
||||
}
|
||||
|
Loading…
Reference in New Issue