api documentation for ec_parse

[protos/libecoli.git] / src / ecoli_node_cond.c

diff --git a/src/ecoli_node_cond.c b/src/ecoli_node_cond.c
index def5b39..649ecbb 100644 (file)
--- a/src/ecoli_node_cond.c
+++ b/src/ecoli_node_cond.c
@@ -193,10 +193,6 @@ ec_node_cond_build(const char *cond_str)
                errno = EINVAL;
                goto fail;
        }
-       if (!ec_pnode_has_child(p)) {
-               errno = EINVAL;
-               goto fail;
-       }
 
        return p;
 
@@ -228,7 +224,7 @@ eval_root(const struct ec_pnode *pstate, struct cond_result **in, size_t in_len)
        if (out->htable == NULL)
                goto fail;
 
-       root = ec_pnode_get_root(pstate);
+       root = EC_PNODE_GET_ROOT(pstate);
        if (ec_htable_set(out->htable, &root, sizeof(root), NULL, NULL) < 0)
                goto fail;
 
@@ -650,7 +646,7 @@ eval_condition(const struct ec_pnode *cond, const struct ec_pnode *pstate)
                                                (void *)iter, "id_arg", 0);
                }
 
-               res = eval_func(ec_strvec_val(ec_pnode_strvec(func_name), 0),
+               res = eval_func(ec_strvec_val(ec_pnode_get_strvec(func_name), 0),
                                pstate, args, n_arg);
                args = NULL;
                return res;
@@ -662,7 +658,7 @@ eval_condition(const struct ec_pnode *cond, const struct ec_pnode *pstate)
                if (res == NULL)
                        goto fail;
                res->type = STR;
-               res->str = ec_strdup(ec_strvec_val(ec_pnode_strvec(value), 0));
+               res->str = ec_strdup(ec_strvec_val(ec_pnode_get_strvec(value), 0));
                if (res->str == NULL)
                        goto fail;
                return res;
@@ -674,7 +670,7 @@ eval_condition(const struct ec_pnode *cond, const struct ec_pnode *pstate)
                if (res == NULL)
                        goto fail;
                res->type = INT;
-               if (ec_str_parse_llint(ec_strvec_val(ec_pnode_strvec(value), 0),
+               if (ec_str_parse_llint(ec_strvec_val(ec_pnode_get_strvec(value), 0),
                                        0, LLONG_MIN, LLONG_MAX,
                                        &res->int64) < 0)
                        goto fail;
@@ -721,7 +717,7 @@ ec_node_cond_parse(const struct ec_node *node, struct ec_pnode *pstate,
 
        if (valid == 0) {
                child = ec_pnode_get_last_child(pstate);
-               ec_pnode_unlink_child(pstate, child);
+               ec_pnode_unlink_child(child);
                ec_pnode_free(child);
                return EC_PARSE_NOMATCH;
        }