#include <ecoli_test.h>
#include <ecoli_strvec.h>
#include <ecoli_node.h>
+#include <ecoli_parsed.h>
+#include <ecoli_completed.h>
#include <ecoli_node_str.h>
#include <ecoli_node_option.h>
#include <ecoli_node_seq.h>
unsigned int len;
};
-static struct ec_parsed *ec_node_seq_parse(const struct ec_node *gen_node,
- const struct ec_strvec *strvec)
+static int
+ec_node_seq_parse(const struct ec_node *gen_node,
+ struct ec_parsed *state,
+ const struct ec_strvec *strvec)
{
struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
- struct ec_parsed *parsed, *child_parsed;
- struct ec_strvec *match_strvec;
struct ec_strvec *childvec = NULL;
size_t len = 0;
unsigned int i;
-
- parsed = ec_parsed();
- if (parsed == NULL)
- goto fail;
+ int ret;
for (i = 0; i < node->len; i++) {
childvec = ec_strvec_ndup(strvec, len,
ec_strvec_len(strvec) - len);
- if (childvec == NULL)
- goto fail;
-
- child_parsed = ec_node_parse_strvec(node->table[i], childvec);
- if (child_parsed == NULL)
+ if (childvec == NULL) {
+ ret = -ENOMEM;
goto fail;
+ }
+ ret = ec_node_parse_child(node->table[i], state, childvec);
ec_strvec_free(childvec);
childvec = NULL;
-
- if (!ec_parsed_matches(child_parsed)) {
- ec_parsed_free(child_parsed);
- // XXX ec_parsed_free_children needed? see subset.c
- ec_parsed_free_children(parsed);
- return parsed;
+ if (ret == EC_PARSED_NOMATCH) {
+ ec_parsed_free_children(state);
+ return EC_PARSED_NOMATCH;
+ } else if (ret < 0) {
+ goto fail;
}
- ec_parsed_add_child(parsed, child_parsed);
- len += ec_parsed_len(child_parsed);
+ len += ret;
}
- match_strvec = ec_strvec_ndup(strvec, 0, len);
- if (match_strvec == NULL)
- goto fail;
-
- ec_parsed_set_match(parsed, gen_node, match_strvec);
-
- return parsed;
+ return len;
fail:
ec_strvec_free(childvec);
- ec_parsed_free(parsed);
- return NULL;
+ return ret;
}
-static struct ec_completed *ec_node_seq_complete(const struct ec_node *gen_node,
- const struct ec_strvec *strvec)
+static struct ec_completed *
+__ec_node_seq_complete(struct ec_node **table, size_t table_len,
+ struct ec_parsed *state, const struct ec_strvec *strvec)
{
- struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
struct ec_completed *completed, *child_completed;
struct ec_strvec *childvec = NULL;
- struct ec_parsed *parsed;
- size_t len = 0;
unsigned int i;
+ int ret;
completed = ec_completed();
if (completed == NULL)
return NULL;
- if (node->len == 0)
+ if (table_len == 0)
return completed;
- for (i = 0; i < node->len && len < ec_strvec_len(strvec); i++) {
- childvec = ec_strvec_ndup(strvec, len,
- ec_strvec_len(strvec) - len);
+ /*
+ * Example of completion for a sequence node = [n1,n2] and an
+ * input = [a,b,c,d]:
+ *
+ * result = complete(n1, [a,b,c,d]) +
+ * complete(n2, [b,c,d]) if n1 matches [a] +
+ * complete(n2, [c,d]) if n1 matches [a,b] +
+ * complete(n2, [d]) if n1 matches [a,b,c] +
+ * complete(n2, []) if n1 matches [a,b,c,d]
+ */
+
+ /* 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)
+ 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++) {
+ childvec = ec_strvec_ndup(strvec, 0, i);
if (childvec == NULL)
goto fail;
- child_completed = ec_node_complete_strvec(node->table[i],
- childvec);
- if (child_completed == NULL)
+ ret = ec_node_parse_child(table[0], state, childvec);
+ if (ret < 0 && ret != EC_PARSED_NOMATCH)
goto fail;
- ec_completed_merge(completed, child_completed);
+ ec_strvec_free(childvec);
+ childvec = NULL;
+
+ if ((unsigned int)ret != i) {
+ if (ret != EC_PARSED_NOMATCH)
+ ec_parsed_del_last_child(state);
+ continue;
+ }
- parsed = ec_node_parse_strvec(node->table[i], childvec);
- if (parsed == NULL)
+ childvec = ec_strvec_ndup(strvec, i, ec_strvec_len(strvec) - i);
+ if (childvec == NULL) {
+ ec_parsed_del_last_child(state);
goto fail;
+ }
+ child_completed = __ec_node_seq_complete(&table[1],
+ table_len - 1,
+ state, childvec);
+ ec_parsed_del_last_child(state);
ec_strvec_free(childvec);
childvec = NULL;
- if (!ec_parsed_matches(parsed)) {
- ec_parsed_free(parsed);
- break;
- }
+ if (child_completed == NULL)
+ goto fail;
- len += ec_strvec_len(parsed->strvec);
- ec_parsed_free(parsed);
+ ec_completed_merge(completed, child_completed);
+ child_completed = NULL;
}
return completed;
fail:
ec_strvec_free(childvec);
+ ec_completed_free(child_completed);
ec_completed_free(completed);
return NULL;
}
+static struct ec_completed *
+ec_node_seq_complete(const struct ec_node *gen_node,
+ struct ec_parsed *state,
+ 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);
+}
+
static void ec_node_seq_free_priv(struct ec_node *gen_node)
{
struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
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",
git.droids-corp.org / protos / libecoli.git / blobdiff