-/*
- * 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_node_or.h>
#include <ecoli_test.h>
+EC_LOG_TYPE_REGISTER(node_subset);
+
struct ec_node_subset {
struct ec_node gen;
struct ec_node **table;
for (i = 0; i < table_len; i++) {
/* try to parse elt i */
ret = ec_node_parse_child(table[i], state, strvec);
+ if (ret < 0)
+ goto fail;
+
if (ret == EC_PARSED_NOMATCH)
continue;
- else if (ret < 0)
- goto fail;
/* build a new table without elt i */
for (j = 0; j < table_len; j++) {
static int
__ec_node_subset_complete(struct ec_node **table, size_t table_len,
struct ec_completed *completed,
- struct ec_parsed *parsed,
const struct ec_strvec *strvec)
{
+ struct ec_parsed *parsed = ec_completed_get_state(completed);
struct ec_strvec *childvec = NULL;
struct ec_node *save;
size_t i, len;
continue;
ret = ec_node_complete_child(table[i],
- completed, parsed, strvec);
+ completed, strvec);
if (ret < 0)
goto fail;
}
continue;
ret = ec_node_parse_child(table[i], parsed, strvec);
+ if (ret < 0)
+ goto fail;
+
if (ret == EC_PARSED_NOMATCH)
continue;
- else if (ret < 0)
- goto fail;
len = ret;
childvec = ec_strvec_ndup(strvec, len,
save = table[i];
table[i] = NULL;
ret = __ec_node_subset_complete(table, table_len,
- completed, parsed, childvec);
+ completed, childvec);
table[i] = save;
ec_strvec_free(childvec);
childvec = NULL;
static int
ec_node_subset_complete(const struct ec_node *gen_node,
struct ec_completed *completed,
- struct ec_parsed *parsed,
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,
- parsed, strvec);
+ strvec);
}
static void ec_node_subset_free_priv(struct ec_node *gen_node)
ec_free(node->table);
}
+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);
+
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) {
}
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_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;
-
- 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);
- 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