free children in free_priv

[protos/libecoli.git] / lib / ecoli_node_option.c

diff --git a/lib/ecoli_node_option.c b/lib/ecoli_node_option.c
index 2d9db77..befbb2e 100644 (file)
--- a/lib/ecoli_node_option.c
+++ b/lib/ecoli_node_option.c
@@ -13,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_str.h>
 #include <ecoli_test.h>
 #include <ecoli_node_option.h>
@@ -28,7 +28,7 @@ struct ec_node_option {
 
 static int
 ec_node_option_parse(const struct ec_node *gen_node,
-               struct ec_parsed *state,
+               struct ec_parse *state,
                const struct ec_strvec *strvec)
 {
        struct ec_node_option *node = (struct ec_node_option *)gen_node;
@@ -38,7 +38,7 @@ ec_node_option_parse(const struct ec_node *gen_node,
        if (ret < 0)
                return ret;
 
-       if (ret == EC_PARSED_NOMATCH)
+       if (ret == EC_PARSE_NOMATCH)
                return 0;
 
        return ret;
@@ -46,12 +46,12 @@ ec_node_option_parse(const struct ec_node *gen_node,
 
 static int
 ec_node_option_complete(const struct ec_node *gen_node,
-                       struct ec_completed *completed,
+                       struct ec_comp *comp,
                        const struct ec_strvec *strvec)
 {
        struct ec_node_option *node = (struct ec_node_option *)gen_node;
 
-       return ec_node_complete_child(node->child, completed, strvec);
+       return ec_node_complete_child(node->child, comp, strvec);
 }
 
 static void ec_node_option_free_priv(struct ec_node *gen_node)
@@ -61,12 +61,35 @@ static void ec_node_option_free_priv(struct ec_node *gen_node)
        ec_node_free(node->child);
 }
 
+static size_t
+ec_node_option_get_children_count(const struct ec_node *gen_node)
+{
+       struct ec_node_option *node = (struct ec_node_option *)gen_node;
+
+       if (node->child)
+               return 1;
+       return 0;
+}
+
+static struct ec_node *
+ec_node_option_get_child(const struct ec_node *gen_node, size_t i)
+{
+       struct ec_node_option *node = (struct ec_node_option *)gen_node;
+
+       if (i >= 1)
+               return NULL;
+
+       return node->child;
+}
+
 static struct ec_node_type ec_node_option_type = {
        .name = "option",
        .parse = ec_node_option_parse,
        .complete = ec_node_option_complete,
        .size = sizeof(struct ec_node_option),
        .free_priv = ec_node_option_free_priv,
+       .get_children_count = ec_node_option_get_children_count,
+       .get_child = ec_node_option_get_child,
 };
 
 EC_NODE_TYPE_REGISTER(ec_node_option_type);
@@ -83,9 +106,6 @@ int ec_node_option_set(struct ec_node *gen_node, struct ec_node *child)
        if (ec_node_check_type(gen_node, &ec_node_option_type) < 0)
                goto fail;
 
-       if (ec_node_add_child(gen_node, child) < 0)
-               goto fail;
-
        node->child = child;
 
        return 0;