X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_or.c;h=bbb8ad56c496ee3011457169de31f98f960b4192;hb=15718f19cbf3868bf6fba79f4e26b5254c57873e;hp=0c0e387b8ee43a5a840ea2d226765c8ab06105eb;hpb=665f6b9392d6a6b37bc55e59437a6fa02cd9006c;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_or.c b/lib/ecoli_node_or.c
index 0c0e387..bbb8ad5 100644
--- a/lib/ecoli_node_or.c
+++ b/lib/ecoli_node_or.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>
@@ -36,8 +13,8 @@
 #include <ecoli_log.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_or.h>
 #include <ecoli_node_str.h>
 #include <ecoli_test.h>
@@ -52,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;
@@ -61,17 +38,17 @@ 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
 ec_node_or_complete(const struct ec_node *gen_node,
-		struct ec_completed *completed,
+		struct ec_comp *comp,
 		const struct ec_strvec *strvec)
 {
 	struct ec_node_or *node = (struct ec_node_or *)gen_node;
@@ -80,7 +57,7 @@ ec_node_or_complete(const struct ec_node *gen_node,
 
 	for (n = 0; n < node->len; n++) {
 		ret = ec_node_complete_child(node->table[n],
-					completed, strvec);
+					comp, strvec);
 		if (ret < 0)
 			return ret;
 	}
@@ -91,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);
@@ -130,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++;
 
@@ -154,7 +150,7 @@ struct ec_node *__ec_node_or(const char *id, ...)
 
 	va_start(ap, id);
 
-	gen_node = __ec_node(&ec_node_or_type, id);
+	gen_node = ec_node_from_type(&ec_node_or_type, id);
 	node = (struct ec_node_or *)gen_node;
 	if (node == NULL)
 		fail = 1;;