config for int

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

diff --git a/lib/ecoli_node_or.c b/lib/ecoli_node_or.c
index 38f8a3d..c72642c 100644 (file)
--- a/lib/ecoli_node_or.c
+++ b/lib/ecoli_node_or.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_or.h>
 #include <ecoli_node_str.h>
 #include <ecoli_test.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,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;
@@ -57,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;
        }