use EC_NO_ID instead of NULL

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

diff --git a/lib/ecoli_node_option.c b/lib/ecoli_node_option.c
index 305734f..6f8d229 100644 (file)
--- a/lib/ecoli_node_option.c
+++ b/lib/ecoli_node_option.c
@@ -41,52 +41,39 @@
 #include <ecoli_node_str.h>
 #include <ecoli_test.h>
 
+EC_LOG_TYPE_REGISTER(node_option);
+
 struct ec_node_option {
        struct ec_node gen;
        struct ec_node *child;
 };
 
-static struct ec_parsed *ec_node_option_parse(const struct ec_node *gen_node,
-       const struct ec_strvec *strvec)
+static int
+ec_node_option_parse(const struct ec_node *gen_node,
+               struct ec_parsed *state,
+               const struct ec_strvec *strvec)
 {
        struct ec_node_option *node = (struct ec_node_option *)gen_node;
-       struct ec_parsed *parsed = NULL, *child_parsed;
-       struct ec_strvec *match_strvec;
-
-       parsed = ec_parsed();
-       if (parsed == NULL)
-               goto fail;
-
-       child_parsed = ec_node_parse_strvec(node->child, strvec);
-       if (child_parsed == NULL)
-               goto fail;
-
-       if (ec_parsed_matches(child_parsed)) {
-               ec_parsed_add_child(parsed, child_parsed);
-               match_strvec = ec_strvec_dup(child_parsed->strvec);
-       } else {
-               ec_parsed_free(child_parsed);
-               match_strvec = ec_strvec();
-       }
+       int ret;
 
-       if (match_strvec == NULL)
-               goto fail;
+       ret = ec_node_parse_child(node->child, state, strvec);
+       if (ret < 0)
+               return ret;
 
-       ec_parsed_set_match(parsed, gen_node, match_strvec);
+       if (ret == EC_PARSED_NOMATCH)
+               return 0;
 
-       return parsed;
-
- fail:
-       ec_parsed_free(parsed);
-       return NULL;
+       return ret;
 }
 
-static struct ec_completed *ec_node_option_complete(const struct ec_node *gen_node,
-       const struct ec_strvec *strvec)
+static int
+ec_node_option_complete(const struct ec_node *gen_node,
+                       struct ec_completed *completed,
+                       const struct ec_strvec *strvec)
 {
        struct ec_node_option *node = (struct ec_node_option *)gen_node;
 
-       return ec_node_complete_strvec(node->child, strvec);
+       return ec_node_complete_child(node->child, completed, strvec);
 }
 
 static void ec_node_option_free_priv(struct ec_node *gen_node)
@@ -129,14 +116,15 @@ struct ec_node *ec_node_option(const char *id, struct ec_node *child)
        return &node->gen;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_option_testcase(void)
 {
        struct ec_node *node;
        int ret = 0;
 
-       node = ec_node_option(NULL, ec_node_str(NULL, "foo"));
+       node = ec_node_option(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"));
        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, 1, "foo");
@@ -146,27 +134,25 @@ static int ec_node_option_testcase(void)
        ec_node_free(node);
 
        /* test completion */
-       node = ec_node_option(NULL, ec_node_str(NULL, "foo"));
+       node = ec_node_option(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"));
        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);
        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,
                "b", EC_NODE_ENDLIST,
-               EC_NODE_ENDLIST,
-               "");
+               EC_NODE_ENDLIST);
        ec_node_free(node);
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_option_test = {
        .name = "node_option",