feat: boolean type support finally
This commit is contained in:
parent
b9074ebe47
commit
cc6891dde8
@ -505,6 +505,9 @@ namespace dv {
|
|||||||
inline bool isNumber() const noexcept {
|
inline bool isNumber() const noexcept {
|
||||||
return type == value_type::number;
|
return type == value_type::number;
|
||||||
}
|
}
|
||||||
|
inline bool isBoolean() const noexcept {
|
||||||
|
return type == value_type::boolean;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
inline bool is_numeric(const value& val) {
|
inline bool is_numeric(const value& val) {
|
||||||
|
|||||||
@ -39,6 +39,7 @@ class CommandParser : BasicParser {
|
|||||||
{"int", ArgType::integer},
|
{"int", ArgType::integer},
|
||||||
{"str", ArgType::string},
|
{"str", ArgType::string},
|
||||||
{"sel", ArgType::selector},
|
{"sel", ArgType::selector},
|
||||||
|
{"bool", ArgType::boolean},
|
||||||
{"enum", ArgType::enumvalue},
|
{"enum", ArgType::enumvalue},
|
||||||
};
|
};
|
||||||
public:
|
public:
|
||||||
@ -250,6 +251,11 @@ public:
|
|||||||
return selectorCheck(arg, value);
|
return selectorCheck(arg, value);
|
||||||
case ArgType::integer:
|
case ArgType::integer:
|
||||||
return typeCheck(arg, dv::value_type::integer, value, "integer");
|
return typeCheck(arg, dv::value_type::integer, value, "integer");
|
||||||
|
case ArgType::boolean:
|
||||||
|
if (!arg->optional) {
|
||||||
|
throw typeError(arg->name, "boolean", value);
|
||||||
|
}
|
||||||
|
return value.isBoolean();
|
||||||
case ArgType::string:
|
case ArgType::string:
|
||||||
if (!value.isString()) {
|
if (!value.isString()) {
|
||||||
return !arg->optional;
|
return !arg->optional;
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
#include "data/dv.hpp"
|
#include "data/dv.hpp"
|
||||||
|
|
||||||
namespace cmd {
|
namespace cmd {
|
||||||
enum class ArgType { number, integer, enumvalue, selector, string };
|
enum class ArgType { number, integer, enumvalue, selector, boolean, string };
|
||||||
|
|
||||||
inline std::string argtype_name(ArgType type) {
|
inline std::string argtype_name(ArgType type) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
@ -20,6 +20,8 @@ namespace cmd {
|
|||||||
return "enumeration";
|
return "enumeration";
|
||||||
case ArgType::selector:
|
case ArgType::selector:
|
||||||
return "selector";
|
return "selector";
|
||||||
|
case ArgType::boolean:
|
||||||
|
return "boolean";
|
||||||
case ArgType::string:
|
case ArgType::string:
|
||||||
return "string";
|
return "string";
|
||||||
default:
|
default:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user