#include <ecoli_node_many.h>
#include <ecoli_node_once.h>
+EC_LOG_TYPE_REGISTER(node_once);
+
struct ec_node_once {
struct ec_node gen;
struct ec_node *child;
if (parsed == NULL)
return 0;
- if (parsed->node == node)
+ if (ec_parsed_get_node(parsed) == node)
count++;
- TAILQ_FOREACH(child, &parsed->children, next)
+ EC_PARSED_FOREACH_CHILD(child, parsed)
count += count_node(child, node);
return count;
return ec_node_parse_child(node->child, state, strvec);
}
-static struct ec_completed *
+static int
ec_node_once_complete(const struct ec_node *gen_node,
- struct ec_parsed *state,
+ struct ec_completed *completed,
const struct ec_strvec *strvec)
{
struct ec_node_once *node = (struct ec_node_once *)gen_node;
- struct ec_completed *completed = NULL, *child_completed = NULL;
+ struct ec_parsed *parsed = ec_completed_get_state(completed);
unsigned int count;
-
- completed = ec_completed();
- if (completed == NULL)
- goto fail;
+ int ret;
/* count the number of occurences of the node: if already parsed,
* do not match
*/
- count = count_node(ec_parsed_get_root(state), node->child); //XXX
+ count = count_node(ec_parsed_get_root(parsed), node->child);
if (count > 0)
- return completed;
-
- child_completed = ec_node_complete_child(node->child, state, strvec);
- if (child_completed == NULL)
- goto fail;
+ return 0;
- ec_completed_merge(completed, child_completed);
- return completed;
+ ret = ec_node_complete_child(node->child, completed, strvec);
+ if (ret < 0)
+ return ret;
-fail:
- ec_completed_free(completed);
- return NULL;
+ return 0;
}
static void ec_node_once_free_priv(struct ec_node *gen_node)
{
struct ec_node_once *node = (struct ec_node_once *)gen_node;
- // XXX check node type
-
- assert(node != NULL);
+ if (gen_node == NULL || child == NULL) {
+ errno = EINVAL;
+ goto fail;
+ }
- if (child == NULL)
- return -EINVAL;
+ if (ec_node_check_type(gen_node, &ec_node_once_type) < 0)
+ goto fail;
- gen_node->flags &= ~EC_NODE_F_BUILT;
+ if (ec_node_add_child(gen_node, child) < 0)
+ goto fail;
node->child = child;
- child->parent = gen_node;
- TAILQ_INSERT_TAIL(&gen_node->children, child, next); // XXX really needed?
-
return 0;
+
+fail:
+ ec_node_free(child);
+ return -1;
}
struct ec_node *ec_node_once(const char *id, struct ec_node *child)
gen_node = __ec_node(&ec_node_once_type, id);
if (gen_node == NULL)
- return NULL;
+ goto fail;
ec_node_once_set(gen_node, child);
+ child = NULL;
return gen_node;
+
+fail:
+ ec_node_free(child);
+ return NULL;
}
/* LCOV_EXCL_START */
struct ec_node *node;
int ret = 0;
- node = ec_node_many(NULL,
- EC_NODE_OR(NULL,
- ec_node_once(NULL, ec_node_str(NULL, "foo")),
- ec_node_str(NULL, "bar")
+ node = ec_node_many(EC_NO_ID,
+ EC_NODE_OR(EC_NO_ID,
+ ec_node_once(EC_NO_ID, ec_node_str(EC_NO_ID, "foo")),
+ ec_node_str(EC_NO_ID, "bar")
), 0, 0
);
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", "foo");
ret |= EC_TEST_CHECK_PARSE(node, 0, "foox");
- ec_node_free(node);
-
-#if 0 //XXX no completion test for node_once
- /* test completion */
- node = EC_NODE_OR(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")
- );
- if (node == NULL) {
- ec_log(EC_LOG_ERR, "cannot create node\n");
- return -1;
- }
ret |= EC_TEST_CHECK_COMPLETE(node,
"", EC_NODE_ENDLIST,
- "foo", "bar", "bar2", "toto", "titi", EC_NODE_ENDLIST,
- "");
+ "foo", "bar", EC_NODE_ENDLIST);
ret |= EC_TEST_CHECK_COMPLETE(node,
"f", EC_NODE_ENDLIST,
- "oo", EC_NODE_ENDLIST,
- "oo");
+ "foo", EC_NODE_ENDLIST);
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "b", EC_NODE_ENDLIST,
+ "bar", EC_NODE_ENDLIST);
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "foo", "", EC_NODE_ENDLIST,
+ "bar", EC_NODE_ENDLIST);
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "bar", "", EC_NODE_ENDLIST,
+ "foo", "bar", EC_NODE_ENDLIST);
ec_node_free(node);
-#endif
+
return ret;
}
/* LCOV_EXCL_STOP */