X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_many.c;h=32e7ad59b0cc59d46319981492b5ce4bd477add6;hb=51028779e0a8772091aec5ab96bcf2519cf2f1ad;hp=8c0a2de9dfda04007ffca76af16d6a81bab12ce7;hpb=7cbb8a1000b85db2a487afd4d17e688b8c0aa756;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_many.c b/lib/ecoli_node_many.c
index 8c0a2de..32e7ad5 100644
--- a/lib/ecoli_node_many.c
+++ b/lib/ecoli_node_many.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (c) 2016, Olivier MATZ <zer0@droids-corp.org>
+ * Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
  */
 
 #include <stdio.h>
@@ -14,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>
@@ -30,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;
@@ -42,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)
@@ -54,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;
 		}
 
@@ -69,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;
 
@@ -110,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;
 
@@ -118,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;
 
@@ -147,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);
 }
 
@@ -163,12 +161,38 @@ static void ec_node_many_free_priv(struct ec_node *gen_node)
 	ec_node_free(node->child);
 }
 
+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;
+}
+
+static int
+ec_node_many_get_child(const struct ec_node *gen_node, size_t i,
+		struct ec_node **child, unsigned int *refs)
+{
+	struct ec_node_many *node = (struct ec_node_many *)gen_node;
+
+	if (i >= 1)
+		return -1;
+
+	*child = node->child;
+	*refs = 1;
+	return 0;
+}
+
 static struct ec_node_type ec_node_many_type = {
 	.name = "many",
 	.parse = ec_node_many_parse,
 	.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);