support config in node_or

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

diff --git a/lib/ecoli_node_re.c b/lib/ecoli_node_re.c
index 2a42fa2..6ac5182 100644 (file)
--- a/lib/ecoli_node_re.c
+++ b/lib/ecoli_node_re.c
@@ -13,7 +13,7 @@
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
-#include <ecoli_parsed.h>
+#include <ecoli_parse.h>
 #include <ecoli_complete.h>
 #include <ecoli_node_re.h>
 
@@ -27,7 +27,7 @@ struct ec_node_re {
 
 static int
 ec_node_re_parse(const struct ec_node *gen_node,
-               struct ec_parsed *state,
+               struct ec_parse *state,
                const struct ec_strvec *strvec)
 {
        struct ec_node_re *node = (struct ec_node_re *)gen_node;
@@ -37,13 +37,13 @@ ec_node_re_parse(const struct ec_node *gen_node,
        (void)state;
 
        if (ec_strvec_len(strvec) == 0)
-               return EC_PARSED_NOMATCH;
+               return EC_PARSE_NOMATCH;
 
        str = ec_strvec_val(strvec, 0);
        if (regexec(&node->re, str, 1, &pos, 0) != 0)
-               return EC_PARSED_NOMATCH;
+               return EC_PARSE_NOMATCH;
        if (pos.rm_so != 0 || pos.rm_eo != (int)strlen(str))
-               return EC_PARSED_NOMATCH;
+               return EC_PARSE_NOMATCH;
 
        return 1;
 }
@@ -75,17 +75,20 @@ int ec_node_re_set_regexp(struct ec_node *gen_node, const char *str)
        regex_t re;
        int ret;
 
-       if (str == NULL)
-               return -EINVAL;
+       EC_CHECK_ARG(str != NULL, -1, EINVAL);
 
-       ret = -ENOMEM;
        str_copy = ec_strdup(str);
        if (str_copy == NULL)
                goto fail;
 
-       ret = -EINVAL;
-       if (regcomp(&re, str_copy, REG_EXTENDED) != 0)
+       ret = regcomp(&re, str_copy, REG_EXTENDED);
+       if (ret != 0) {
+               if (ret == REG_ESPACE)
+                       errno = ENOMEM;
+               else
+                       errno = EINVAL;
                goto fail;
+       }
 
        if (node->re_str != NULL) {
                ec_free(node->re_str);
@@ -98,14 +101,14 @@ int ec_node_re_set_regexp(struct ec_node *gen_node, const char *str)
 
 fail:
        ec_free(str_copy);
-       return ret;
+       return -1;
 }
 
 struct ec_node *ec_node_re(const char *id, const char *re_str)
 {
        struct ec_node *gen_node = NULL;
 
-       gen_node = __ec_node(&ec_node_re_type, id);
+       gen_node = ec_node_from_type(&ec_node_re_type, id);
        if (gen_node == NULL)
                goto fail;