-/*
- * Copyright (c) 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 2017, Olivier MATZ <zer0@droids-corp.org>
*/
#include <stdio.h>
#include <ecoli_strvec.h>
#include <ecoli_keyval.h>
#include <ecoli_node.h>
-#include <ecoli_parsed.h>
-#include <ecoli_completed.h>
+#include <ecoli_parse.h>
+#include <ecoli_complete.h>
#include <ecoli_string.h>
#include <ecoli_node_str.h>
#include <ecoli_node_many.h>
static int
ec_node_dynamic_parse(const struct ec_node *gen_node,
- struct ec_parsed *parsed,
+ struct ec_parse *parse,
const struct ec_strvec *strvec)
{
struct ec_node_dynamic *node = (struct ec_node_dynamic *)gen_node;
char key[64];
int ret = -1;
- child = node->build(parsed, node->opaque);
+ child = node->build(parse, node->opaque);
if (child == NULL)
goto fail;
/* add the node pointer in the attributes, so it will be freed
- * when parsed is freed */
+ * when parse is freed */
snprintf(key, sizeof(key), "_dyn_%p", child);
- ret = ec_keyval_set(ec_parsed_get_attrs(parsed), key, child,
+ ret = ec_keyval_set(ec_parse_get_attrs(parse), key, child,
(void *)node_free);
if (ret < 0) {
child = NULL; /* already freed */
goto fail;
}
- return ec_node_parse_child(child, parsed, strvec);
+ return ec_node_parse_child(child, parse, strvec);
fail:
ec_node_free(child);
static int
ec_node_dynamic_complete(const struct ec_node *gen_node,
- struct ec_completed *completed,
+ struct ec_comp *comp,
const struct ec_strvec *strvec)
{
struct ec_node_dynamic *node = (struct ec_node_dynamic *)gen_node;
- struct ec_parsed *parsed;
+ struct ec_parse *parse;
struct ec_node *child = NULL;
void (*node_free)(struct ec_node *) = ec_node_free;
char key[64];
int ret = -1;
- parsed = ec_completed_get_state(completed);
- child = node->build(parsed, node->opaque);
+ parse = ec_comp_get_state(comp);
+ child = node->build(parse, node->opaque);
if (child == NULL)
goto fail;
/* add the node pointer in the attributes, so it will be freed
- * when parsed is freed */
+ * when parse is freed */
snprintf(key, sizeof(key), "_dyn_%p", child);
- ret = ec_keyval_set(completed->attrs, key, child,
+ ret = ec_keyval_set(comp->attrs, key, child,
(void *)node_free);
if (ret < 0) {
child = NULL; /* already freed */
goto fail;
}
- return ec_node_complete_child(child, completed, strvec);
+ return ec_node_complete_child(child, comp, strvec);
fail:
ec_node_free(child);
goto fail;
}
- gen_node = __ec_node(&ec_node_dynamic_type, id);
+ gen_node = ec_node_from_type(&ec_node_dynamic_type, id);
if (gen_node == NULL)
goto fail;
EC_NODE_TYPE_REGISTER(ec_node_dynamic_type);
static struct ec_node *
-build_counter(struct ec_parsed *parsed, void *opaque)
+build_counter(struct ec_parse *parse, void *opaque)
{
const struct ec_node *node;
- struct ec_parsed *iter;
+ struct ec_parse *iter;
unsigned int count = 0;
char buf[32];
(void)opaque;
- for (iter = ec_parsed_get_root(parsed); iter != NULL;
- iter = ec_parsed_iter_next(iter)) {
- node = ec_parsed_get_node(iter);
+ for (iter = ec_parse_get_root(parse); iter != NULL;
+ iter = ec_parse_iter_next(iter)) {
+ node = ec_parse_get_node(iter);
if (node->id && !strcmp(node->id, "my-id"))
count++;
}
static int ec_node_dynamic_testcase(void)
{
struct ec_node *node;
- int ret = 0;
+ int testres = 0;
node = ec_node_many(EC_NO_ID,
ec_node_dynamic(EC_NO_ID, build_counter, NULL),
EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;
}
- ret |= EC_TEST_CHECK_PARSE(node, 1, "count-0");
- ret |= EC_TEST_CHECK_PARSE(node, 3, "count-0", "count-1", "count-2");
- ret |= EC_TEST_CHECK_PARSE(node, 1, "count-0", "count-0");
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "count-0");
+ testres |= EC_TEST_CHECK_PARSE(node, 3, "count-0", "count-1", "count-2");
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "count-0", "count-0");
/* test completion */
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"c", EC_NODE_ENDLIST,
"count-0", EC_NODE_ENDLIST);
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"count-0", "", EC_NODE_ENDLIST,
"count-1", EC_NODE_ENDLIST,
"count-1");
ec_node_free(node);
- return ret;
+ return testres;
}
/* LCOV_EXCL_STOP */
git.droids-corp.org / protos / libecoli.git / blobdiff