save

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

diff --git a/lib/ecoli_node_cmd.c b/lib/ecoli_node_cmd.c
index d1d2c7d..2753339 100644 (file)
--- a/lib/ecoli_node_cmd.c
+++ b/lib/ecoli_node_cmd.c
@@ -38,6 +38,9 @@
 #include <ecoli_log.h>
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
+#include <ecoli_node.h>
+#include <ecoli_parsed.h>
+#include <ecoli_completed.h>
 #include <ecoli_node_expr.h>
 #include <ecoli_node_str.h>
 #include <ecoli_node_or.h>
@@ -273,7 +276,7 @@ static int ec_node_cmd_build(struct ec_node *gen_node)
 
        /* build the expression parser */
        ret = -ENOMEM;
-       expr = ec_node_new("expr", "expr");
+       expr = ec_node("expr", "expr");
        if (expr == NULL)
                goto fail;
        ret = ec_node_expr_set_val_node(expr, ec_node_re(NULL, "[a-zA-Z0-9]+"));
@@ -338,7 +341,7 @@ static int ec_node_cmd_build(struct ec_node *gen_node)
                goto fail;
 
        ret = -ENOMEM;
-       cmd = ec_node_new("seq", NULL);
+       cmd = ec_node("seq", NULL);
        if (cmd == NULL)
                goto fail;
 
@@ -417,7 +420,7 @@ struct ec_node *ec_node_cmd(const char *id, const char *cmd_str)
        struct ec_node *gen_node = NULL;
        struct ec_node_cmd *node = NULL;
 
-       gen_node = __ec_node_new(&ec_node_cmd_type, id);
+       gen_node = __ec_node(&ec_node_cmd_type, id);
        if (gen_node == NULL)
                goto fail;