unsigned len;
};
-static struct ec_parsed *ec_node_str_parse(const struct ec_node *gen_node,
- const struct ec_strvec *strvec)
+static int
+ec_node_str_parse(const struct ec_node *gen_node,
+ struct ec_parsed *state,
+ const struct ec_strvec *strvec)
{
struct ec_node_str *node = (struct ec_node_str *)gen_node;
- struct ec_strvec *match_strvec;
- struct ec_parsed *parsed = NULL;
const char *str;
- parsed = ec_parsed();
- if (parsed == NULL)
- goto fail;
+ (void)state;
if (ec_strvec_len(strvec) == 0)
- return parsed;
+ return EC_PARSED_NOMATCH;
str = ec_strvec_val(strvec, 0);
if (strcmp(str, node->string) != 0)
- return parsed;
-
- match_strvec = ec_strvec_ndup(strvec, 0, 1);
- if (match_strvec == NULL)
- goto fail;
-
- ec_parsed_set_match(parsed, gen_node, match_strvec);
+ return EC_PARSED_NOMATCH;
- return parsed;
-
- fail:
- ec_parsed_free(parsed);
- return NULL;
+ return 1;
}
-static struct ec_completed *ec_node_str_complete(const struct ec_node *gen_node,
- const struct ec_strvec *strvec)
+static int
+ec_node_str_complete(const struct ec_node *gen_node,
+ struct ec_completed *completed,
+ struct ec_parsed *parsed,
+ const struct ec_strvec *strvec)
{
struct ec_node_str *node = (struct ec_node_str *)gen_node;
- struct ec_completed *completed;
- struct ec_completed_elt *completed_elt;
- const char *str, *add;
+ const char *str;
size_t n = 0;
- completed = ec_completed();
- if (completed == NULL)
- return NULL;
+ (void)parsed;
if (ec_strvec_len(strvec) != 1)
- return completed;
+ return 0;
str = ec_strvec_val(strvec, 0);
for (n = 0; n < node->len; n++) {
break;
}
- if (str[n] != '\0')
- add = NULL;
- else
- add = node->string + n;
-
- completed_elt = ec_completed_elt(gen_node, add);
- if (completed_elt == NULL) {
- ec_completed_free(completed);
- return NULL;
+ if (str[n] == '\0') {
+ if (ec_completed_add_match(completed, parsed, gen_node,
+ node->string + n) < 0)
+ return -1;
}
- ec_completed_add_elt(completed, completed_elt);
-
- return completed;
+ return 0;
}
static const char *ec_node_str_desc(const struct ec_node *gen_node)
ec_free(node->string);
}
+static size_t ec_node_str_get_max_parse_len(const struct ec_node *gen_node)
+{
+ (void)gen_node;
+ return 1;
+}
+
static struct ec_node_type ec_node_str_type = {
.name = "str",
.parse = ec_node_str_parse,
.complete = ec_node_str_complete,
+ .get_max_parse_len = ec_node_str_get_max_parse_len,
.desc = ec_node_str_desc,
.size = sizeof(struct ec_node_str),
.free_priv = ec_node_str_free_priv,
return NULL;
}
+/* LCOV_EXCL_START */
static int ec_node_str_testcase(void)
{
struct ec_node *node;
return ret;
}
+/* LCOV_EXCL_STOP */
static struct ec_test ec_node_str_test = {
.name = "node_str",