X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_many.c;h=7748045835d82df80554d117382882f902bf0ba1;hb=38e5638bb3b4e2e8a409184d4f07977594a5e773;hp=33f50cbcd0c8e27b11a975739a69fb2b14ba5521;hpb=665f6b9392d6a6b37bc55e59437a6fa02cd9006c;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_many.c b/lib/ecoli_node_many.c index 33f50cb..7748045 100644 --- a/lib/ecoli_node_many.c +++ b/lib/ecoli_node_many.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 @@ -53,11 +30,11 @@ struct ec_node_many { }; static int ec_node_many_parse(const struct ec_node *gen_node, - struct ec_parsed *state, + struct ec_parse *state, const struct ec_strvec *strvec) { struct ec_node_many *node = (struct ec_node_many *)gen_node; - struct ec_parsed *child_parsed; + struct ec_parse *child_parse; struct ec_strvec *childvec = NULL; size_t off = 0, count; int ret; @@ -77,14 +54,14 @@ static int ec_node_many_parse(const struct ec_node *gen_node, ec_strvec_free(childvec); childvec = NULL; - if (ret == EC_PARSED_NOMATCH) + if (ret == EC_PARSE_NOMATCH) break; /* it matches an empty strvec, no need to continue */ if (ret == 0) { - child_parsed = ec_parsed_get_last_child(state); - ec_parsed_del_child(state, child_parsed); - ec_parsed_free(child_parsed); + child_parse = ec_parse_get_last_child(state); + ec_parse_unlink_child(state, child_parse); + ec_parse_free(child_parse); break; } @@ -92,8 +69,8 @@ static int ec_node_many_parse(const struct ec_node *gen_node, } if (count < node->min) { - ec_parsed_free_children(state); - return EC_PARSED_NOMATCH; + ec_parse_free_children(state); + return EC_PARSE_NOMATCH; } return off; @@ -105,16 +82,16 @@ fail: static int __ec_node_many_complete(struct ec_node_many *node, unsigned int max, - struct ec_completed *completed, + struct ec_comp *comp, const struct ec_strvec *strvec) { - struct ec_parsed *parsed = ec_completed_get_state(completed); + struct ec_parse *parse = ec_comp_get_state(comp); struct ec_strvec *childvec = NULL; unsigned int i; int ret; /* first, try to complete with the child node */ - ret = ec_node_complete_child(node->child, completed, strvec); + ret = ec_node_complete_child(node->child, comp, strvec); if (ret < 0) goto fail; @@ -133,7 +110,7 @@ __ec_node_many_complete(struct ec_node_many *node, unsigned int max, if (childvec == NULL) goto fail; - ret = ec_node_parse_child(node->child, parsed, childvec); + ret = ec_node_parse_child(node->child, parse, childvec); if (ret < 0) goto fail; @@ -141,19 +118,19 @@ __ec_node_many_complete(struct ec_node_many *node, unsigned int max, childvec = NULL; if ((unsigned int)ret != i) { - if (ret != EC_PARSED_NOMATCH) - ec_parsed_del_last_child(parsed); + if (ret != EC_PARSE_NOMATCH) + ec_parse_del_last_child(parse); continue; } childvec = ec_strvec_ndup(strvec, i, ec_strvec_len(strvec) - i); if (childvec == NULL) { - ec_parsed_del_last_child(parsed); + ec_parse_del_last_child(parse); goto fail; } - ret = __ec_node_many_complete(node, max, completed, childvec); - ec_parsed_del_last_child(parsed); + ret = __ec_node_many_complete(node, max, comp, childvec); + ec_parse_del_last_child(parse); ec_strvec_free(childvec); childvec = NULL; @@ -170,12 +147,12 @@ fail: static int ec_node_many_complete(const struct ec_node *gen_node, - struct ec_completed *completed, + struct ec_comp *comp, const struct ec_strvec *strvec) { struct ec_node_many *node = (struct ec_node_many *)gen_node; - return __ec_node_many_complete(node, node->max, completed, + return __ec_node_many_complete(node, node->max, comp, strvec); }