X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fecoli_node_seq.c;h=77738ed10fda456e22bdab42ca0ed628789a565d;hb=6a40004beef80306d5f7dcea9febec948adf6d50;hp=d6338e9098571dee242dace6ece82ec5871b735b;hpb=6c99f3bcdcb786bee560c1582f3ad3c306681d6e;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_seq.c b/lib/ecoli_node_seq.c index d6338e9..77738ed 100644 --- a/lib/ecoli_node_seq.c +++ b/lib/ecoli_node_seq.c @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2016, Olivier MATZ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the University of California, Berkeley nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2016, Olivier MATZ */ #include @@ -38,14 +15,16 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include +EC_LOG_TYPE_REGISTER(node_seq); + struct ec_node_seq { struct ec_node gen; struct ec_node **table; @@ -54,7 +33,7 @@ struct ec_node_seq { static int ec_node_seq_parse(const struct ec_node *gen_node, - struct ec_parsed *state, + struct ec_parse *state, const struct ec_strvec *strvec) { struct ec_node_seq *node = (struct ec_node_seq *)gen_node; @@ -66,19 +45,19 @@ ec_node_seq_parse(const struct ec_node *gen_node, for (i = 0; i < node->len; i++) { childvec = ec_strvec_ndup(strvec, len, ec_strvec_len(strvec) - len); - if (childvec == NULL) { - ret = -ENOMEM; + if (childvec == NULL) goto fail; - } 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; + + if (ret == EC_PARSE_NOMATCH) { + ec_parse_free_children(state); + return EC_PARSE_NOMATCH; } len += ret; @@ -88,15 +67,15 @@ ec_node_seq_parse(const struct ec_node *gen_node, fail: ec_strvec_free(childvec); - return ret; + return -1; } static int __ec_node_seq_complete(struct ec_node **table, size_t table_len, - struct ec_completed *completed, - struct ec_parsed *parsed, + struct ec_comp *comp, const struct ec_strvec *strvec) { + struct ec_parse *parse = ec_comp_get_state(comp); struct ec_strvec *childvec = NULL; unsigned int i; int ret; @@ -116,7 +95,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], comp, strvec); if (ret < 0) goto fail; @@ -127,29 +106,29 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len, if (childvec == NULL) goto fail; - ret = ec_node_parse_child(table[0], parsed, childvec); - if (ret < 0 && ret != EC_PARSED_NOMATCH) + ret = ec_node_parse_child(table[0], parse, childvec); + if (ret < 0) goto fail; ec_strvec_free(childvec); childvec = NULL; if ((unsigned int)ret != i) { - if (ret != EC_PARSED_NOMATCH) - ec_parsed_del_last_child(parsed); + if (ret != EC_PARSE_NOMATCH) + ec_parse_del_last_child(parse); continue; } childvec = ec_strvec_ndup(strvec, i, ec_strvec_len(strvec) - i); if (childvec == NULL) { - ec_parsed_del_last_child(parsed); + ec_parse_del_last_child(parse); goto fail; } ret = __ec_node_seq_complete(&table[1], table_len - 1, - completed, parsed, childvec); - ec_parsed_del_last_child(parsed); + comp, childvec); + ec_parse_del_last_child(parse); ec_strvec_free(childvec); childvec = NULL; @@ -166,30 +145,13 @@ fail: static int ec_node_seq_complete(const struct ec_node *gen_node, - struct ec_completed *completed, - struct ec_parsed *parsed, + struct ec_comp *comp, 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; + return __ec_node_seq_complete(node->table, node->len, comp, + strvec); } static void ec_node_seq_free_priv(struct ec_node *gen_node) @@ -206,7 +168,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, }; @@ -218,29 +179,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, ...) @@ -286,74 +251,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"); + 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"); + 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, - "foo"); - ret |= EC_TEST_CHECK_COMPLETE(node, + "foo", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "f", EC_NODE_ENDLIST, - "oo", EC_NODE_ENDLIST, - "oo"); - ret |= EC_TEST_CHECK_COMPLETE(node, + "foo", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "foo", EC_NODE_ENDLIST, - "", EC_NODE_ENDLIST, - ""); - ret |= EC_TEST_CHECK_COMPLETE(node, + "foo", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "foo", "", EC_NODE_ENDLIST, - "bar", "toto", EC_NODE_ENDLIST, - ""); - ret |= EC_TEST_CHECK_COMPLETE(node, + "bar", "toto", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "foo", "t", EC_NODE_ENDLIST, - "oto", EC_NODE_ENDLIST, - "oto"); - ret |= EC_TEST_CHECK_COMPLETE(node, + "toto", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "foo", "b", EC_NODE_ENDLIST, - "ar", EC_NODE_ENDLIST, - "ar"); - ret |= EC_TEST_CHECK_COMPLETE(node, + "bar", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "foo", "bar", EC_NODE_ENDLIST, - "", EC_NODE_ENDLIST, - ""); - ret |= EC_TEST_CHECK_COMPLETE(node, + "bar", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "x", EC_NODE_ENDLIST, - EC_NODE_ENDLIST, - ""); - ret |= EC_TEST_CHECK_COMPLETE(node, + EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "foobarx", EC_NODE_ENDLIST, - EC_NODE_ENDLIST, - ""); + EC_NODE_ENDLIST); ec_node_free(node); - return ret; + return testres; } /* LCOV_EXCL_STOP */