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 e239bcf..3a0cc67 100644 (file)
--- a/lib/ecoli_node_seq.c
+++ b/lib/ecoli_node_seq.c
@@ -179,22 +179,6 @@ ec_node_seq_complete(const struct ec_node *gen_node,
                                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;
-}
-
 static void ec_node_seq_free_priv(struct ec_node *gen_node)
 {
        struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
@@ -209,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,
 };
@@ -221,27 +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;
+       }
+
+       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, ...)
@@ -287,7 +276,7 @@ fail:
 static int ec_node_seq_testcase(void)
 {
        struct ec_node *node;
-       int ret = 0;
+       int testres = 0;
 
        node = EC_NODE_SEQ(EC_NO_ID,
                ec_node_str(EC_NO_ID, "foo"),
@@ -297,13 +286,13 @@ static int ec_node_seq_testcase(void)
                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 */
@@ -316,38 +305,36 @@ static int ec_node_seq_testcase(void)
                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);
-       ec_node_free(node);
-       return 0;
-       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 */