tests more consistent

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

diff --git a/lib/ecoli_node_seq.c b/lib/ecoli_node_seq.c
index 9240e4f..3a0cc67 100644 (file)
--- a/lib/ecoli_node_seq.c
+++ b/lib/ecoli_node_seq.c
@@ -74,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;
@@ -96,9 +98,9 @@ fail:
 static int
 __ec_node_seq_complete(struct ec_node **table, size_t table_len,
                struct ec_completed *completed,
-               struct ec_parsed *parsed,
                const struct ec_strvec *strvec)
 {
+       struct ec_parsed *parsed = ec_completed_get_state(completed);
        struct ec_strvec *childvec = NULL;
        unsigned int i;
        int ret;
@@ -118,7 +120,7 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len,
         */
 
        /* first, try to complete with the first node of the table */
-       ret = ec_node_complete_child(table[0], completed, parsed, strvec);
+       ret = ec_node_complete_child(table[0], completed, strvec);
        if (ret < 0)
                goto fail;
 
@@ -130,7 +132,7 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len,
                        goto fail;
 
                ret = ec_node_parse_child(table[0], parsed, childvec);
-               if (ret < 0 && ret != EC_PARSED_NOMATCH)
+               if (ret < 0)
                        goto fail;
 
                ec_strvec_free(childvec);
@@ -150,7 +152,7 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len,
 
                ret = __ec_node_seq_complete(&table[1],
                                        table_len - 1,
-                                       completed, parsed, childvec);
+                                       completed, childvec);
                ec_parsed_del_last_child(parsed);
                ec_strvec_free(childvec);
                childvec = NULL;
@@ -169,29 +171,12 @@ fail:
 static int
 ec_node_seq_complete(const struct ec_node *gen_node,
                struct ec_completed *completed,
-               struct ec_parsed *parsed,
                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, completed,
-                               parsed, strvec);
-}
-
-static size_t ec_node_seq_get_max_parse_len(const struct ec_node *gen_node)
-{
-       struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
-       size_t i, len, ret = 0;
-
-       for (i = 0; i < node->len; i++) {
-               len = ec_node_get_max_parse_len(node->table[i]);
-               if (len <= SIZE_MAX - ret)
-                       ret += len;
-               else
-                       ret = SIZE_MAX;
-       }
-
-       return ret;
+                               strvec);
 }
 
 static void ec_node_seq_free_priv(struct ec_node *gen_node)
@@ -208,7 +193,6 @@ static struct ec_node_type ec_node_seq_type = {
        .name = "seq",
        .parse = ec_node_seq_parse,
        .complete = ec_node_seq_complete,
-       .get_max_parse_len = ec_node_seq_get_max_parse_len,
        .size = sizeof(struct ec_node_seq),
        .free_priv = ec_node_seq_free_priv,
 };
@@ -220,29 +204,33 @@ int ec_node_seq_add(struct ec_node *gen_node, struct ec_node *child)
        struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
        struct ec_node **table;
 
-       // XXX check node type
-
        assert(node != NULL);
 
-       if (child == NULL)
-               return -EINVAL;
+       if (child == NULL) {
+               errno = EINVAL;
+               goto fail;
+       }
 
-       gen_node->flags &= ~EC_NODE_F_BUILT;
+       if (ec_node_check_type(gen_node, &ec_node_seq_type) < 0)
+               goto fail;
 
        table = ec_realloc(node->table, (node->len + 1) * sizeof(*node->table));
-       if (table == NULL) {
-               ec_node_free(child);
-               return -1;
-       }
+       if (table == NULL)
+               goto fail;
 
        node->table = table;
+
+       if (ec_node_add_child(gen_node, child) < 0)
+               goto fail;
+
        table[node->len] = child;
        node->len++;
 
-       child->parent = gen_node;
-       TAILQ_INSERT_TAIL(&gen_node->children, child, next); // XXX really needed?
-
        return 0;
+
+fail:
+       ec_node_free(child);
+       return -1;
 }
 
 struct ec_node *__ec_node_seq(const char *id, ...)
@@ -288,65 +276,65 @@ fail:
 static int ec_node_seq_testcase(void)
 {
        struct ec_node *node;
-       int ret = 0;
+       int testres = 0;
 
-       node = EC_NODE_SEQ(NULL,
-               ec_node_str(NULL, "foo"),
-               ec_node_str(NULL, "bar")
+       node = EC_NODE_SEQ(EC_NO_ID,
+               ec_node_str(EC_NO_ID, "foo"),
+               ec_node_str(EC_NO_ID, "bar")
        );
        if (node == NULL) {
                EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar");
-       ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar", "toto");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "foo");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "foox", "bar");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "foo", "barx");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "bar", "foo");
-       ret |= EC_TEST_CHECK_PARSE(node, -1, "", "foo");
+       testres |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar");
+       testres |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar", "toto");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "foo");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "foox", "bar");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "foo", "barx");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "bar", "foo");
+       testres |= EC_TEST_CHECK_PARSE(node, -1, "", "foo");
        ec_node_free(node);
 
        /* test completion */
-       node = EC_NODE_SEQ(NULL,
-               ec_node_str(NULL, "foo"),
-               ec_node_option(NULL, ec_node_str(NULL, "toto")),
-               ec_node_str(NULL, "bar")
+       node = EC_NODE_SEQ(EC_NO_ID,
+               ec_node_str(EC_NO_ID, "foo"),
+               ec_node_option(EC_NO_ID, ec_node_str(EC_NO_ID, "toto")),
+               ec_node_str(EC_NO_ID, "bar")
        );
        if (node == NULL) {
                EC_LOG(EC_LOG_ERR, "cannot create node\n");
                return -1;
        }
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "", EC_NODE_ENDLIST,
                "foo", EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "f", EC_NODE_ENDLIST,
                "foo", EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "foo", EC_NODE_ENDLIST,
                "foo", EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "", EC_NODE_ENDLIST,
                "bar", "toto", EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "t", EC_NODE_ENDLIST,
                "toto", EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "b", EC_NODE_ENDLIST,
                "bar", EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "foo", "bar", EC_NODE_ENDLIST,
                "bar", EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "x", EC_NODE_ENDLIST,
                EC_NODE_ENDLIST);
-       ret |= EC_TEST_CHECK_COMPLETE(node,
+       testres |= EC_TEST_CHECK_COMPLETE(node,
                "foobarx", EC_NODE_ENDLIST,
                EC_NODE_ENDLIST);
        ec_node_free(node);
 
-       return ret;
+       return testres;
 }
 /* LCOV_EXCL_STOP */