X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_subset.c;h=059b7b97197e7c0fd4b3617fd294027b4297d3b4;hb=7c07e2a8b3b5851de0c238da830291f041185778;hp=599c76166627d5aa18b0278e97c0fd5627763bd1;hpb=5510aae15debf26e0e0b07732f6fd041fd53acb6;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_subset.c b/lib/ecoli_node_subset.c index 599c761..059b7b9 100644 --- a/lib/ecoli_node_subset.c +++ b/lib/ecoli_node_subset.c @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2016-2017, 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,13 +14,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include +EC_LOG_TYPE_REGISTER(node_subset); + struct ec_node_subset { struct ec_node gen; struct ec_node **table; @@ -51,7 +30,7 @@ struct ec_node_subset { }; struct parse_result { - size_t parsed_len; /* number of parsed node */ + size_t parse_len; /* number of parsed nodes */ size_t len; /* consumed strings */ }; @@ -59,14 +38,14 @@ struct parse_result { * updated accordingly. */ static int __ec_node_subset_parse(struct parse_result *out, struct ec_node **table, - size_t table_len, struct ec_parsed *state, + size_t table_len, struct ec_parse *state, const struct ec_strvec *strvec) { struct ec_node **child_table; struct ec_strvec *childvec = NULL; size_t i, j, len = 0; struct parse_result best_result, result; - struct ec_parsed *best_parsed = NULL; + struct ec_parse *best_parse = NULL; int ret; if (table_len == 0) @@ -75,19 +54,18 @@ __ec_node_subset_parse(struct parse_result *out, struct ec_node **table, memset(&best_result, 0, sizeof(best_result)); child_table = ec_calloc(table_len - 1, sizeof(*child_table)); - if (child_table == NULL) { - ret = -ENOMEM; + if (child_table == NULL) goto fail; - } for (i = 0; i < table_len; i++) { /* try to parse elt i */ ret = ec_node_parse_child(table[i], state, strvec); - if (ret == EC_PARSED_NOMATCH) - continue; - else if (ret < 0) + if (ret < 0) goto fail; + if (ret == EC_PARSE_NOMATCH) + continue; + /* build a new table without elt i */ for (j = 0; j < table_len; j++) { if (j < i) @@ -100,10 +78,8 @@ __ec_node_subset_parse(struct parse_result *out, struct ec_node **table, len = ret; childvec = ec_strvec_ndup(strvec, len, ec_strvec_len(strvec) - len); - if (childvec == NULL) { - ret = -ENOMEM; + if (childvec == NULL) goto fail; - } memset(&result, 0, sizeof(result)); ret = __ec_node_subset_parse(&result, child_table, @@ -114,18 +90,18 @@ __ec_node_subset_parse(struct parse_result *out, struct ec_node **table, goto fail; /* if result is not the best, ignore */ - if (result.parsed_len < best_result.parsed_len) { + if (result.parse_len < best_result.parse_len) { memset(&result, 0, sizeof(result)); - ec_parsed_del_last_child(state); + ec_parse_del_last_child(state); continue; } /* replace the previous best result */ - ec_parsed_free(best_parsed); - best_parsed = ec_parsed_get_last_child(state); - ec_parsed_del_child(state, best_parsed); + ec_parse_free(best_parse); + best_parse = ec_parse_get_last_child(state); + ec_parse_unlink_child(state, best_parse); - best_result.parsed_len = result.parsed_len + 1; + best_result.parse_len = result.parse_len + 1; best_result.len = len + result.len; memset(&result, 0, sizeof(result)); @@ -133,25 +109,25 @@ __ec_node_subset_parse(struct parse_result *out, struct ec_node **table, *out = best_result; ec_free(child_table); - if (best_parsed != NULL) - ec_parsed_add_child(state, best_parsed); + if (best_parse != NULL) + ec_parse_link_child(state, best_parse); return 0; fail: - ec_parsed_free(best_parsed); + ec_parse_free(best_parse); ec_strvec_free(childvec); ec_free(child_table); - return ret; + return -1; } static int ec_node_subset_parse(const struct ec_node *gen_node, - struct ec_parsed *state, + struct ec_parse *state, const struct ec_strvec *strvec) { struct ec_node_subset *node = (struct ec_node_subset *)gen_node; - struct ec_parsed *parsed = NULL; + struct ec_parse *parse = NULL; struct parse_result result; int ret; @@ -163,24 +139,23 @@ ec_node_subset_parse(const struct ec_node *gen_node, goto fail; /* if no child node matches, return a matching empty strvec */ - if (result.parsed_len == 0) + if (result.parse_len == 0) return 0; return result.len; fail: - ec_parsed_free(parsed); + ec_parse_free(parse); return ret; } -static struct ec_completed * +static int __ec_node_subset_complete(struct ec_node **table, size_t table_len, - struct ec_parsed *state, const struct ec_strvec *strvec) + struct ec_comp *comp, + const struct ec_strvec *strvec) { - struct ec_completed *completed = NULL; - struct ec_completed *child_completed = NULL; + struct ec_parse *parse = ec_comp_get_state(comp); struct ec_strvec *childvec = NULL; - struct ec_parsed *parsed = NULL; struct ec_node *save; size_t i, len; int ret; @@ -194,23 +169,15 @@ __ec_node_subset_complete(struct ec_node **table, size_t table_len, * + __subset_complete([a, b], childvec) if c matches */ - completed = ec_completed(); - if (completed == NULL) - goto fail; - /* first, try to complete with each node of the table */ for (i = 0; i < table_len; i++) { if (table[i] == NULL) continue; - child_completed = ec_node_complete_child(table[i], - state, strvec); - - if (child_completed == NULL) + ret = ec_node_complete_child(table[i], + comp, strvec); + if (ret < 0) goto fail; - - ec_completed_merge(completed, child_completed); - child_completed = NULL; } /* then, if a node matches, advance in strvec and try to complete with @@ -219,79 +186,105 @@ __ec_node_subset_complete(struct ec_node **table, size_t table_len, if (table[i] == NULL) continue; - ret = ec_node_parse_child(table[i], state, strvec); - if (ret == EC_PARSED_NOMATCH) - continue; - else if (ret < 0) + ret = ec_node_parse_child(table[i], parse, strvec); + if (ret < 0) goto fail; + if (ret == EC_PARSE_NOMATCH) + continue; + len = ret; childvec = ec_strvec_ndup(strvec, len, ec_strvec_len(strvec) - len); if (childvec == NULL) { - ec_parsed_del_last_child(state); + ec_parse_del_last_child(parse); goto fail; } save = table[i]; table[i] = NULL; - child_completed = __ec_node_subset_complete(table, table_len, - state, childvec); + ret = __ec_node_subset_complete(table, table_len, + comp, childvec); table[i] = save; ec_strvec_free(childvec); childvec = NULL; - ec_parsed_del_last_child(state); + ec_parse_del_last_child(parse); - if (child_completed == NULL) + if (ret < 0) goto fail; - - ec_completed_merge(completed, child_completed); - child_completed = NULL; - - ec_parsed_free(parsed); - parsed = NULL; } - return completed; -fail: - ec_parsed_free(parsed); - ec_completed_free(child_completed); - ec_completed_free(completed); + return 0; - return NULL; +fail: + return -1; } -static struct ec_completed * +static int ec_node_subset_complete(const struct ec_node *gen_node, - struct ec_parsed *state, + struct ec_comp *comp, const struct ec_strvec *strvec) { struct ec_node_subset *node = (struct ec_node_subset *)gen_node; - return __ec_node_subset_complete(node->table, node->len, state, strvec); + return __ec_node_subset_complete(node->table, node->len, comp, + strvec); } static void ec_node_subset_free_priv(struct ec_node *gen_node) { struct ec_node_subset *node = (struct ec_node_subset *)gen_node; - unsigned int i; + size_t i; for (i = 0; i < node->len; i++) ec_node_free(node->table[i]); ec_free(node->table); } +static size_t +ec_node_subset_get_children_count(const struct ec_node *gen_node) +{ + struct ec_node_subset *node = (struct ec_node_subset *)gen_node; + return node->len; +} + +static struct ec_node * +ec_node_subset_get_child(const struct ec_node *gen_node, size_t i) +{ + struct ec_node_subset *node = (struct ec_node_subset *)gen_node; + + if (i >= node->len) + return NULL; + + return node->table[i]; +} + +static struct ec_node_type ec_node_subset_type = { + .name = "subset", + .parse = ec_node_subset_parse, + .complete = ec_node_subset_complete, + .size = sizeof(struct ec_node_subset), + .free_priv = ec_node_subset_free_priv, + .get_children_count = ec_node_subset_get_children_count, + .get_child = ec_node_subset_get_child, +}; + +EC_NODE_TYPE_REGISTER(ec_node_subset_type); + int ec_node_subset_add(struct ec_node *gen_node, struct ec_node *child) { struct ec_node_subset *node = (struct ec_node_subset *)gen_node; struct ec_node **table; - assert(node != NULL); + assert(node != NULL); // XXX specific assert for it, like in libyang - if (child == NULL) - return -EINVAL; + if (child == NULL) { + errno = EINVAL; + goto fail; + } - gen_node->flags &= ~EC_NODE_F_BUILT; + if (ec_node_check_type(gen_node, &ec_node_subset_type) < 0) + goto fail; table = ec_realloc(node->table, (node->len + 1) * sizeof(*node->table)); if (table == NULL) { @@ -303,21 +296,12 @@ int ec_node_subset_add(struct ec_node *gen_node, struct ec_node *child) 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_subset_type = { - .name = "subset", - .parse = ec_node_subset_parse, - .complete = ec_node_subset_complete, - .size = sizeof(struct ec_node_subset), - .free_priv = ec_node_subset_free_priv, -}; - -EC_NODE_TYPE_REGISTER(ec_node_subset_type); +fail: + ec_node_free(child); + return -1; +} struct ec_node *__ec_node_subset(const char *id, ...) { @@ -362,82 +346,76 @@ fail: static int ec_node_subset_testcase(void) { struct ec_node *node; - int ret = 0; - - node = EC_NODE_SUBSET(NULL, - EC_NODE_OR(NULL, - ec_node_str(NULL, "foo"), - ec_node_str(NULL, "bar")), - ec_node_str(NULL, "bar"), - ec_node_str(NULL, "toto") + int testres = 0; + + node = EC_NODE_SUBSET(EC_NO_ID, + 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, "bar"), + ec_node_str(EC_NO_ID, "toto") ); 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", "titi"); - ret |= EC_TEST_CHECK_PARSE(node, 3, "bar", "foo", "toto"); - ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "foo"); - ret |= EC_TEST_CHECK_PARSE(node, 2, "bar", "bar"); - ret |= EC_TEST_CHECK_PARSE(node, 2, "bar", "foo"); - ret |= EC_TEST_CHECK_PARSE(node, 0, " "); - ret |= EC_TEST_CHECK_PARSE(node, 0, "foox"); + 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", "titi"); + testres |= EC_TEST_CHECK_PARSE(node, 3, "bar", "foo", "toto"); + testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "foo"); + testres |= EC_TEST_CHECK_PARSE(node, 2, "bar", "bar"); + testres |= EC_TEST_CHECK_PARSE(node, 2, "bar", "foo"); + testres |= EC_TEST_CHECK_PARSE(node, 0, " "); + testres |= EC_TEST_CHECK_PARSE(node, 0, "foox"); ec_node_free(node); /* test completion */ - node = EC_NODE_SUBSET(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_SUBSET(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); + testres |= EC_TEST_CHECK_COMPLETE(node, "", EC_NODE_ENDLIST, - "foo", "bar", "bar2", "toto", "titi", EC_NODE_ENDLIST, - ""); - ret |= EC_TEST_CHECK_COMPLETE(node, + "bar2", "bar", "foo", "toto", "titi", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "bar", "bar2", "", EC_NODE_ENDLIST, - "foo", "toto", "titi", EC_NODE_ENDLIST, - ""); - ret |= EC_TEST_CHECK_COMPLETE(node, + "foo", "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, "bar", "b", EC_NODE_ENDLIST, - "ar2", EC_NODE_ENDLIST, - "ar2"); - ret |= EC_TEST_CHECK_COMPLETE(node, + "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, + "toto", "titi", EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, "to", EC_NODE_ENDLIST, - "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 */