#include <string.h>
#include <assert.h>
#include <stdarg.h>
+#include <errno.h>
#include <ecoli_malloc.h>
#include <ecoli_log.h>
#include <ecoli_strvec.h>
#include <ecoli_node.h>
-#include <ecoli_node_option.h>
+#include <ecoli_parsed.h>
+#include <ecoli_completed.h>
#include <ecoli_node_str.h>
#include <ecoli_test.h>
+#include <ecoli_node_option.h>
+
+EC_LOG_TYPE_REGISTER(node_option);
struct ec_node_option {
struct ec_node gen;
struct ec_node *child;
};
-static struct ec_parsed *ec_node_option_parse(const struct ec_node *gen_node,
- const struct ec_strvec *strvec)
+static int
+ec_node_option_parse(const struct ec_node *gen_node,
+ struct ec_parsed *state,
+ const struct ec_strvec *strvec)
{
struct ec_node_option *node = (struct ec_node_option *)gen_node;
- struct ec_parsed *parsed = NULL, *child_parsed;
- struct ec_strvec *match_strvec;
+ int ret;
- parsed = ec_parsed_new();
- if (parsed == NULL)
- goto fail;
+ ret = ec_node_parse_child(node->child, state, strvec);
+ if (ret < 0)
+ return ret;
- child_parsed = ec_node_parse_strvec(node->child, strvec);
- if (child_parsed == NULL)
- goto fail;
-
- if (ec_parsed_matches(child_parsed)) {
- ec_parsed_add_child(parsed, child_parsed);
- match_strvec = ec_strvec_dup(child_parsed->strvec);
- } else {
- ec_parsed_free(child_parsed);
- match_strvec = ec_strvec_new();
- }
-
- if (match_strvec == NULL)
- goto fail;
+ if (ret == EC_PARSED_NOMATCH)
+ return 0;
- ec_parsed_set_match(parsed, gen_node, match_strvec);
-
- return parsed;
-
- fail:
- ec_parsed_free(parsed);
- return NULL;
+ return ret;
}
-static struct ec_completed *ec_node_option_complete(const struct ec_node *gen_node,
- const struct ec_strvec *strvec)
+static int
+ec_node_option_complete(const struct ec_node *gen_node,
+ struct ec_completed *completed,
+ const struct ec_strvec *strvec)
{
struct ec_node_option *node = (struct ec_node_option *)gen_node;
- return ec_node_complete_strvec(node->child, strvec);
+ return ec_node_complete_child(node->child, completed, strvec);
}
static void ec_node_option_free_priv(struct ec_node *gen_node)
EC_NODE_TYPE_REGISTER(ec_node_option_type);
+int ec_node_option_set(struct ec_node *gen_node, struct ec_node *child)
+{
+ struct ec_node_option *node = (struct ec_node_option *)gen_node;
+
+ if (gen_node == NULL || child == NULL) {
+ errno = EINVAL;
+ goto fail;
+ }
+
+ if (ec_node_check_type(gen_node, &ec_node_option_type) < 0)
+ goto fail;
+
+ if (ec_node_add_child(gen_node, child) < 0)
+ goto fail;
+
+ node->child = child;
+
+ return 0;
+
+fail:
+ ec_node_free(child);
+ return -1;
+}
+
struct ec_node *ec_node_option(const char *id, struct ec_node *child)
{
struct ec_node *gen_node = NULL;
- struct ec_node_option *node = NULL;
if (child == NULL)
- return NULL;
+ goto fail;
- gen_node = __ec_node_new(&ec_node_option_type, id);
- if (gen_node == NULL) {
- ec_node_free(child);
- return NULL;
- }
- node = (struct ec_node_option *)gen_node;
+ gen_node = __ec_node(&ec_node_option_type, id);
+ if (gen_node == NULL)
+ goto fail;
- node->child = child;
+ ec_node_option_set(gen_node, child);
+ child = NULL;
- child->parent = gen_node;
- TAILQ_INSERT_TAIL(&gen_node->children, child, next);
+ return gen_node;
- return &node->gen;
+fail:
+ ec_node_free(child);
+ return NULL;
}
+/* LCOV_EXCL_START */
static int ec_node_option_testcase(void)
{
struct ec_node *node;
- int ret = 0;
+ int testres = 0;
- node = ec_node_option(NULL, ec_node_str(NULL, "foo"));
+ node = ec_node_option(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"));
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, 1, "foo");
- ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
- ret |= EC_TEST_CHECK_PARSE(node, 0, "bar");
- ret |= EC_TEST_CHECK_PARSE(node, 0);
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "foo");
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
+ testres |= EC_TEST_CHECK_PARSE(node, 0, "bar");
+ testres |= EC_TEST_CHECK_PARSE(node, 0);
ec_node_free(node);
/* test completion */
- node = ec_node_option(NULL, ec_node_str(NULL, "foo"));
+ node = ec_node_option(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"));
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", EC_NODE_ENDLIST,
- "foo");
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ "foo", 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,
- EC_NODE_ENDLIST,
- "");
+ EC_NODE_ENDLIST);
ec_node_free(node);
- return ret;
+ return testres;
}
+/* LCOV_EXCL_STOP */
static struct ec_test ec_node_option_test = {
.name = "node_option",
git.droids-corp.org / protos / libecoli.git / blobdiff