X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_once.c;h=8218a292afdf8362c0a93b76228f2cc244dd680a;hb=21ebbeb9a3585683d1688997e541efd104244d8e;hp=deb9baa65ab9f170aff544b66c51f085ee3b3e62;hpb=bf091fc25fc602ceb9ec389f341c52bd0bf7d2af;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_once.c b/lib/ecoli_node_once.c index deb9baa..8218a29 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,31 +14,33 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include +EC_LOG_TYPE_REGISTER(node_once); + struct ec_node_once { struct ec_node gen; struct ec_node *child; }; 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 (parsed->node == node) + if (ec_parse_get_node(parse) == node) count++; - TAILQ_FOREACH(child, &parsed->children, next) + EC_PARSE_FOREACH_CHILD(child, parse) count += count_node(child, node); return count; @@ -69,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; @@ -78,43 +57,35 @@ 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 struct ec_completed * +static int ec_node_once_complete(const struct ec_node *gen_node, - struct ec_parsed *state, + struct ec_comp *comp, const struct ec_strvec *strvec) { struct ec_node_once *node = (struct ec_node_once *)gen_node; - struct ec_completed *completed = NULL, *child_completed = NULL; + struct ec_parse *parse = ec_comp_get_state(comp); unsigned int count; - - completed = ec_completed(); - if (completed == NULL) - goto fail; + int ret; /* count the number of occurences of the node: if already parsed, * do not match */ - count = count_node(ec_parsed_get_root(state), node->child); //XXX + count = count_node(ec_parse_get_root(parse), node->child); if (count > 0) - return completed; - - child_completed = ec_node_complete_child(node->child, state, strvec); - if (child_completed == NULL) - goto fail; + return 0; - ec_completed_merge(completed, child_completed); - return completed; + ret = ec_node_complete_child(node->child, comp, strvec); + if (ret < 0) + return ret; -fail: - ec_completed_free(completed); - return NULL; + return 0; } static void ec_node_once_free_priv(struct ec_node *gen_node) @@ -138,21 +109,24 @@ 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; - // XXX check node type - - assert(node != NULL); + if (gen_node == NULL || child == NULL) { + errno = EINVAL; + goto fail; + } - if (child == NULL) - return -EINVAL; + if (ec_node_check_type(gen_node, &ec_node_once_type) < 0) + goto fail; - gen_node->flags &= ~EC_NODE_F_BUILT; + if (ec_node_add_child(gen_node, child) < 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) @@ -164,65 +138,64 @@ struct ec_node *ec_node_once(const char *id, struct ec_node *child) gen_node = __ec_node(&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(NULL, - EC_NODE_OR(NULL, - ec_node_once(NULL, ec_node_str(NULL, "foo")), - ec_node_str(NULL, "bar") + node = ec_node_many(EC_NO_ID, + EC_NODE_OR(EC_NO_ID, + ec_node_once(EC_NO_ID, ec_node_str(EC_NO_ID, "foo")), + ec_node_str(EC_NO_ID, "bar") ), 0, 0 ); 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, 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(NULL, - ec_node_str(NULL, "foo"), - ec_node_str(NULL, "bar"), - ec_node_str(NULL, "bar2"), - ec_node_str(NULL, "toto"), - ec_node_str(NULL, "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, - "oo", EC_NODE_ENDLIST, - "oo"); + "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 */ static struct ec_test ec_node_once_test = { .name = "node_once",