X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_or.c;h=38f8a3dd9ac4843f3a5f9b18ce81c1f2cf922425;hb=e40d17736c40e7b001f2d3a07a8987cf051d5d9f;hp=ddf8281e970e322c6f9cc383224dc9d791afcd0d;hpb=ab698b70695b745e649e43ee07d4db257705a844;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_or.c b/lib/ecoli_node_or.c index ddf8281..38f8a3d 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 @@ -88,20 +65,6 @@ ec_node_or_complete(const struct ec_node *gen_node, return 0; } -static size_t ec_node_or_get_max_parse_len(const struct ec_node *gen_node) -{ - struct ec_node_or *node = (struct ec_node_or *)gen_node; - size_t i, ret = 0, len; - - for (i = 0; i < node->len; i++) { - len = ec_node_get_max_parse_len(node->table[i]); - if (len > ret) - ret = len; - } - - return ret; -} - static void ec_node_or_free_priv(struct ec_node *gen_node) { struct ec_node_or *node = (struct ec_node_or *)gen_node; @@ -112,6 +75,16 @@ static void ec_node_or_free_priv(struct ec_node *gen_node) ec_free(node->table); } +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, +}; + +EC_NODE_TYPE_REGISTER(ec_node_or_type); + int ec_node_or_add(struct ec_node *gen_node, struct ec_node *child) { struct ec_node_or *node = (struct ec_node_or *)gen_node; @@ -119,35 +92,34 @@ int ec_node_or_add(struct ec_node *gen_node, struct ec_node *child) assert(node != NULL); - if (child == NULL) - return -EINVAL; + assert(node != NULL); - table = ec_realloc(node->table, (node->len + 1) * sizeof(*node->table)); - if (table == NULL) { - ec_node_free(child); - return -1; + if (child == NULL) { + errno = EINVAL; + goto fail; } + if (ec_node_check_type(gen_node, &ec_node_or_type) < 0) + goto fail; + + table = ec_realloc(node->table, (node->len + 1) * sizeof(*node->table)); + 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); - return 0; -} -static struct ec_node_type ec_node_or_type = { - .name = "or", - .parse = ec_node_or_parse, - .complete = ec_node_or_complete, - .get_max_parse_len = ec_node_or_get_max_parse_len, - .size = sizeof(struct ec_node_or), - .free_priv = ec_node_or_free_priv, -}; - -EC_NODE_TYPE_REGISTER(ec_node_or_type); +fail: + ec_node_free(child); + return -1; +} struct ec_node *__ec_node_or(const char *id, ...) { @@ -192,7 +164,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"), @@ -202,13 +174,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 */ @@ -223,30 +195,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 */