parsed -> parse

[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 252ebfd..a74685f 100644 (file)
--- a/lib/ecoli_node_re_lex.c
+++ b/lib/ecoli_node_re_lex.c
@@ -14,8 +14,8 @@
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
-#include <ecoli_completed.h>
-#include <ecoli_parsed.h>
+#include <ecoli_complete.h>
+#include <ecoli_parse.h>
 #include <ecoli_node_many.h>
 #include <ecoli_node_or.h>
 #include <ecoli_node_str.h>
@@ -97,12 +97,12 @@ fail:
 
 static int
 ec_node_re_lex_parse(const struct ec_node *gen_node,
-               struct ec_parsed *state,
+               struct ec_parse *state,
                const struct ec_strvec *strvec)
 {
        struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
        struct ec_strvec *new_vec = NULL;
-       struct ec_parsed *child_parsed;
+       struct ec_parse *child_parse;
        const char *str;
        int ret;
 
@@ -123,11 +123,11 @@ ec_node_re_lex_parse(const struct ec_node *gen_node,
 
        if ((unsigned)ret == ec_strvec_len(new_vec)) {
                ret = 1;
-       } else if (ret != EC_PARSED_NOMATCH) {
-               child_parsed = ec_parsed_get_last_child(state);
-               ec_parsed_del_child(state, child_parsed);
-               ec_parsed_free(child_parsed);
-               ret = EC_PARSED_NOMATCH;
+       } else if (ret != EC_PARSE_NOMATCH) {
+               child_parse = ec_parse_get_last_child(state);
+               ec_parse_unlink_child(state, child_parse);
+               ec_parse_free(child_parse);
+               ret = EC_PARSE_NOMATCH;
        }
 
        ec_strvec_free(new_vec);
@@ -157,7 +157,7 @@ static void ec_node_re_lex_free_priv(struct ec_node *gen_node)
 static struct ec_node_type ec_node_re_lex_type = {
        .name = "re_lex",
        .parse = ec_node_re_lex_parse,
-       .complete = ec_node_default_complete,
+       .complete = ec_node_complete_unknown,
        .size = sizeof(struct ec_node_re_lex),
        .free_priv = ec_node_re_lex_free_priv,
 };