store full token and completion in completed_item

[protos/libecoli.git] / lib / ecoli_node_seq.c

diff --git a/lib/ecoli_node_seq.c b/lib/ecoli_node_seq.c
index 9fa2d1a..9e0440b 100644 (file)
--- a/lib/ecoli_node_seq.c
+++ b/lib/ecoli_node_seq.c
@@ -46,6 +46,8 @@
 #include <ecoli_node_many.h>
 #include <ecoli_node_seq.h>
 
+EC_LOG_TYPE_REGISTER(node_seq);
+
 struct ec_node_seq {
        struct ec_node gen;
        struct ec_node **table;
@@ -72,13 +74,15 @@ ec_node_seq_parse(const struct ec_node *gen_node,
                }
 
                ret = ec_node_parse_child(node->table[i], state, childvec);
+               if (ret < 0)
+                       goto fail;
+
                ec_strvec_free(childvec);
                childvec = NULL;
+
                if (ret == EC_PARSED_NOMATCH) {
                        ec_parsed_free_children(state);
                        return EC_PARSED_NOMATCH;
-               } else if (ret < 0) {
-                       goto fail;
                }
 
                len += ret;
@@ -91,21 +95,18 @@ fail:
        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,
+               const struct ec_strvec *strvec)
 {
-       struct ec_completed *completed, *child_completed;
+       struct ec_parsed *parsed = ec_completed_get_state(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
@@ -119,13 +120,10 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len,
         */
 
        /* 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, 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++) {
@@ -133,8 +131,8 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len,
                if (childvec == NULL)
                        goto fail;
 
-               ret = ec_node_parse_child(table[0], state, childvec);
-               if (ret < 0 && ret != EC_PARSED_NOMATCH)
+               ret = ec_node_parse_child(table[0], parsed, childvec);
+               if (ret < 0)
                        goto fail;
 
                ec_strvec_free(childvec);
@@ -142,47 +140,43 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len,
 
                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, 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,
                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,
+                               strvec);
 }
 
 static size_t ec_node_seq_get_max_parse_len(const struct ec_node *gen_node)
@@ -302,7 +296,7 @@ static int ec_node_seq_testcase(void)
                ec_node_str(NULL, "bar")
        );
        if (node == NULL) {
-               ec_log(EC_LOG_ERR, "cannot create node\n");
+               EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
        ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar");
@@ -321,45 +315,38 @@ static int ec_node_seq_testcase(void)
                ec_node_str(NULL, "bar")
        );
        if (node == NULL) {
-               ec_log(EC_LOG_ERR, "cannot create node\n");
+               EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "", EC_NODE_ENDLIST,
-               "foo", EC_NODE_ENDLIST,
-               "foo");
+               "foo", EC_NODE_ENDLIST);
+       ec_node_free(node);
+       return 0;
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "f", EC_NODE_ENDLIST,
-               "oo", EC_NODE_ENDLIST,
-               "oo");
+               "foo", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", EC_NODE_ENDLIST,
-               "", EC_NODE_ENDLIST,
-               "");
+               "foo", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "", EC_NODE_ENDLIST,
-               "bar", "toto", EC_NODE_ENDLIST,
-               "");
+               "bar", "toto", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "t", EC_NODE_ENDLIST,
-               "oto", EC_NODE_ENDLIST,
-               "oto");
+               "toto", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "b", EC_NODE_ENDLIST,
-               "ar", EC_NODE_ENDLIST,
-               "ar");
+               "bar", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "bar", EC_NODE_ENDLIST,
-               "", EC_NODE_ENDLIST,
-               "");
+               "bar", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "x", EC_NODE_ENDLIST,
-               EC_NODE_ENDLIST,
-               "");
+               EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foobarx", EC_NODE_ENDLIST,
-               EC_NODE_ENDLIST,
-               "");
+               EC_NODE_ENDLIST);
        ec_node_free(node);
 
        return ret;