X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_once.c;h=63098783dbaeb03a5eed9f0b93d910bfeb77a6f3;hb=833dc6c2a9c47b821548b197a1d1f96f60df7de8;hp=9ecfa98b9c43790538822855d39f13beb152e471;hpb=b058e053d494129ee861cd2ca1e0ea9a0cc9814f;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_once.c b/lib/ecoli_node_once.c index 9ecfa98..6309878 100644 --- a/lib/ecoli_node_once.c +++ b/lib/ecoli_node_once.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 @@ -37,8 +14,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -52,18 +29,18 @@ struct ec_node_once { }; static unsigned int -count_node(struct ec_parsed *parsed, const struct ec_node *node) +count_node(struct ec_parse *parse, const struct ec_node *node) { - struct ec_parsed *child; + struct ec_parse *child; unsigned int count = 0; - if (parsed == NULL) + if (parse == NULL) return 0; - if (ec_parsed_get_node(parsed) == node) + if (ec_parse_get_node(parse) == node) count++; - EC_PARSED_FOREACH_CHILD(child, parsed) + EC_PARSE_FOREACH_CHILD(child, parse) count += count_node(child, node); return count; @@ -71,7 +48,7 @@ count_node(struct ec_parsed *parsed, const struct ec_node *node) static int ec_node_once_parse(const struct ec_node *gen_node, - struct ec_parsed *state, + struct ec_parse *state, const struct ec_strvec *strvec) { struct ec_node_once *node = (struct ec_node_once *)gen_node; @@ -80,31 +57,31 @@ ec_node_once_parse(const struct ec_node *gen_node, /* count the number of occurences of the node: if already parsed, * do not match */ - count = count_node(ec_parsed_get_root(state), node->child); + count = count_node(ec_parse_get_root(state), node->child); if (count > 0) - return EC_PARSED_NOMATCH; + return EC_PARSE_NOMATCH; return ec_node_parse_child(node->child, state, strvec); } static int ec_node_once_complete(const struct ec_node *gen_node, - struct ec_completed *completed, + struct ec_comp *comp, const struct ec_strvec *strvec) { struct ec_node_once *node = (struct ec_node_once *)gen_node; - struct ec_parsed *parsed = ec_completed_get_state(completed); + struct ec_parse *parse = ec_comp_get_state(comp); unsigned int count; int ret; /* count the number of occurences of the node: if already parsed, * do not match */ - count = count_node(ec_parsed_get_root(parsed), node->child); //XXX + count = count_node(ec_parse_get_root(parse), node->child); if (count > 0) return 0; - ret = ec_node_complete_child(node->child, completed, strvec); + ret = ec_node_complete_child(node->child, comp, strvec); if (ret < 0) return ret; @@ -118,12 +95,38 @@ static void ec_node_once_free_priv(struct ec_node *gen_node) ec_node_free(node->child); } +static size_t +ec_node_once_get_children_count(const struct ec_node *gen_node) +{ + struct ec_node_once *node = (struct ec_node_once *)gen_node; + + if (node->child) + return 1; + return 0; +} + +static int +ec_node_once_get_child(const struct ec_node *gen_node, size_t i, + struct ec_node **child, unsigned int *refs) +{ + struct ec_node_once *node = (struct ec_node_once *)gen_node; + + if (i >= 1) + return -1; + + *child = node->child; + *refs = 1; + return 0; +} + static struct ec_node_type ec_node_once_type = { .name = "once", .parse = ec_node_once_parse, .complete = ec_node_once_complete, .size = sizeof(struct ec_node_once), .free_priv = ec_node_once_free_priv, + .get_children_count = ec_node_once_get_children_count, + .get_child = ec_node_once_get_child, }; EC_NODE_TYPE_REGISTER(ec_node_once_type); @@ -131,23 +134,22 @@ EC_NODE_TYPE_REGISTER(ec_node_once_type); int ec_node_once_set(struct ec_node *gen_node, struct ec_node *child) { struct ec_node_once *node = (struct ec_node_once *)gen_node; - int ret; - if (gen_node == NULL || child == NULL) - return -EINVAL; - - ret = ec_node_check_type(gen_node, &ec_node_once_type); - if (ret < 0) - return ret; + if (gen_node == NULL || child == NULL) { + errno = EINVAL; + goto fail; + } - gen_node->flags &= ~EC_NODE_F_BUILT; + if (ec_node_check_type(gen_node, &ec_node_once_type) < 0) + goto fail; node->child = child; - 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_once(const char *id, struct ec_node *child) @@ -157,20 +159,25 @@ struct ec_node *ec_node_once(const char *id, struct ec_node *child) if (child == NULL) return NULL; - gen_node = __ec_node(&ec_node_once_type, id); + gen_node = ec_node_from_type(&ec_node_once_type, id); if (gen_node == NULL) - return NULL; + goto fail; ec_node_once_set(gen_node, child); + child = NULL; return gen_node; + +fail: + ec_node_free(child); + return NULL; } /* LCOV_EXCL_START */ static int ec_node_once_testcase(void) { struct ec_node *node; - int ret = 0; + int testres = 0; node = ec_node_many(EC_NO_ID, EC_NODE_OR(EC_NO_ID, @@ -182,40 +189,34 @@ static int ec_node_once_testcase(void) EC_LOG(EC_LOG_ERR, "cannot create node\n"); return -1; } - ret |= EC_TEST_CHECK_PARSE(node, 0); - ret |= EC_TEST_CHECK_PARSE(node, 1, "foo"); - ret |= EC_TEST_CHECK_PARSE(node, 1, "bar"); - ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar"); - ret |= EC_TEST_CHECK_PARSE(node, 3, "foo", "bar", "bar"); - ret |= EC_TEST_CHECK_PARSE(node, 3, "bar", "foo", "bar"); - ret |= EC_TEST_CHECK_PARSE(node, 2, "bar", "foo", "foo"); - ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "foo"); - ret |= EC_TEST_CHECK_PARSE(node, 0, "foox"); - - ec_node_free(node); - -#if 0 //XXX no completion test for node_once - /* test completion */ - node = EC_NODE_OR(EC_NO_ID, - ec_node_str(EC_NO_ID, "foo"), - ec_node_str(EC_NO_ID, "bar"), - ec_node_str(EC_NO_ID, "bar2"), - ec_node_str(EC_NO_ID, "toto"), - ec_node_str(EC_NO_ID, "titi") - ); - if (node == NULL) { - EC_LOG(EC_LOG_ERR, "cannot create node\n"); - return -1; - } - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_PARSE(node, 0); + testres |= EC_TEST_CHECK_PARSE(node, 1, "foo"); + testres |= EC_TEST_CHECK_PARSE(node, 1, "bar"); + testres |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar"); + testres |= EC_TEST_CHECK_PARSE(node, 3, "foo", "bar", "bar"); + testres |= EC_TEST_CHECK_PARSE(node, 3, "bar", "foo", "bar"); + testres |= EC_TEST_CHECK_PARSE(node, 2, "bar", "foo", "foo"); + testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "foo"); + testres |= EC_TEST_CHECK_PARSE(node, 0, "foox"); + + testres |= EC_TEST_CHECK_COMPLETE(node, "", EC_NODE_ENDLIST, - "foo", "bar", "bar2", "toto", "titi", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + "foo", "bar", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "f", EC_NODE_ENDLIST, "foo", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, + "b", EC_NODE_ENDLIST, + "bar", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, + "foo", "", EC_NODE_ENDLIST, + "bar", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, + "bar", "", EC_NODE_ENDLIST, + "foo", "bar", EC_NODE_ENDLIST); ec_node_free(node); -#endif - return ret; + + return testres; } /* LCOV_EXCL_STOP */