change add to full str

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

diff --git a/lib/ecoli_node_str.c b/lib/ecoli_node_str.c
index a388841..b846448 100644 (file)
--- a/lib/ecoli_node_str.c
+++ b/lib/ecoli_node_str.c
@@ -65,24 +65,20 @@ ec_node_str_parse(const struct ec_node *gen_node,
        return 1;
 }
 
-static struct ec_completed *
+static int
 ec_node_str_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_str *node = (struct ec_node_str *)gen_node;
-       struct ec_completed *completed;
-       const char *str, *add;
+       const char *str;
        size_t n = 0;
 
-       (void)state;
-
-       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++) {
@@ -90,17 +86,13 @@ ec_node_str_complete(const struct ec_node *gen_node,
                        break;
        }
 
-       if (str[n] != '\0')
-               add = NULL;
-       else
-               add = node->string + n;
-
-       if (ec_completed_add_elt(completed, state, gen_node, add) < 0) {
-               ec_completed_free(completed);
-               return NULL;
+       if (str[n] == '\0') {
+               if (ec_completed_add_match(completed, parsed, gen_node,
+                                               node->string) < 0)
+                       return -1;
        }
 
-       return completed;
+       return 0;
 }
 
 static const char *ec_node_str_desc(const struct ec_node *gen_node)
@@ -229,12 +221,12 @@ static int ec_node_str_testcase(void)
                "foo");
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "f", EC_NODE_ENDLIST,
-               "oo", EC_NODE_ENDLIST,
-               "oo");
+               "foo", EC_NODE_ENDLIST,
+               "foo");
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", EC_NODE_ENDLIST,
-               "", EC_NODE_ENDLIST,
-               "");
+               "foo", EC_NODE_ENDLIST,
+               "foo");
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "x", EC_NODE_ENDLIST,
                EC_NODE_ENDLIST,