#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include <assert.h>
#include <stdarg.h>
#include <ecoli_completed.h>
#include <ecoli_node_str.h>
#include <ecoli_node_option.h>
+#include <ecoli_node_or.h>
+#include <ecoli_node_many.h>
#include <ecoli_node_seq.h>
struct ec_node_seq {
struct ec_node gen;
struct ec_node **table;
- unsigned int len;
+ size_t len;
};
static int
return ret;
}
-static struct ec_completed *
+static int
__ec_node_seq_complete(struct ec_node **table, size_t table_len,
- struct ec_parsed *state, const struct ec_strvec *strvec)
+ struct ec_completed *completed,
+ struct ec_parsed *parsed,
+ const struct ec_strvec *strvec)
{
- struct ec_completed *completed, *child_completed;
struct ec_strvec *childvec = NULL;
unsigned int i;
int ret;
- completed = ec_completed();
- if (completed == NULL)
- return NULL;
-
if (table_len == 0)
- return completed;
+ return 0;
/*
* Example of completion for a sequence node = [n1,n2] and an
*/
/* first, try to complete with the first node of the table */
- child_completed = ec_node_complete_child(table[0], state, strvec);
- if (child_completed == NULL)
+ ret = ec_node_complete_child(table[0], completed, parsed, strvec);
+ if (ret < 0)
goto fail;
- ec_completed_merge(completed, child_completed);
- child_completed = NULL;
-
/* then, if the first node of the table matches the beginning of the
* strvec, try to complete the rest */
for (i = 0; i < ec_strvec_len(strvec); i++) {
if (childvec == NULL)
goto fail;
- ret = ec_node_parse_child(table[0], state, childvec);
+ ret = ec_node_parse_child(table[0], parsed, childvec);
if (ret < 0 && ret != EC_PARSED_NOMATCH)
goto fail;
if ((unsigned int)ret != i) {
if (ret != EC_PARSED_NOMATCH)
- ec_parsed_del_last_child(state);
+ ec_parsed_del_last_child(parsed);
continue;
}
childvec = ec_strvec_ndup(strvec, i, ec_strvec_len(strvec) - i);
if (childvec == NULL) {
- ec_parsed_del_last_child(state);
+ ec_parsed_del_last_child(parsed);
goto fail;
}
- child_completed = __ec_node_seq_complete(&table[1],
- table_len - 1,
- state, childvec);
- ec_parsed_del_last_child(state);
+ ret = __ec_node_seq_complete(&table[1],
+ table_len - 1,
+ completed, parsed, childvec);
+ ec_parsed_del_last_child(parsed);
ec_strvec_free(childvec);
childvec = NULL;
- if (child_completed == NULL)
+ if (ret < 0)
goto fail;
-
- ec_completed_merge(completed, child_completed);
- child_completed = NULL;
}
- return completed;
+ return 0;
fail:
ec_strvec_free(childvec);
- ec_completed_free(child_completed);
- ec_completed_free(completed);
- return NULL;
+ return -1;
}
-static struct ec_completed *
+static int
ec_node_seq_complete(const struct ec_node *gen_node,
- struct ec_parsed *state,
+ struct ec_completed *completed,
+ struct ec_parsed *parsed,
const struct ec_strvec *strvec)
{
struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
- return __ec_node_seq_complete(node->table, node->len, state, strvec);
+ return __ec_node_seq_complete(node->table, node->len, completed,
+ parsed, strvec);
+}
+
+static size_t ec_node_seq_get_max_parse_len(const struct ec_node *gen_node)
+{
+ struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
+ size_t i, len, ret = 0;
+
+ for (i = 0; i < node->len; i++) {
+ len = ec_node_get_max_parse_len(node->table[i]);
+ if (len <= SIZE_MAX - ret)
+ ret += len;
+ else
+ ret = SIZE_MAX;
+ }
+
+ return ret;
}
static void ec_node_seq_free_priv(struct ec_node *gen_node)
.name = "seq",
.parse = ec_node_seq_parse,
.complete = ec_node_seq_complete,
+ .get_max_parse_len = ec_node_seq_get_max_parse_len,
.size = sizeof(struct ec_node_seq),
.free_priv = ec_node_seq_free_priv,
};
return NULL;
}
+/* LCOV_EXCL_START */
static int ec_node_seq_testcase(void)
{
struct ec_node *node;
return ret;
}
+/* LCOV_EXCL_STOP */
static struct ec_test ec_node_seq_test = {
.name = "node_seq",