EC_LOG_TYPE_REGISTER(node_int);
-struct ec_node_int {
+/* common to int and uint */
+struct ec_node_int_uint {
struct ec_node gen;
+ bool is_signed;
bool check_min;
- long long int min;
bool check_max;
- long long int max;
+ union {
+ int64_t min;
+ uint64_t umin;
+ };
+ union {
+ int64_t max;
+ uint64_t umax;
+ };
unsigned int base;
};
-static int parse_llint(struct ec_node_int *node, const char *str,
- long long *val)
+static int parse_llint(struct ec_node_int_uint *node, const char *str,
+ int64_t *val)
{
char *endptr;
errno = 0;
*val = strtoll(str, &endptr, node->base);
- /* out of range */
- if ((errno == ERANGE && (*val == LLONG_MAX || *val == LLONG_MIN)) ||
- (errno != 0 && *val == 0))
+ if (errno == ERANGE && (*val == LLONG_MAX || *val == LLONG_MIN))
+ return -1;
+
+ if (errno != 0 && *val == 0)
return -1;
if (node->check_min && *val < node->min)
return 0;
}
-static int ec_node_int_parse(const struct ec_node *gen_node,
+static int parse_ullint(struct ec_node_int_uint *node, const char *str,
+ uint64_t *val)
+{
+ char *endptr;
+
+ /* since a negative input is silently converted to a positive
+ * one by strtoull(), first check that it is positive */
+ if (strchr(str, '-'))
+ return -1;
+
+ errno = 0;
+ *val = strtoull(str, &endptr, node->base);
+
+ if (errno == ERANGE && *val == ULLONG_MAX)
+ return -1;
+
+ if (errno != 0 && *val == 0)
+ return -1;
+
+ if (node->check_min && *val < node->umin)
+ return -1;
+
+ if (node->check_max && *val > node->umax)
+ return -1;
+
+ if (*endptr != 0)
+ return -1;
+
+ return 0;
+}
+
+static int ec_node_int_uint_parse(const struct ec_node *gen_node,
struct ec_parsed *state,
const struct ec_strvec *strvec)
{
- struct ec_node_int *node = (struct ec_node_int *)gen_node;
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
const char *str;
- long long val;
+ int64_t val;
(void)state;
return 1;
}
-static size_t ec_node_int_get_max_parse_len(const struct ec_node *gen_node)
+static size_t ec_node_int_uint_get_max_parse_len(const struct ec_node *gen_node)
{
(void)gen_node;
return 1;
}
+static int
+ec_node_uint_init_priv(struct ec_node *gen_node)
+{
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
+
+ node->is_signed = true;
+
+ return 0;
+}
+
static struct ec_node_type ec_node_int_type = {
.name = "int",
- .parse = ec_node_int_parse,
+ .parse = ec_node_int_uint_parse,
.complete = ec_node_default_complete,
- .get_max_parse_len = ec_node_int_get_max_parse_len,
- .size = sizeof(struct ec_node_int),
+ .get_max_parse_len = ec_node_int_uint_get_max_parse_len,
+ .size = sizeof(struct ec_node_int_uint),
+ .init_priv = ec_node_uint_init_priv,
};
EC_NODE_TYPE_REGISTER(ec_node_int_type);
-struct ec_node *ec_node_int(const char *id, long long int min,
- long long int max, unsigned int base)
+struct ec_node *ec_node_int(const char *id, int64_t min,
+ int64_t max, unsigned int base)
{
struct ec_node *gen_node = NULL;
- struct ec_node_int *node = NULL;
gen_node = __ec_node(&ec_node_int_type, id);
if (gen_node == NULL)
return NULL;
- node = (struct ec_node_int *)gen_node;
+
+ if (ec_node_int_set_limits(gen_node, min, max) < 0)
+ goto fail;
+ if (ec_node_int_set_base(gen_node, base) < 0)
+ goto fail;
+
+ return gen_node;
+
+fail:
+ ec_node_free(gen_node);
+ return NULL;
+}
+
+static struct ec_node_type ec_node_uint_type = {
+ .name = "uint",
+ .parse = ec_node_int_uint_parse,
+ .complete = ec_node_default_complete,
+ .get_max_parse_len = ec_node_int_uint_get_max_parse_len,
+ .size = sizeof(struct ec_node_int_uint),
+};
+
+EC_NODE_TYPE_REGISTER(ec_node_uint_type);
+
+struct ec_node *ec_node_uint(const char *id, uint64_t min,
+ uint64_t max, unsigned int base)
+{
+ struct ec_node *gen_node = NULL;
+
+ gen_node = __ec_node(&ec_node_uint_type, id);
+ if (gen_node == NULL)
+ return NULL;
+
+ if (ec_node_uint_set_limits(gen_node, min, max) < 0)
+ goto fail;
+ if (ec_node_uint_set_base(gen_node, base) < 0)
+ goto fail;
+
+ return gen_node;
+
+fail:
+ ec_node_free(gen_node);
+ return NULL;
+}
+
+int ec_node_int_disable_limits(struct ec_node *gen_node)
+{
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
+ int ret;
+
+ ret = ec_node_check_type(gen_node, &ec_node_int_type);
+ if (ret < 0)
+ return ret;
+
+ node->check_min = false;
+ node->check_max = false;
+
+ return 0;
+}
+
+int ec_node_int_set_limits(struct ec_node *gen_node, int64_t min,
+ int64_t max)
+{
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
+ int ret;
+
+ ret = ec_node_check_type(gen_node, &ec_node_int_type);
+ if (ret < 0)
+ return ret;
+
+ if (min > max) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ node->check_min = true;
+ node->min = min;
+ node->check_max = true;
+ node->max = max;
+
+ return 0;
+}
+
+int ec_node_int_set_base(struct ec_node *gen_node, unsigned int base)
+{
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
+ int ret;
+
+ ret = ec_node_check_type(gen_node, &ec_node_int_type);
+ if (ret < 0)
+ return ret;
+
+ node->base = base;
+
+ return 0;
+
+}
+
+int ec_node_uint_disable_limits(struct ec_node *gen_node)
+{
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
+ int ret;
+
+ ret = ec_node_check_type(gen_node, &ec_node_uint_type);
+ if (ret < 0)
+ return ret;
+
+ node->check_min = false;
+ node->check_max = false;
+
+ return 0;
+}
+
+int ec_node_uint_set_limits(struct ec_node *gen_node, uint64_t min,
+ uint64_t max)
+{
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
+ int ret;
+
+ ret = ec_node_check_type(gen_node, &ec_node_uint_type);
+ if (ret < 0)
+ return ret;
+
+ if (min > max) {
+ errno = EINVAL;
+ return -1;
+ }
node->check_min = true;
node->min = min;
node->check_max = true;
node->max = max;
+
+ return 0;
+}
+
+int ec_node_uint_set_base(struct ec_node *gen_node, unsigned int base)
+{
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
+ int ret;
+
+ ret = ec_node_check_type(gen_node, &ec_node_uint_type);
+ if (ret < 0)
+ return ret;
+
node->base = base;
- return &node->gen;
+ return 0;
}
-long long ec_node_int_getval(struct ec_node *gen_node, const char *str)
+int ec_node_int_getval(const struct ec_node *gen_node, const char *str,
+ int64_t *result)
{
- struct ec_node_int *node = (struct ec_node_int *)gen_node;
- long long val = 0;
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
+ int ret;
- // XXX check type here
- // if gen_node->type != int fail
+ ret = ec_node_check_type(gen_node, &ec_node_int_type);
+ if (ret < 0)
+ return ret;
- parse_llint(node, str, &val);
+ if (parse_llint(node, str, result) < 0)
+ return -1;
+
+ return 0;
+}
- return val;
+int ec_node_uint_getval(const struct ec_node *gen_node, const char *str,
+ uint64_t *result)
+{
+ struct ec_node_int_uint *node = (struct ec_node_int_uint *)gen_node;
+ int ret;
+
+ ret = ec_node_check_type(gen_node, &ec_node_uint_type);
+ if (ret < 0)
+ return ret;
+
+ if (parse_ullint(node, str, result) < 0)
+ return -1;
+
+ return 0;
}
/* LCOV_EXCL_START */
struct ec_node *node;
const char *s;
int ret = 0;
+ uint64_t u64;
+ int64_t i64;
- node = ec_node_int(NULL, 0, 256, 0);
+ node = ec_node_uint(EC_NO_ID, 0, 256, 0);
if (node == NULL) {
EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;
p = ec_node_parse(node, "0");
s = ec_strvec_val(ec_parsed_strvec(p), 0);
- EC_TEST_ASSERT(s != NULL && ec_node_int_getval(node, s) == 0);
+ EC_TEST_ASSERT(s != NULL &&
+ ec_node_int_getval(node, s, &i64) == 0 &&
+ i64 == 0);
ec_parsed_free(p);
p = ec_node_parse(node, "10");
s = ec_strvec_val(ec_parsed_strvec(p), 0);
- EC_TEST_ASSERT(s != NULL && ec_node_int_getval(node, s) == 10);
+ EC_TEST_ASSERT(s != NULL &&
+ ec_node_uint_getval(node, s, &u64) == 0 &&
+ u64 == 10);
ec_parsed_free(p);
ec_node_free(node);
- node = ec_node_int(NULL, -1, LLONG_MAX, 16);
+ node = ec_node_int(EC_NO_ID, -1, LLONG_MAX, 16);
if (node == NULL) {
EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;
p = ec_node_parse(node, "10");
s = ec_strvec_val(ec_parsed_strvec(p), 0);
- EC_TEST_ASSERT(s != NULL && ec_node_int_getval(node, s) == 16);
+ EC_TEST_ASSERT(s != NULL &&
+ ec_node_int_getval(node, s, &i64) == 0 &&
+ i64 == 16);
ec_parsed_free(p);
ec_node_free(node);
- node = ec_node_int(NULL, LLONG_MIN, 0, 10);
+ node = ec_node_int(EC_NO_ID, LLONG_MIN, 0, 10);
if (node == NULL) {
EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;
ec_node_free(node);
/* test completion */
- node = ec_node_int(NULL, 0, 10, 0);
+ node = ec_node_int(EC_NO_ID, 0, 10, 0);
if (node == NULL) {
EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;
git.droids-corp.org / protos / libecoli.git / blobdiff