X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_or.c;h=ad3786eb7dfb620812c45e47efd6a24a31e21b93;hb=f4ec52ffc80b673a0f7e848c568359abf4f3bc47;hp=932b01c131c8bed8425bf9893f1ad3b0d6e07926;hpb=c1eb3099a1a7f4c9b9f8c6238336ee5b69147fd6;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_or.c b/lib/ecoli_node_or.c index 932b01c..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,79 +13,56 @@ #include #include #include +#include +#include #include #include #include +EC_LOG_TYPE_REGISTER(node_or); + struct ec_node_or { struct ec_node gen; struct ec_node **table; unsigned int len; }; -static struct ec_parsed *ec_node_or_parse(const struct ec_node *gen_node, - const struct ec_strvec *strvec) +static int +ec_node_or_parse(const struct ec_node *gen_node, + struct ec_parse *state, + const struct ec_strvec *strvec) { struct ec_node_or *node = (struct ec_node_or *)gen_node; - struct ec_parsed *parsed, *child_parsed = NULL; - struct ec_strvec *match_strvec; unsigned int i; - - parsed = ec_parsed(); - if (parsed == NULL) - goto fail; + int ret; for (i = 0; i < node->len; i++) { - child_parsed = ec_node_parse_strvec(node->table[i], strvec); - if (child_parsed == NULL) - goto fail; - if (ec_parsed_matches(child_parsed)) - break; - ec_parsed_free(child_parsed); - child_parsed = NULL; + ret = ec_node_parse_child(node->table[i], state, strvec); + if (ret == EC_PARSE_NOMATCH) + continue; + return ret; } - /* no match */ - if (i == node->len) - return parsed; - - match_strvec = ec_strvec_dup(child_parsed->strvec); - if (match_strvec == NULL) - goto fail; - - ec_parsed_set_match(parsed, gen_node, match_strvec); - ec_parsed_add_child(parsed, child_parsed); - - return parsed; - - fail: - ec_parsed_free(child_parsed); - ec_parsed_free(parsed); - return NULL; + return EC_PARSE_NOMATCH; } -static struct ec_completed *ec_node_or_complete(const struct ec_node *gen_node, - const struct ec_strvec *strvec) +static int +ec_node_or_complete(const struct ec_node *gen_node, + struct ec_comp *comp, + const struct ec_strvec *strvec) { struct ec_node_or *node = (struct ec_node_or *)gen_node; - struct ec_completed *completed, *child_completed; + int ret; size_t n; - completed = ec_completed(); - if (completed == NULL) - return NULL; - for (n = 0; n < node->len; n++) { - child_completed = ec_node_complete_strvec(node->table[n], - strvec); - - if (child_completed == NULL) // XXX fail instead? - continue; - - ec_completed_merge(completed, child_completed); + ret = ec_node_complete_child(node->table[n], + comp, strvec); + if (ret < 0) + return ret; } - return completed; + return 0; } static void ec_node_or_free_priv(struct ec_node *gen_node) @@ -121,6 +75,36 @@ 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); + 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; @@ -128,36 +112,30 @@ 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); - gen_node->flags &= ~EC_NODE_F_BUILT; + 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) { - ec_node_free(child); - return -1; - } + if (table == NULL) + goto fail; node->table = table; 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, - .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, ...) { @@ -198,72 +176,67 @@ fail: return NULL; } +/* LCOV_EXCL_START */ static int ec_node_or_testcase(void) { struct ec_node *node; - int ret = 0; + int testres = 0; - node = EC_NODE_OR(NULL, - ec_node_str(NULL, "foo"), - ec_node_str(NULL, "bar") + node = EC_NODE_OR(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, 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 */ - 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") + 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"); + 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, + "foo", "bar", "bar2", "toto", "titi", 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, "b", EC_NODE_ENDLIST, - "ar", "ar2", EC_NODE_ENDLIST, - "ar"); - ret |= EC_TEST_CHECK_COMPLETE(node, + "bar", "bar2", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "bar", EC_NODE_ENDLIST, - "", "2", EC_NODE_ENDLIST, - ""); - ret |= EC_TEST_CHECK_COMPLETE(node, + "bar", "bar2", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "t", EC_NODE_ENDLIST, - "oto", "iti", EC_NODE_ENDLIST, - ""); - ret |= EC_TEST_CHECK_COMPLETE(node, - "to", EC_NODE_ENDLIST, + "toto", "titi", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "to", EC_NODE_ENDLIST, - "to"); - ret |= EC_TEST_CHECK_COMPLETE(node, + "toto", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "x", EC_NODE_ENDLIST, - EC_NODE_ENDLIST, - ""); + EC_NODE_ENDLIST); ec_node_free(node); - return ret; + return testres; } +/* LCOV_EXCL_STOP */ static struct ec_test ec_node_or_test = { .name = "node_or",