#include <ecoli_node_re_lex.h>
#include <ecoli_node_cmd.h>
+EC_LOG_TYPE_REGISTER(node_cmd);
+
struct ec_node_cmd {
struct ec_node gen;
char *cmd_str; /* the command string. */
for (i = 0; i < node->len; i++) {
id = ec_node_id(node->table[i]);
- printf("i=%d id=%s\n", i, id);
+ //printf("i=%d id=%s\n", i, id);
if (id == NULL)
continue;
if (strcmp(str, id))
/* ...or create a string node */
if (eval == NULL) {
- eval = ec_node_str(NULL, str);
+ eval = ec_node_str(EC_NO_ID, str);
if (eval == NULL)
return -ENOMEM;
}
- printf("eval var %s %p\n", str, eval);
+ //printf("eval var %s %p\n", str, eval);
*result = eval;
return 0;
const struct ec_parsed *operator)
{
const struct ec_strvec *vec;
- struct ec_node *eval = operand;;
+ struct ec_node *in = operand;;
+ struct ec_node *out = NULL;;
(void)userctx;
if (ec_strvec_len(vec) != 1)
return -EINVAL;
- if (!strcmp(ec_strvec_val(vec, 0), "*"))
- eval = NULL; //XXX
- else
+ if (!strcmp(ec_strvec_val(vec, 0), "*")) {
+ out = ec_node_many(EC_NO_ID,
+ ec_node_clone(in), 0, 0);
+ if (out == NULL)
+ return -EINVAL;
+ ec_node_free(in);
+ *result = out;
+ } else {
return -EINVAL;
-
- printf("eval post_op %p\n", eval);
- *result = eval;
+ }
return 0;
}
(void)userctx;
- printf("eval bin_op %p %p\n", in1, in2);
-
/* get parsed string vector, it should contain only one str */
vec = ec_parsed_strvec(operator);
if (ec_strvec_len(vec) != 1)
return -EINVAL;
if (!strcmp(ec_strvec_val(vec, 0), "|")) {
- out = EC_NODE_OR(NULL, ec_node_clone(in1), ec_node_clone(in2));
+ out = EC_NODE_OR(EC_NO_ID, ec_node_clone(in1), ec_node_clone(in2));
if (out == NULL)
return -EINVAL;
ec_node_free(in1);
ec_node_free(in1);
*result = in2;
} else {
- out = EC_NODE_SUBSET(NULL, ec_node_clone(in1),
+ out = EC_NODE_SUBSET(EC_NO_ID, ec_node_clone(in1),
ec_node_clone(in2));
if (out == NULL)
return -EINVAL;
return -EINVAL;
}
- printf("eval bin_op out %p\n", *result);
-
return 0;
}
return -EINVAL;
if (!strcmp(ec_strvec_val(vec, 0), "[")) {
- out = ec_node_option(NULL, ec_node_clone(in));
+ out = ec_node_option(EC_NO_ID, ec_node_clone(in));
if (out == NULL)
return -EINVAL;
ec_node_free(in);
return -EINVAL;
}
- printf("eval paren\n");
*result = out;
return 0;
.eval_free = ec_node_cmd_eval_free,
};
-static int
-ec_node_cmd_parse(const struct ec_node *gen_node, struct ec_parsed *state,
- const struct ec_strvec *strvec)
-{
- struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
-
- return ec_node_parse_child(node->cmd, state, strvec);
-}
-
-static int
-ec_node_cmd_complete(const struct ec_node *gen_node,
- struct ec_completed *completed,
- struct ec_parsed *parsed,
- const struct ec_strvec *strvec)
-{
- struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
-
- return ec_node_complete_child(node->cmd, completed, parsed, strvec);
-}
-
-static void ec_node_cmd_free_priv(struct ec_node *gen_node)
-{
- struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
- unsigned int i;
-
- ec_free(node->cmd_str);
- ec_node_free(node->cmd);
- ec_node_free(node->expr);
- ec_node_free(node->lex);
- for (i = 0; i < node->len; i++)
- ec_node_free(node->table[i]);
- ec_free(node->table);
-}
-
-static int ec_node_cmd_build(struct ec_node *gen_node)
+static int ec_node_cmd_build(struct ec_node_cmd *node)
{
struct ec_node *expr = NULL, *lex = NULL, *cmd = NULL;
- struct ec_parsed *p, *child;
- struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
+ struct ec_parsed *p = NULL, *child;
void *result;
int ret;
- /* XXX the expr parser can be moved in the node init */
+ ec_node_free(node->expr);
+ node->expr = NULL;
+ ec_node_free(node->lex);
+ node->lex = NULL;
+ ec_node_free(node->cmd);
+ node->cmd = NULL;
/* build the expression parser */
ret = -ENOMEM;
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]+"));
+ ret = ec_node_expr_set_val_node(expr, ec_node_re(EC_NO_ID, "[a-zA-Z0-9]+"));
if (ret < 0)
goto fail;
- ret = ec_node_expr_add_bin_op(expr, ec_node_str(NULL, ","));
+ ret = ec_node_expr_add_bin_op(expr, ec_node_str(EC_NO_ID, ","));
if (ret < 0)
goto fail;
- ret = ec_node_expr_add_bin_op(expr, ec_node_str(NULL, "|"));
+ ret = ec_node_expr_add_bin_op(expr, ec_node_str(EC_NO_ID, "|"));
if (ret < 0)
goto fail;
- ret = ec_node_expr_add_post_op(expr, ec_node_str(NULL, "+"));
+ ret = ec_node_expr_add_post_op(expr, ec_node_str(EC_NO_ID, "+"));
if (ret < 0)
goto fail;
- ret = ec_node_expr_add_post_op(expr, ec_node_str(NULL, "*"));
+ ret = ec_node_expr_add_post_op(expr, ec_node_str(EC_NO_ID, "*"));
if (ret < 0)
goto fail;
- ret = ec_node_expr_add_parenthesis(expr, ec_node_str(NULL, "["),
- ec_node_str(NULL, "]"));
+ ret = ec_node_expr_add_parenthesis(expr, ec_node_str(EC_NO_ID, "["),
+ ec_node_str(EC_NO_ID, "]"));
if (ret < 0)
goto fail;
- ec_node_expr_add_parenthesis(expr, ec_node_str(NULL, "("),
- ec_node_str(NULL, ")"));
+ ec_node_expr_add_parenthesis(expr, ec_node_str(EC_NO_ID, "("),
+ ec_node_str(EC_NO_ID, ")"));
if (ret < 0)
goto fail;
/* prepend a lexer and a "many" to the expression node */
ret = -ENOMEM;
- lex = ec_node_re_lex(NULL,
- ec_node_many(NULL, ec_node_clone(expr), 1, 0));
+ lex = ec_node_re_lex(EC_NO_ID,
+ ec_node_many(EC_NO_ID, ec_node_clone(expr), 1, 0));
if (lex == NULL)
goto fail;
ret = -EINVAL;
if (!ec_parsed_matches(p))
goto fail;
- if (TAILQ_EMPTY(&p->children))
+ if (!ec_parsed_has_child(p))
goto fail;
- if (TAILQ_EMPTY(&TAILQ_FIRST(&p->children)->children))
+ if (!ec_parsed_has_child(ec_parsed_get_first_child(p)))
goto fail;
ret = -ENOMEM;
- cmd = ec_node("seq", NULL);
+ cmd = ec_node("seq", EC_NO_ID);
if (cmd == NULL)
goto fail;
- TAILQ_FOREACH(child, &TAILQ_FIRST(&p->children)->children, next) {
+ EC_PARSED_FOREACH_CHILD(child, ec_parsed_get_first_child(p)) {
ret = ec_node_expr_eval(&result, expr, child,
&test_ops, node);
if (ret < 0)
}
ec_parsed_free(p);
p = NULL;
- ec_node_dump(stdout, cmd);
- ec_node_free(node->expr);
node->expr = expr;
- ec_node_free(node->lex);
node->lex = lex;
- ec_node_free(node->cmd);
node->cmd = cmd;
return 0;
return ret;
}
+static int
+ec_node_cmd_parse(const struct ec_node *gen_node, struct ec_parsed *state,
+ const struct ec_strvec *strvec)
+{
+ struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
+
+ if (node->cmd == NULL)
+ return -ENOENT;
+ return ec_node_parse_child(node->cmd, state, strvec);
+}
+
+static int
+ec_node_cmd_complete(const struct ec_node *gen_node,
+ struct ec_completed *completed,
+ const struct ec_strvec *strvec)
+{
+ struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
+
+ if (node->cmd == NULL)
+ return -ENOENT;
+ return ec_node_complete_child(node->cmd, completed, strvec);
+}
+
+static void ec_node_cmd_free_priv(struct ec_node *gen_node)
+{
+ struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
+ unsigned int i;
+
+ ec_free(node->cmd_str);
+ ec_node_free(node->cmd);
+ ec_node_free(node->expr);
+ ec_node_free(node->lex);
+ for (i = 0; i < node->len; i++)
+ ec_node_free(node->table[i]);
+ ec_free(node->table);
+}
+
+
static struct ec_node_type ec_node_cmd_type = {
.name = "cmd",
- .build = ec_node_cmd_build,
.parse = ec_node_cmd_parse,
.complete = ec_node_cmd_complete,
.size = sizeof(struct ec_node_cmd),
{
struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
struct ec_node **table;
+ int ret;
// XXX check node type
assert(node != NULL);
- printf("add child %s\n", child->id);
if (child == NULL)
return -EINVAL;
- gen_node->flags &= ~EC_NODE_F_BUILT;
+ if (node->cmd == NULL) {
+ ret = ec_node_cmd_build(node);
+ if (ret < 0)
+ return ret;
+ }
table = ec_realloc(node->table, (node->len + 1) * sizeof(*node->table));
if (table == NULL) {
table[node->len] = child;
node->len++;
- child->parent = gen_node;
TAILQ_INSERT_TAIL(&gen_node->children, child, next); // XXX really needed?
return 0;
}
-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(&ec_node_cmd_type, id);
- if (gen_node == NULL)
- goto fail;
-
- node = (struct ec_node_cmd *)gen_node;
- node->cmd_str = ec_strdup(cmd_str);
- if (node->cmd_str == NULL)
- goto fail;
-
- return gen_node;
-
-fail:
- ec_node_free(gen_node);
- return NULL;
-}
-
struct ec_node *__ec_node_cmd(const char *id, const char *cmd, ...)
{
struct ec_node *gen_node = NULL;
va_list ap;
int fail = 0;
- va_start(ap, cmd);
+ gen_node = __ec_node(&ec_node_cmd_type, id);
+ if (gen_node == NULL)
+ fail = 1;
+
+ if (fail == 0) {
+ node = (struct ec_node_cmd *)gen_node;
+ node->cmd_str = ec_strdup(cmd);
+ if (node->cmd_str == NULL)
+ fail = 1;
+ }
- gen_node = ec_node_cmd(id, cmd);
- node = (struct ec_node_cmd *)gen_node;
- if (node == NULL)
- fail = 1;;
+ va_start(ap, cmd);
for (child = va_arg(ap, struct ec_node *);
child != EC_NODE_ENDLIST;
}
}
+ va_end(ap);
+
if (fail == 1)
goto fail;
- va_end(ap);
+ if (ec_node_cmd_build(node) < 0)
+ goto fail;
+
return gen_node;
fail:
ec_node_free(gen_node); /* will also free children */
- va_end(ap);
return NULL;
}
+struct ec_node *ec_node_cmd(const char *id, const char *cmd_str)
+{
+ return __ec_node_cmd(id, cmd_str, EC_NODE_ENDLIST);
+}
+
/* LCOV_EXCL_START */
static int ec_node_cmd_testcase(void)
{
struct ec_node *node;
int ret = 0;
- node = EC_NODE_CMD(NULL,
- "command [option] (subset1, subset2, subset3) x|y",
+ node = EC_NODE_CMD(EC_NO_ID,
+ "command [option] (subset1, subset2, subset3) x|y z*",
ec_node_int("x", 0, 10, 10),
ec_node_int("y", 20, 30, 10)
);
if (node == NULL) {
- ec_log(EC_LOG_ERR, "cannot create node\n");
+ EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;
}
ret |= EC_TEST_CHECK_PARSE(node, 2, "command", "1");
ret |= EC_TEST_CHECK_PARSE(node, 2, "command", "23");
ret |= EC_TEST_CHECK_PARSE(node, 3, "command", "option", "23");
+ ret |= EC_TEST_CHECK_PARSE(node, 5, "command", "option", "23",
+ "z", "z");
ret |= EC_TEST_CHECK_PARSE(node, -1, "command", "15");
ret |= EC_TEST_CHECK_PARSE(node, -1, "foo");
ec_node_free(node);
- node = EC_NODE_CMD(NULL, "good morning [count] bob|bobby|michael",
+ node = EC_NODE_CMD(EC_NO_ID, "good morning [count] bob|bobby|michael",
ec_node_int("count", 0, 10, 10));
if (node == NULL) {
- ec_log(EC_LOG_ERR, "cannot create node\n");
+ EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;
}
ret |= EC_TEST_CHECK_PARSE(node, 4, "good", "morning", "1", "bob");
git.droids-corp.org / protos / libecoli.git / blobdiff