X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_seq.c;h=fa9eaacb11e07531478f8d8291ddca80b23072b0;hb=833dc6c2a9c47b821548b197a1d1f96f60df7de8;hp=ff370aa773a1821d3dd9f34b9a58112f27af3a99;hpb=539a859dde94b304e93f44a52b7e7fc0734e3a5d;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_seq.c b/lib/ecoli_node_seq.c
index ff370aa..fa9eaac 100644
--- a/lib/ecoli_node_seq.c
+++ b/lib/ecoli_node_seq.c
@@ -15,8 +15,10 @@
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
-#include <ecoli_parsed.h>
+#include <ecoli_config.h>
+#include <ecoli_parse.h>
 #include <ecoli_complete.h>
+#include <ecoli_node_helper.h>
 #include <ecoli_node_str.h>
 #include <ecoli_node_option.h>
 #include <ecoli_node_or.h>
@@ -33,7 +35,7 @@ struct ec_node_seq {
 
 static int
 ec_node_seq_parse(const struct ec_node *gen_node,
-		struct ec_parsed *state,
+		struct ec_parse *state,
 		const struct ec_strvec *strvec)
 {
 	struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
@@ -45,10 +47,8 @@ ec_node_seq_parse(const struct ec_node *gen_node,
 	for (i = 0; i < node->len; i++) {
 		childvec = ec_strvec_ndup(strvec, len,
 			ec_strvec_len(strvec) - len);
-		if (childvec == NULL) {
-			ret = -ENOMEM;
+		if (childvec == NULL)
 			goto fail;
-		}
 
 		ret = ec_node_parse_child(node->table[i], state, childvec);
 		if (ret < 0)
@@ -57,9 +57,9 @@ ec_node_seq_parse(const struct ec_node *gen_node,
 		ec_strvec_free(childvec);
 		childvec = NULL;
 
-		if (ret == EC_PARSED_NOMATCH) {
-			ec_parsed_free_children(state);
-			return EC_PARSED_NOMATCH;
+		if (ret == EC_PARSE_NOMATCH) {
+			ec_parse_free_children(state);
+			return EC_PARSE_NOMATCH;
 		}
 
 		len += ret;
@@ -69,7 +69,7 @@ ec_node_seq_parse(const struct ec_node *gen_node,
 
 fail:
 	ec_strvec_free(childvec);
-	return ret;
+	return -1;
 }
 
 static int
@@ -77,7 +77,7 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len,
 		struct ec_comp *comp,
 		const struct ec_strvec *strvec)
 {
-	struct ec_parsed *parsed = ec_comp_get_state(comp);
+	struct ec_parse *parse = ec_comp_get_state(comp);
 	struct ec_strvec *childvec = NULL;
 	unsigned int i;
 	int ret;
@@ -108,7 +108,7 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len,
 		if (childvec == NULL)
 			goto fail;
 
-		ret = ec_node_parse_child(table[0], parsed, childvec);
+		ret = ec_node_parse_child(table[0], parse, childvec);
 		if (ret < 0)
 			goto fail;
 
@@ -116,21 +116,21 @@ __ec_node_seq_complete(struct ec_node **table, size_t table_len,
 		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_seq_complete(&table[1],
 					table_len - 1,
 					comp, childvec);
-		ec_parsed_del_last_child(parsed);
+		ec_parse_del_last_child(parse);
 		ec_strvec_free(childvec);
 		childvec = NULL;
 
@@ -159,19 +159,91 @@ ec_node_seq_complete(const struct ec_node *gen_node,
 static void ec_node_seq_free_priv(struct ec_node *gen_node)
 {
 	struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
-	unsigned int i;
+	size_t i;
 
 	for (i = 0; i < node->len; i++)
 		ec_node_free(node->table[i]);
 	ec_free(node->table);
 }
 
+static const struct ec_config_schema ec_node_seq_subschema[] = {
+	{
+		.desc = "A child node which is part of the sequence.",
+		.type = EC_CONFIG_TYPE_NODE,
+	},
+};
+
+static const struct ec_config_schema ec_node_seq_schema[] = {
+	{
+		.key = "children",
+		.desc = "The list of children nodes, to be parsed in sequence.",
+		.type = EC_CONFIG_TYPE_LIST,
+		.subschema = ec_node_seq_subschema,
+		.subschema_len = EC_COUNT_OF(ec_node_seq_subschema),
+	},
+};
+
+static int ec_node_seq_set_config(struct ec_node *gen_node,
+				const struct ec_config *config)
+{
+	struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
+	struct ec_node **table = NULL;
+	size_t i, len = 0;
+
+	table = ec_node_config_node_list_to_table(
+		ec_config_dict_get(config, "children"), &len);
+	if (table == NULL)
+		goto fail;
+
+	for (i = 0; i < node->len; i++)
+		ec_node_free(node->table[i]);
+	ec_free(node->table);
+	node->table = table;
+	node->len = len;
+
+	return 0;
+
+fail:
+	for (i = 0; i < len; i++)
+		ec_node_free(table[i]);
+	ec_free(table);
+	return -1;
+}
+
+static size_t
+ec_node_seq_get_children_count(const struct ec_node *gen_node)
+{
+	struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
+	return node->len;
+}
+
+static int
+ec_node_seq_get_child(const struct ec_node *gen_node, size_t i,
+		struct ec_node **child, unsigned int *refs)
+{
+	struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
+
+	if (i >= node->len)
+		return -1;
+
+	*child = node->table[i];
+	/* each child node is referenced twice: once in the config and
+	 * once in the node->table[] */
+	*refs = 2;
+	return 0;
+}
+
 static struct ec_node_type ec_node_seq_type = {
 	.name = "seq",
+	.schema = ec_node_seq_schema,
+	.schema_len = EC_COUNT_OF(ec_node_seq_schema),
+	.set_config = ec_node_seq_set_config,
 	.parse = ec_node_seq_parse,
 	.complete = ec_node_seq_complete,
 	.size = sizeof(struct ec_node_seq),
 	.free_priv = ec_node_seq_free_priv,
+	.get_children_count = ec_node_seq_get_children_count,
+	.get_child = ec_node_seq_get_child,
 };
 
 EC_NODE_TYPE_REGISTER(ec_node_seq_type);
@@ -179,80 +251,117 @@ EC_NODE_TYPE_REGISTER(ec_node_seq_type);
 int ec_node_seq_add(struct ec_node *gen_node, struct ec_node *child)
 {
 	struct ec_node_seq *node = (struct ec_node_seq *)gen_node;
-	struct ec_node **table;
+	const struct ec_config *cur_config = NULL;
+	struct ec_config *config = NULL, *children;
+	int ret;
 
 	assert(node != NULL);
 
-	if (child == NULL) {
-		errno = EINVAL;
-		goto fail;
-	}
+	/* XXX factorize this code in a helper */
 
 	if (ec_node_check_type(gen_node, &ec_node_seq_type) < 0)
 		goto fail;
 
-	table = ec_realloc(node->table, (node->len + 1) * sizeof(*node->table));
-	if (table == NULL)
+	cur_config = ec_node_get_config(gen_node);
+	if (cur_config == NULL)
+		config = ec_config_dict();
+	else
+		config = ec_config_dup(cur_config);
+	if (config == NULL)
 		goto fail;
 
-	node->table = table;
+	children = ec_config_dict_get(config, "children");
+	if (children == NULL) {
+		children = ec_config_list();
+		if (children == NULL)
+			goto fail;
 
-	if (ec_node_add_child(gen_node, child) < 0)
+		if (ec_config_dict_set(config, "children", children) < 0)
+			goto fail; /* children list is freed on error */
+	}
+
+	if (ec_config_list_add(children, ec_config_node(child)) < 0) {
+		child = NULL;
 		goto fail;
+	}
 
-	table[node->len] = child;
-	node->len++;
+	ret = ec_node_set_config(gen_node, config);
+	config = NULL; /* freed */
+	if (ret < 0)
+		goto fail;
 
 	return 0;
 
 fail:
+	ec_config_free(config);
 	ec_node_free(child);
 	return -1;
 }
 
 struct ec_node *__ec_node_seq(const char *id, ...)
 {
+	struct ec_config *config = NULL, *children = NULL;
 	struct ec_node *gen_node = NULL;
-	struct ec_node_seq *node = NULL;
 	struct ec_node *child;
 	va_list ap;
-	int fail = 0;
+	int ret;
 
 	va_start(ap, id);
+	child = va_arg(ap, struct ec_node *);
+
+	gen_node = ec_node_from_type(&ec_node_seq_type, id);
+	if (gen_node == NULL)
+		goto fail_free_children;
 
-	gen_node = __ec_node(&ec_node_seq_type, id);
-	node = (struct ec_node_seq *)gen_node;
-	if (node == NULL)
-		fail = 1;;
+	config = ec_config_dict();
+	if (config == NULL)
+		goto fail_free_children;
 
-	for (child = va_arg(ap, struct ec_node *);
-	     child != EC_NODE_ENDLIST;
-	     child = va_arg(ap, struct ec_node *)) {
+	children = ec_config_list();
+	if (children == NULL)
+		goto fail_free_children;
 
-		/* on error, don't quit the loop to avoid leaks */
-		if (fail == 1 || child == NULL ||
-				ec_node_seq_add(&node->gen, child) < 0) {
-			fail = 1;
-			ec_node_free(child);
+	for (; child != EC_NODE_ENDLIST; child = va_arg(ap, struct ec_node *)) {
+		if (child == NULL)
+			goto fail_free_children;
+
+		if (ec_config_list_add(children, ec_config_node(child)) < 0) {
+			child = NULL;
+			goto fail_free_children;
 		}
 	}
 
-	if (fail == 1)
+	if (ec_config_dict_set(config, "children", children) < 0) {
+		children = NULL; /* freed */
+		goto fail;
+	}
+	children = NULL;
+
+	ret = ec_node_set_config(gen_node, config);
+	config = NULL; /* freed */
+	if (ret < 0)
 		goto fail;
 
 	va_end(ap);
+
 	return gen_node;
 
+fail_free_children:
+	for (; child != EC_NODE_ENDLIST; child = va_arg(ap, struct ec_node *))
+		ec_node_free(child);
 fail:
-	ec_node_free(gen_node); /* will also free children */
+	ec_node_free(gen_node); /* will also free added children */
+	ec_config_free(children);
+	ec_config_free(config);
 	va_end(ap);
+
 	return NULL;
 }
 
 /* LCOV_EXCL_START */
 static int ec_node_seq_testcase(void)
 {
-	struct ec_node *node;
+	struct ec_node *node = NULL;
 	int testres = 0;
 
 	node = EC_NODE_SEQ(EC_NO_ID,
@@ -270,6 +379,10 @@ static int ec_node_seq_testcase(void)
 	testres |= EC_TEST_CHECK_PARSE(node, -1, "foo", "barx");
 	testres |= EC_TEST_CHECK_PARSE(node, -1, "bar", "foo");
 	testres |= EC_TEST_CHECK_PARSE(node, -1, "", "foo");
+
+	testres |= (ec_node_seq_add(node, ec_node_str(EC_NO_ID, "grr")) < 0);
+	testres |= EC_TEST_CHECK_PARSE(node, 3, "foo", "bar", "grr");
+
 	ec_node_free(node);
 
 	/* test completion */