X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_option.c;h=b4bb391d8c4b2fbd319307881228d5c0b7d756b8;hb=8c1e15f7d7e507c02f41ef9c3dbe310005ce369f;hp=01665b47867cf7df6943c78c804ab8975143aa98;hpb=c1eb3099a1a7f4c9b9f8c6238336ee5b69147fd6;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_option.c b/lib/ecoli_node_option.c
index 01665b4..b4bb391 100644
--- a/lib/ecoli_node_option.c
+++ b/lib/ecoli_node_option.c
@@ -1,28 +1,5 @@
-/*
- * Copyright (c) 2016, 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>
@@ -30,68 +7,72 @@
 #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_parse.h>
+#include <ecoli_complete.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_parse *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;
-
-	parsed = ec_parsed();
-	if (parsed == NULL)
-		goto fail;
+	int ret;
 
-	child_parsed = ec_node_parse_strvec(node->child, strvec);
-	if (child_parsed == NULL)
-		goto fail;
+	ret = ec_node_parse_child(node->child, state, strvec);
+	if (ret < 0)
+		return ret;
 
-	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();
-	}
+	if (ret == EC_PARSE_NOMATCH)
+		return 0;
 
-	if (match_strvec == NULL)
-		goto fail;
-
-	ec_parsed_set_match(parsed, gen_node, match_strvec);
+	return ret;
+}
 
-	return parsed;
+static int
+ec_node_option_complete(const struct ec_node *gen_node,
+			struct ec_comp *comp,
+			const struct ec_strvec *strvec)
+{
+	struct ec_node_option *node = (struct ec_node_option *)gen_node;
 
- fail:
-	ec_parsed_free(parsed);
-	return NULL;
+	return ec_node_complete_child(node->child, comp, strvec);
 }
 
-static struct ec_completed *ec_node_option_complete(const struct ec_node *gen_node,
-	const struct ec_strvec *strvec)
+static size_t
+ec_node_option_get_children_count(const struct ec_node *gen_node)
 {
 	struct ec_node_option *node = (struct ec_node_option *)gen_node;
 
-	return ec_node_complete_strvec(node->child, strvec);
+	if (node->child)
+		return 1;
+	return 0;
 }
 
-static void ec_node_option_free_priv(struct ec_node *gen_node)
+static struct ec_node *
+ec_node_option_get_child(const struct ec_node *gen_node, size_t i)
 {
 	struct ec_node_option *node = (struct ec_node_option *)gen_node;
 
-	ec_node_free(node->child);
+	if (i >= 1)
+		return NULL;
+
+	return node->child;
 }
 
 static struct ec_node_type ec_node_option_type = {
@@ -99,72 +80,91 @@ static struct ec_node_type ec_node_option_type = {
 	.parse = ec_node_option_parse,
 	.complete = ec_node_option_complete,
 	.size = sizeof(struct ec_node_option),
-	.free_priv = ec_node_option_free_priv,
+	.get_children_count = ec_node_option_get_children_count,
+	.get_child = ec_node_option_get_child,
 };
 
 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;
+
+	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(&ec_node_option_type, id);
-	if (gen_node == NULL) {
-		ec_node_free(child);
-		return NULL;
-	}
-	node = (struct ec_node_option *)gen_node;
+	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",