From 597699243a6f935231ad83e63d22bf6ff9e4e547 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 1 Oct 2025 13:40:29 -0400 Subject: For structs and fixed-size ints, use `.has_value` instead of `.is_none` --- src/stdlib/cli.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/stdlib/cli.c') diff --git a/src/stdlib/cli.c b/src/stdlib/cli.c index 1e4324f9..d5bb0ea2 100644 --- a/src/stdlib/cli.c +++ b/src/stdlib/cli.c @@ -45,24 +45,24 @@ static bool parse_single_arg(const TypeInfo_t *info, char *arg, void *dest) { return parsed.small != 0; } else if (info == &Int64$info) { OptionalInt64_t parsed = Int64$parse(Text$from_str(arg), NULL); - if (!parsed.is_none) *(OptionalInt64_t *)dest = parsed; - return !parsed.is_none; + if (parsed.has_value) *(OptionalInt64_t *)dest = parsed; + return parsed.has_value; } else if (info == &Int32$info) { OptionalInt32_t parsed = Int32$parse(Text$from_str(arg), NULL); - if (!parsed.is_none) *(OptionalInt32_t *)dest = parsed; - return !parsed.is_none; + if (parsed.has_value) *(OptionalInt32_t *)dest = parsed; + return parsed.has_value; } else if (info == &Int16$info) { OptionalInt16_t parsed = Int16$parse(Text$from_str(arg), NULL); - if (!parsed.is_none) *(OptionalInt16_t *)dest = parsed; - return !parsed.is_none; + if (parsed.has_value) *(OptionalInt16_t *)dest = parsed; + return parsed.has_value; } else if (info == &Int8$info) { OptionalInt8_t parsed = Int8$parse(Text$from_str(arg), NULL); - if (!parsed.is_none) *(OptionalInt8_t *)dest = parsed; - return !parsed.is_none; + if (parsed.has_value) *(OptionalInt8_t *)dest = parsed; + return parsed.has_value; } else if (info == &Byte$info) { OptionalByte_t parsed = Byte$parse(Text$from_str(arg), NULL); - if (!parsed.is_none) *(OptionalByte_t *)dest = parsed; - return !parsed.is_none; + if (parsed.has_value) *(OptionalByte_t *)dest = parsed; + return parsed.has_value; } else if (info == &Bool$info) { OptionalBool_t parsed = Bool$parse(Text$from_str(arg), NULL); if (parsed != NONE_BOOL) *(OptionalBool_t *)dest = parsed; -- cgit v1.2.3