X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_many.c;h=60256ef7006ee115a40005aae75031c9ea97d342;hb=6a40004beef80306d5f7dcea9febec948adf6d50;hp=31d0eb27182334b73e338a5ea0944b848e9d790a;hpb=b058e053d494129ee861cd2ca1e0ea9a0cc9814f;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_many.c b/lib/ecoli_node_many.c
index 31d0eb2..60256ef 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,8 +14,8 @@
 #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>
@@ -53,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;
@@ -65,10 +42,8 @@ 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)
@@ -77,14 +52,14 @@ static int ec_node_many_parse(const struct ec_node *gen_node,
 		ec_strvec_free(childvec);
 		childvec = NULL;
 
-		if (ret == EC_PARSED_NOMATCH)
+		if (ret == EC_PARSE_NOMATCH)
 			break;
 
 		/* 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;
 		}
 
@@ -92,29 +67,29 @@ 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;
 }
 
 static int
 __ec_node_many_complete(struct ec_node_many *node, unsigned int max,
-			struct ec_completed *completed,
+			struct ec_comp *comp,
 			const struct ec_strvec *strvec)
 {
-	struct ec_parsed *parsed = ec_completed_get_state(completed);
+	struct ec_parse *parse = ec_comp_get_state(comp);
 	struct ec_strvec *childvec = NULL;
 	unsigned int i;
 	int ret;
 
 	/* first, try to complete with the child node */
-	ret = ec_node_complete_child(node->child, completed, strvec);
+	ret = ec_node_complete_child(node->child, comp, strvec);
 	if (ret < 0)
 		goto fail;
 
@@ -133,7 +108,7 @@ __ec_node_many_complete(struct ec_node_many *node, unsigned int max,
 		if (childvec == NULL)
 			goto fail;
 
-		ret = ec_node_parse_child(node->child, parsed, childvec);
+		ret = ec_node_parse_child(node->child, parse, childvec);
 		if (ret < 0)
 			goto fail;
 
@@ -141,19 +116,19 @@ __ec_node_many_complete(struct ec_node_many *node, unsigned int max,
 		childvec = NULL;
 
 		if ((unsigned int)ret != i) {
-			if (ret != EC_PARSED_NOMATCH)
-				ec_parsed_del_last_child(parsed);
+			if (ret != EC_PARSE_NOMATCH)
+				ec_parse_del_last_child(parse);
 			continue;
 		}
 
 		childvec = ec_strvec_ndup(strvec, i, ec_strvec_len(strvec) - i);
 		if (childvec == NULL) {
-			ec_parsed_del_last_child(parsed);
+			ec_parse_del_last_child(parse);
 			goto fail;
 		}
 
-		ret = __ec_node_many_complete(node, max, completed, childvec);
-		ec_parsed_del_last_child(parsed);
+		ret = __ec_node_many_complete(node, max, comp, childvec);
+		ec_parse_del_last_child(parse);
 		ec_strvec_free(childvec);
 		childvec = NULL;
 
@@ -170,12 +145,12 @@ fail:
 
 static int
 ec_node_many_complete(const struct ec_node *gen_node,
-		struct ec_completed *completed,
+		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,	completed,
+	return __ec_node_many_complete(node, node->max,	comp,
 				strvec);
 }
 
@@ -204,6 +179,7 @@ struct ec_node *ec_node_many(const char *id, struct ec_node *child,
 	if (child == NULL)
 		return NULL;
 
+	// XXX ec_node_add_child()
 	node = (struct ec_node_many *)__ec_node(&ec_node_many_type, id);
 	if (node == NULL) {
 		ec_node_free(child);
@@ -221,18 +197,18 @@ struct ec_node *ec_node_many(const char *id, struct ec_node *child,
 static int ec_node_many_testcase(void)
 {
 	struct ec_node *node;
-	int ret = 0;
+	int testres = 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");
 		return -1;
 	}
-	ret |= EC_TEST_CHECK_PARSE(node, 0);
-	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(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 1, 0);
@@ -240,10 +216,10 @@ static int ec_node_many_testcase(void)
 		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(EC_NO_ID, ec_node_str(EC_NO_ID, "foo"), 1, 2);
@@ -251,11 +227,11 @@ static int ec_node_many_testcase(void)
 		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 */
@@ -264,30 +240,30 @@ static int ec_node_many_testcase(void)
 		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);
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"f", EC_NODE_ENDLIST,
 		"foo", EC_NODE_ENDLIST);
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo", EC_NODE_ENDLIST,
 		"foo", EC_NODE_ENDLIST);
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo", "", EC_NODE_ENDLIST,
 		"foo", EC_NODE_ENDLIST);
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo", "foo", "", EC_NODE_ENDLIST,
 		"foo", EC_NODE_ENDLIST);
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo", "foo", "foo", "", EC_NODE_ENDLIST,
 		"foo", EC_NODE_ENDLIST);
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+	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 */