save

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

diff --git a/lib/ecoli_node_sh_lex.c b/lib/ecoli_node_sh_lex.c
index 549faec..b92af1f 100644 (file)
--- a/lib/ecoli_node_sh_lex.c
+++ b/lib/ecoli_node_sh_lex.c
@@ -38,6 +38,8 @@
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
+#include <ecoli_parsed.h>
+#include <ecoli_completed.h>
 #include <ecoli_node_seq.h>
 #include <ecoli_node_str.h>
 #include <ecoli_node_option.h>
@@ -156,7 +158,7 @@ static struct ec_strvec *tokenize(const char *str, int completion,
 
 //     printf("str=%s\n", str);
 
-       strvec = ec_strvec_new();
+       strvec = ec_strvec();
        if (strvec == NULL)
                goto fail;
 
@@ -241,7 +243,7 @@ static struct ec_parsed *ec_node_sh_lex_parse(const struct ec_node *gen_node,
        struct ec_parsed *parsed = NULL, *child_parsed;
        const char *str;
 
-       parsed = ec_parsed_new();
+       parsed = ec_parsed();
        if (parsed == NULL)
                return NULL;
 
@@ -292,7 +294,7 @@ static struct ec_completed *ec_node_sh_lex_complete(const struct ec_node *gen_no
        char missing_quote;
 
 //     printf("==================\n");
-       completed = ec_completed_new();
+       completed = ec_completed();
        if (completed == NULL)
                return NULL;
 
@@ -346,7 +348,7 @@ struct ec_node *ec_node_sh_lex(const char *id, struct ec_node *child)
        if (child == NULL)
                return NULL;
 
-       node = (struct ec_node_sh_lex *)__ec_node_new(&ec_node_sh_lex_type, id);
+       node = (struct ec_node_sh_lex *)__ec_node(&ec_node_sh_lex_type, id);
        if (node == NULL) {
                ec_node_free(child);
                return NULL;