rework int/uint node

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

diff --git a/lib/ecoli_node_many.c b/lib/ecoli_node_many.c
index 87534a3..31d0eb2 100644 (file)
--- a/lib/ecoli_node_many.c
+++ b/lib/ecoli_node_many.c
@@ -43,6 +43,8 @@
 #include <ecoli_node_option.h>
 #include <ecoli_node_many.h>
 
+EC_LOG_TYPE_REGISTER(node_many);
+
 struct ec_node_many {
        struct ec_node gen;
        unsigned int min;
@@ -69,13 +71,14 @@ static int ec_node_many_parse(const struct ec_node *gen_node,
                }
 
                ret = ec_node_parse_child(node->child, state, childvec);
+               if (ret < 0)
+                       goto fail;
+
                ec_strvec_free(childvec);
                childvec = NULL;
 
                if (ret == EC_PARSED_NOMATCH)
                        break;
-               else if (ret < 0)
-                       goto fail;
 
                /* it matches an empty strvec, no need to continue */
                if (ret == 0) {
@@ -100,29 +103,24 @@ fail:
        return ret;
 }
 
-static struct ec_completed *
+static int
 __ec_node_many_complete(struct ec_node_many *node, unsigned int max,
-                       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;
-
        /* first, try to complete with the child node */
-       child_completed = ec_node_complete_child(node->child, state, strvec);
-       if (child_completed == NULL)
+       ret = ec_node_complete_child(node->child, completed, strvec);
+       if (ret < 0)
                goto fail;
-       ec_completed_merge(completed, child_completed);
-       child_completed = NULL;
 
        /* we're done, we reached the max number of nodes */
        if (max == 1)
-               return completed;
+               return 0;
 
        /* if there is a maximum, decrease it before recursion */
        if (max != 0)
@@ -135,8 +133,8 @@ __ec_node_many_complete(struct ec_node_many *node, unsigned int max,
                if (childvec == NULL)
                        goto fail;
 
-               ret = ec_node_parse_child(node->child, state, childvec);
-               if (ret < 0 && ret != EC_PARSED_NOMATCH)
+               ret = ec_node_parse_child(node->child, parsed, childvec);
+               if (ret < 0)
                        goto fail;
 
                ec_strvec_free(childvec);
@@ -144,46 +142,41 @@ __ec_node_many_complete(struct ec_node_many *node, unsigned int max,
 
                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_many_complete(node, max,
-                                                       state, childvec);
-               ec_parsed_del_last_child(state);
+               ret = __ec_node_many_complete(node, max, 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_many_complete(const struct ec_node *gen_node,
-               struct ec_parsed *state,
+               struct ec_completed *completed,
                const struct ec_strvec *strvec)
 {
        struct ec_node_many *node = (struct ec_node_many *)gen_node;
 
-       return __ec_node_many_complete(node, node->max, state, strvec);
+       return __ec_node_many_complete(node, node->max, completed,
+                               strvec);
 }
 
 static void ec_node_many_free_priv(struct ec_node *gen_node)
@@ -224,14 +217,15 @@ struct ec_node *ec_node_many(const char *id, struct ec_node *child,
        return &node->gen;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_many_testcase(void)
 {
        struct ec_node *node;
        int ret = 0;
 
-       node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 0, 0);
+       node = ec_node_many(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 0, 0);
        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, 0);
@@ -241,9 +235,9 @@ static int ec_node_many_testcase(void)
        ret |= EC_TEST_CHECK_PARSE(node, 0);
        ec_node_free(node);
 
-       node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 1, 0);
+       node = ec_node_many(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 1, 0);
        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, "bar");
@@ -252,9 +246,9 @@ static int ec_node_many_testcase(void)
        ret |= EC_TEST_CHECK_PARSE(node, -1);
        ec_node_free(node);
 
-       node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 1, 2);
+       node = ec_node_many(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 1, 2);
        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, "bar");
@@ -265,43 +259,37 @@ static int ec_node_many_testcase(void)
        ec_node_free(node);
 
        /* test completion */
-       node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 2, 4);
+       node = ec_node_many(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 2, 4);
        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,
                "foo", EC_NODE_ENDLIST,
-               "", EC_NODE_ENDLIST,
-               "");
+               "foo", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "", EC_NODE_ENDLIST,
-               "foo", EC_NODE_ENDLIST,
-               "foo");
+               "foo", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "foo", "", EC_NODE_ENDLIST,
-               "foo", EC_NODE_ENDLIST,
-               "foo");
+               "foo", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "foo", "foo", "", EC_NODE_ENDLIST,
-               "foo", EC_NODE_ENDLIST,
-               "foo");
+               "foo", EC_NODE_ENDLIST);
        ret |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "foo", "foo", "foo", "", EC_NODE_ENDLIST,
-               EC_NODE_ENDLIST,
-               "");
+               EC_NODE_ENDLIST);
        ec_node_free(node);
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_many_test = {
        .name = "node_many",