X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_many.c;h=728f1c64f2b6c3b04344aa5dbaeb1761858be0cd;hb=8c1e15f7d7e507c02f41ef9c3dbe310005ce369f;hp=f0843b191e1b54c33d5241903b39a5168b6659d3;hpb=3fb134fdebe01585605b22f876114ad70fea1f8c;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_many.c b/lib/ecoli_node_many.c
index f0843b1..728f1c6 100644
--- a/lib/ecoli_node_many.c
+++ b/lib/ecoli_node_many.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>
@@ -37,12 +14,14 @@
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
-#include <ecoli_parsed.h>
-#include <ecoli_completed.h>
+#include <ecoli_parse.h>
+#include <ecoli_complete.h>
 #include <ecoli_node_str.h>
 #include <ecoli_node_option.h>
 #include <ecoli_node_many.h>
 
+EC_LOG_TYPE_REGISTER(node_many);
+
 struct ec_node_many {
 	struct ec_node gen;
 	unsigned int min;
@@ -51,11 +30,11 @@ struct ec_node_many {
 };
 
 static int ec_node_many_parse(const struct ec_node *gen_node,
-			struct ec_parsed *state,
+			struct ec_parse *state,
 			const struct ec_strvec *strvec)
 {
 	struct ec_node_many *node = (struct ec_node_many *)gen_node;
-	struct ec_parsed *child_parsed;
+	struct ec_parse *child_parse;
 	struct ec_strvec *childvec = NULL;
 	size_t off = 0, count;
 	int ret;
@@ -63,25 +42,24 @@ static int ec_node_many_parse(const struct ec_node *gen_node,
 	for (count = 0; node->max == 0 || count < node->max; count++) {
 		childvec = ec_strvec_ndup(strvec, off,
 			ec_strvec_len(strvec) - off);
-		if (childvec == NULL) {
-			ret = -ENOMEM;
+		if (childvec == NULL)
 			goto fail;
-		}
 
 		ret = ec_node_parse_child(node->child, state, childvec);
+		if (ret < 0)
+			goto fail;
+
 		ec_strvec_free(childvec);
 		childvec = NULL;
 
-		if (ret == EC_PARSED_NOMATCH)
+		if (ret == EC_PARSE_NOMATCH)
 			break;
-		else if (ret < 0)
-			goto fail;
 
 		/* it matches an empty strvec, no need to continue */
 		if (ret == 0) {
-			child_parsed = ec_parsed_get_last_child(state);
-			ec_parsed_del_child(state, child_parsed);
-			ec_parsed_free(child_parsed);
+			child_parse = ec_parse_get_last_child(state);
+			ec_parse_unlink_child(state, child_parse);
+			ec_parse_free(child_parse);
 			break;
 		}
 
@@ -89,87 +67,121 @@ static int ec_node_many_parse(const struct ec_node *gen_node,
 	}
 
 	if (count < node->min) {
-		ec_parsed_free_children(state);
-		return EC_PARSED_NOMATCH;
+		ec_parse_free_children(state);
+		return EC_PARSE_NOMATCH;
 	}
 
 	return off;
 
 fail:
 	ec_strvec_free(childvec);
-	return ret;
+	return -1;
 }
 
-#if 0 //XXX missing node_many_complete
-static struct ec_completed *ec_node_many_complete(const struct ec_node *gen_node,
-	const struct ec_strvec *strvec)
+static int
+__ec_node_many_complete(struct ec_node_many *node, unsigned int max,
+			struct ec_comp *comp,
+			const struct ec_strvec *strvec)
 {
-	struct ec_node_many *node = (struct ec_node_many *)gen_node;
-	struct ec_completed *completed, *child_completed;
-	struct ec_strvec *childvec;
-	struct ec_parsed *parsed;
-	size_t len = 0;
+	struct ec_parse *parse = ec_comp_get_state(comp);
+	struct ec_strvec *childvec = NULL;
 	unsigned int i;
+	int ret;
 
-	completed = ec_completed();
-	if (completed == NULL)
-		return NULL;
+	/* first, try to complete with the child node */
+	ret = ec_node_complete_child(node->child, comp, strvec);
+	if (ret < 0)
+		goto fail;
 
-	if (node->len == 0)
-		return completed;
+	/* we're done, we reached the max number of nodes */
+	if (max == 1)
+		return 0;
 
-	for (i = 0; i < node->len; i++) {
-		childvec = ec_strvec_ndup(strvec, len,
-			ec_strvec_len(strvec) - len);
-		if (childvec == NULL)
-			goto fail; // XXX fail ?
+	/* if there is a maximum, decrease it before recursion */
+	if (max != 0)
+		max--;
 
-		child_completed = ec_node_complete_strvec(node->table[i],
-			childvec);
-		if (child_completed == NULL)
+	/* then, if the node matches the beginning of the strvec, try to
+	 * complete the rest */
+	for (i = 0; i < ec_strvec_len(strvec); i++) {
+		childvec = ec_strvec_ndup(strvec, 0, i);
+		if (childvec == NULL)
 			goto fail;
 
-		ec_completed_merge(completed, child_completed);
-
-		parsed = ec_node_parse_strvec(node->table[i], childvec);
-		if (parsed == NULL)
+		ret = ec_node_parse_child(node->child, parse, childvec);
+		if (ret < 0)
 			goto fail;
 
 		ec_strvec_free(childvec);
 		childvec = NULL;
 
-		if (!ec_parsed_matches(parsed)) {
-			ec_parsed_free(parsed);
-			break;
+		if ((unsigned int)ret != i) {
+			if (ret != EC_PARSE_NOMATCH)
+				ec_parse_del_last_child(parse);
+			continue;
 		}
 
-		len += ec_strvec_len(parsed->strvec);
-		ec_parsed_free(parsed);
+		childvec = ec_strvec_ndup(strvec, i, ec_strvec_len(strvec) - i);
+		if (childvec == NULL) {
+			ec_parse_del_last_child(parse);
+			goto fail;
+		}
+
+		ret = __ec_node_many_complete(node, max, comp, childvec);
+		ec_parse_del_last_child(parse);
+		ec_strvec_free(childvec);
+		childvec = NULL;
+
+		if (ret < 0)
+			goto fail;
 	}
 
-	return completed;
+	return 0;
 
 fail:
 	ec_strvec_free(childvec);
-	ec_completed_free(completed);
-	return NULL;
+	return -1;
+}
+
+static int
+ec_node_many_complete(const struct ec_node *gen_node,
+		struct ec_comp *comp,
+		const struct ec_strvec *strvec)
+{
+	struct ec_node_many *node = (struct ec_node_many *)gen_node;
+
+	return __ec_node_many_complete(node, node->max,	comp,
+				strvec);
+}
+
+static size_t
+ec_node_many_get_children_count(const struct ec_node *gen_node)
+{
+	struct ec_node_many *node = (struct ec_node_many *)gen_node;
+
+	if (node->child)
+		return 1;
+	return 0;
 }
-#endif
 
-static void ec_node_many_free_priv(struct ec_node *gen_node)
+static struct ec_node *
+ec_node_many_get_child(const struct ec_node *gen_node, size_t i)
 {
 	struct ec_node_many *node = (struct ec_node_many *)gen_node;
 
-	ec_node_free(node->child);
+	if (i >= 1)
+		return NULL;
+
+	return node->child;
 }
 
 static struct ec_node_type ec_node_many_type = {
 	.name = "many",
 	.parse = ec_node_many_parse,
-	.complete = ec_node_default_complete,
-//XXX	.complete = ec_node_many_complete,
+	.complete = ec_node_many_complete,
 	.size = sizeof(struct ec_node_many),
-	.free_priv = ec_node_many_free_priv,
+	.get_children_count = ec_node_many_get_children_count,
+	.get_child = ec_node_many_get_child,
 };
 
 EC_NODE_TYPE_REGISTER(ec_node_many_type);
@@ -195,53 +207,82 @@ struct ec_node *ec_node_many(const char *id, struct ec_node *child,
 	return &node->gen;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_many_testcase(void)
 {
 	struct ec_node *node;
-	int ret = 0;
+	int testres = 0;
 
-	node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 0, 0);
+	node = ec_node_many(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 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, "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "foo", "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, 0);
+	testres |= EC_TEST_CHECK_PARSE(node, 0);
+	testres |= EC_TEST_CHECK_PARSE(node, 0, "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, 2, "foo", "foo", "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, 0);
 	ec_node_free(node);
 
-	node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 1, 0);
+	node = ec_node_many(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 1, 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, -1, "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "foo", "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, -1);
+	testres |= EC_TEST_CHECK_PARSE(node, -1, "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, 2, "foo", "foo", "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, -1);
 	ec_node_free(node);
 
-	node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 1, 2);
+	node = ec_node_many(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 1, 2);
 	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, "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "foo", "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "foo", "foo");
-	ret |= EC_TEST_CHECK_PARSE(node, -1);
+	testres |= EC_TEST_CHECK_PARSE(node, -1, "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, 2, "foo", "foo", "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, 2, "foo", "foo", "foo");
+	testres |= EC_TEST_CHECK_PARSE(node, -1);
 	ec_node_free(node);
 
 	/* test completion */
-	/* XXX */
+	node = ec_node_many(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 2, 4);
+	if (node == NULL) {
+		EC_LOG(EC_LOG_ERR, "cannot create node\n");
+		return -1;
+	}
+	testres |= EC_TEST_CHECK_COMPLETE(node,
+		"", EC_NODE_ENDLIST,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
+		"f", EC_NODE_ENDLIST,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
+		"foo", EC_NODE_ENDLIST,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
+		"foo", "", EC_NODE_ENDLIST,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
+		"foo", "foo", "", EC_NODE_ENDLIST,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
+		"foo", "foo", "foo", "", EC_NODE_ENDLIST,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
+		"foo", "foo", "foo", "foo", "", EC_NODE_ENDLIST,
+		EC_NODE_ENDLIST);
+	ec_node_free(node);
 
-	return ret;
+	return testres;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_many_test = {
-	.name = "many",
+	.name = "node_many",
 	.test = ec_node_many_testcase,
 };