-/*
- * Copyright (c) 2016-2017, Olivier MATZ <zer0@droids-corp.org>
- *
- * 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 <zer0@droids-corp.org>
*/
#include <stdio.h>
#include <ecoli_log.h>
#include <ecoli_strvec.h>
#include <ecoli_node.h>
-#include <ecoli_parsed.h>
-#include <ecoli_completed.h>
+#include <ecoli_parse.h>
+#include <ecoli_complete.h>
#include <ecoli_node_subset.h>
#include <ecoli_node_str.h>
#include <ecoli_node_or.h>
};
struct parse_result {
- size_t parsed_len; /* number of parsed node */
+ size_t parse_len; /* number of parsed nodes */
size_t len; /* consumed strings */
};
* 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)
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 */
if (ret < 0)
goto fail;
- if (ret == EC_PARSED_NOMATCH)
+ if (ret == EC_PARSE_NOMATCH)
continue;
/* build a new table without elt i */
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,
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));
*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;
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 int
__ec_node_subset_complete(struct ec_node **table, size_t table_len,
- 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;
struct ec_node *save;
size_t i, len;
continue;
ret = ec_node_complete_child(table[i],
- completed, strvec);
+ comp, strvec);
if (ret < 0)
goto fail;
}
if (table[i] == NULL)
continue;
- ret = ec_node_parse_child(table[i], parsed, strvec);
+ ret = ec_node_parse_child(table[i], parse, strvec);
if (ret < 0)
goto fail;
- if (ret == EC_PARSED_NOMATCH)
+ 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(parsed);
+ ec_parse_del_last_child(parse);
goto fail;
}
save = table[i];
table[i] = NULL;
ret = __ec_node_subset_complete(table, table_len,
- completed, childvec);
+ comp, childvec);
table[i] = save;
ec_strvec_free(childvec);
childvec = NULL;
- ec_parsed_del_last_child(parsed);
+ ec_parse_del_last_child(parse);
if (ret < 0)
goto fail;
static int
ec_node_subset_complete(const struct ec_node *gen_node,
- struct ec_completed *completed,
+ 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, completed,
+ 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;
+ }
+
+ 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) {
table[node->len] = child;
node->len++;
- 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, ...)
{
static int ec_node_subset_testcase(void)
{
struct ec_node *node;
- int ret = 0;
+ int testres = 0;
node = EC_NODE_SUBSET(EC_NO_ID,
EC_NODE_OR(EC_NO_ID,
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 */
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,
"", EC_NODE_ENDLIST,
"bar2", "bar", "foo", "toto", "titi", EC_NODE_ENDLIST);
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"bar", "bar2", "", EC_NODE_ENDLIST,
"foo", "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,
"bar", "b", EC_NODE_ENDLIST,
"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 */
git.droids-corp.org / protos / libecoli.git / blobdiff