X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_or.c;h=ad3786eb7dfb620812c45e47efd6a24a31e21b93;hb=f4ec52ffc80b673a0f7e848c568359abf4f3bc47;hp=76ee27153b244d97b6c2b3cc9d39c3168ee5b4a4;hpb=1ceb5917fd1b73c42d2ad535a0a65e645d6b4dbe;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_or.c b/lib/ecoli_node_or.c index 76ee271..ad3786e 100644 --- a/lib/ecoli_node_or.c +++ b/lib/ecoli_node_or.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 @@ -36,8 +13,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -52,7 +29,7 @@ struct ec_node_or { static int ec_node_or_parse(const struct ec_node *gen_node, - struct ec_parsed *state, + struct ec_parse *state, const struct ec_strvec *strvec) { struct ec_node_or *node = (struct ec_node_or *)gen_node; @@ -61,17 +38,17 @@ ec_node_or_parse(const struct ec_node *gen_node, for (i = 0; i < node->len; i++) { ret = ec_node_parse_child(node->table[i], state, strvec); - if (ret == EC_PARSED_NOMATCH) + if (ret == EC_PARSE_NOMATCH) continue; return ret; } - return EC_PARSED_NOMATCH; + return EC_PARSE_NOMATCH; } static int ec_node_or_complete(const struct ec_node *gen_node, - struct ec_completed *completed, + struct ec_comp *comp, const struct ec_strvec *strvec) { struct ec_node_or *node = (struct ec_node_or *)gen_node; @@ -80,7 +57,7 @@ ec_node_or_complete(const struct ec_node *gen_node, for (n = 0; n < node->len; n++) { ret = ec_node_complete_child(node->table[n], - completed, strvec); + comp, strvec); if (ret < 0) return ret; } @@ -98,12 +75,32 @@ static void ec_node_or_free_priv(struct ec_node *gen_node) ec_free(node->table); } +static size_t +ec_node_or_get_children_count(const struct ec_node *gen_node) +{ + struct ec_node_or *node = (struct ec_node_or *)gen_node; + return node->len; +} + +static struct ec_node * +ec_node_or_get_child(const struct ec_node *gen_node, size_t i) +{ + struct ec_node_or *node = (struct ec_node_or *)gen_node; + + if (i >= node->len) + return NULL; + + return node->table[i]; +} + static struct ec_node_type ec_node_or_type = { .name = "or", .parse = ec_node_or_parse, .complete = ec_node_or_complete, .size = sizeof(struct ec_node_or), .free_priv = ec_node_or_free_priv, + .get_children_count = ec_node_or_get_children_count, + .get_child = ec_node_or_get_child, }; EC_NODE_TYPE_REGISTER(ec_node_or_type); @@ -130,10 +127,6 @@ int ec_node_or_add(struct ec_node *gen_node, struct ec_node *child) goto fail; node->table = table; - - if (ec_node_add_child(gen_node, child) < 0) - goto fail; - table[node->len] = child; node->len++; @@ -187,7 +180,7 @@ fail: static int ec_node_or_testcase(void) { struct ec_node *node; - int ret = 0; + int testres = 0; node = EC_NODE_OR(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), @@ -197,13 +190,13 @@ static int ec_node_or_testcase(void) EC_LOG(EC_LOG_ERR, "cannot create node\n"); return -1; } - ret |= EC_TEST_CHECK_PARSE(node, 1, "foo"); - ret |= EC_TEST_CHECK_PARSE(node, 1, "bar"); - ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar"); - ret |= EC_TEST_CHECK_PARSE(node, -1, " "); - ret |= EC_TEST_CHECK_PARSE(node, -1, "foox"); - ret |= EC_TEST_CHECK_PARSE(node, -1, "toto"); - ret |= EC_TEST_CHECK_PARSE(node, -1, ""); + testres |= EC_TEST_CHECK_PARSE(node, 1, "foo"); + testres |= EC_TEST_CHECK_PARSE(node, 1, "bar"); + testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar"); + testres |= EC_TEST_CHECK_PARSE(node, -1, " "); + testres |= EC_TEST_CHECK_PARSE(node, -1, "foox"); + testres |= EC_TEST_CHECK_PARSE(node, -1, "toto"); + testres |= EC_TEST_CHECK_PARSE(node, -1, ""); ec_node_free(node); /* test completion */ @@ -218,30 +211,30 @@ static int ec_node_or_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", "bar", "bar2", "toto", "titi", 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, "b", EC_NODE_ENDLIST, "bar", "bar2", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "bar", EC_NODE_ENDLIST, "bar", "bar2", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "t", EC_NODE_ENDLIST, "toto", "titi", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "to", EC_NODE_ENDLIST, "toto", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "x", EC_NODE_ENDLIST, EC_NODE_ENDLIST); ec_node_free(node); - return ret; + return testres; } /* LCOV_EXCL_STOP */