support config in node_or

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

diff --git a/lib/ecoli_node_re_lex.c b/lib/ecoli_node_re_lex.c
index a017635..f5a6c37 100644 (file)
--- a/lib/ecoli_node_re_lex.c
+++ b/lib/ecoli_node_re_lex.c
@@ -143,13 +143,37 @@ static void ec_node_re_lex_free_priv(struct ec_node *gen_node)
        struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
        unsigned int i;
 
+       ec_node_free(node->child);
        for (i = 0; i < node->len; i++) {
                ec_free(node->table[i].pattern);
                regfree(&node->table[i].r);
        }
 
        ec_free(node->table);
-       ec_node_free(node->child);
+}
+
+static size_t
+ec_node_re_lex_get_children_count(const struct ec_node *gen_node)
+{
+       struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
+
+       if (node->child)
+               return 1;
+       return 0;
+}
+
+static int
+ec_node_re_lex_get_child(const struct ec_node *gen_node, size_t i,
+                       struct ec_node **child, unsigned int *refs)
+{
+       struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
+
+       if (i >= 1)
+               return -1;
+
+       *child = node->child;
+       *refs = 1;
+       return 0;
 }
 
 static struct ec_node_type ec_node_re_lex_type = {
@@ -158,6 +182,8 @@ static struct ec_node_type ec_node_re_lex_type = {
        .complete = ec_node_complete_unknown,
        .size = sizeof(struct ec_node_re_lex),
        .free_priv = ec_node_re_lex_free_priv,
+       .get_children_count = ec_node_re_lex_get_children_count,
+       .get_child = ec_node_re_lex_get_child,
 };
 
 EC_NODE_TYPE_REGISTER(ec_node_re_lex_type);
@@ -209,7 +235,7 @@ struct ec_node *ec_node_re_lex(const char *id, struct ec_node *child)
        if (child == NULL)
                return NULL;
 
-       node = (struct ec_node_re_lex *)__ec_node(&ec_node_re_lex_type, id);
+       node = (struct ec_node_re_lex *)ec_node_from_type(&ec_node_re_lex_type, id);
        if (node == NULL) {
                ec_node_free(child);
                return NULL;