X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_or.c;h=aeac20698d9ec17d5fdc299fe322efcd5ccd3c3b;hb=51028779e0a8772091aec5ab96bcf2519cf2f1ad;hp=b1af7909d528c8245e210b17bd46aab667ba0f0b;hpb=539a859dde94b304e93f44a52b7e7fc0734e3a5d;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_or.c b/lib/ecoli_node_or.c
index b1af790..aeac206 100644
--- a/lib/ecoli_node_or.c
+++ b/lib/ecoli_node_or.c
@@ -13,7 +13,7 @@
 #include <ecoli_log.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
-#include <ecoli_parsed.h>
+#include <ecoli_parse.h>
 #include <ecoli_complete.h>
 #include <ecoli_node_or.h>
 #include <ecoli_node_str.h>
@@ -29,7 +29,7 @@ struct ec_node_or {
 
 static int
 ec_node_or_parse(const struct ec_node *gen_node,
-		struct ec_parsed *state,
+		struct ec_parse *state,
 		const struct ec_strvec *strvec)
 {
 	struct ec_node_or *node = (struct ec_node_or *)gen_node;
@@ -38,12 +38,12 @@ ec_node_or_parse(const struct ec_node *gen_node,
 
 	for (i = 0; i < node->len; i++) {
 		ret = ec_node_parse_child(node->table[i], state, strvec);
-		if (ret == EC_PARSED_NOMATCH)
+		if (ret == EC_PARSE_NOMATCH)
 			continue;
 		return ret;
 	}
 
-	return EC_PARSED_NOMATCH;
+	return EC_PARSE_NOMATCH;
 }
 
 static int
@@ -68,19 +68,42 @@ ec_node_or_complete(const struct ec_node *gen_node,
 static void ec_node_or_free_priv(struct ec_node *gen_node)
 {
 	struct ec_node_or *node = (struct ec_node_or *)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 size_t
+ec_node_or_get_children_count(const struct ec_node *gen_node)
+{
+	struct ec_node_or *node = (struct ec_node_or *)gen_node;
+	return node->len;
+}
+
+static int
+ec_node_or_get_child(const struct ec_node *gen_node, size_t i,
+		struct ec_node **child, unsigned int *refs)
+{
+	struct ec_node_or *node = (struct ec_node_or *)gen_node;
+
+	if (i >= node->len)
+		return -1;
+
+	*child = node->table[i];
+	*refs = 1;
+	return 0;
+}
+
 static struct ec_node_type ec_node_or_type = {
 	.name = "or",
 	.parse = ec_node_or_parse,
 	.complete = ec_node_or_complete,
 	.size = sizeof(struct ec_node_or),
 	.free_priv = ec_node_or_free_priv,
+	.get_children_count = ec_node_or_get_children_count,
+	.get_child = ec_node_or_get_child,
 };
 
 EC_NODE_TYPE_REGISTER(ec_node_or_type);
@@ -107,10 +130,6 @@ int ec_node_or_add(struct ec_node *gen_node, struct ec_node *child)
 		goto fail;
 
 	node->table = table;
-
-	if (ec_node_add_child(gen_node, child) < 0)
-		goto fail;
-
 	table[node->len] = child;
 	node->len++;