-/*
- * Copyright (c) 2016-2017, Olivier MATZ <zer0@droids-corp.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the University of California, Berkeley nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
*/
#include <sys/queue.h>
#include <ecoli_test.h>
#include <ecoli_strvec.h>
#include <ecoli_node.h>
-#include <ecoli_parsed.h>
-#include <ecoli_completed.h>
+#include <ecoli_parse.h>
+#include <ecoli_complete.h>
#include <ecoli_node_expr.h>
#include <ecoli_node_str.h>
#include <ecoli_node_or.h>
static int
ec_node_cmd_eval_var(void **result, void *userctx,
- const struct ec_parsed *var)
+ const struct ec_parse *var)
{
const struct ec_strvec *vec;
struct ec_node_cmd *node = userctx;
(void)userctx;
/* get parsed string vector, it should contain only one str */
- vec = ec_parsed_strvec(var);
- if (ec_strvec_len(vec) != 1)
- return -EINVAL;
+ vec = ec_parse_strvec(var);
+ if (ec_strvec_len(vec) != 1) {
+ errno = EINVAL;
+ return -1;
+ }
str = ec_strvec_val(vec, 0);
for (i = 0; i < node->len; i++) {
id = ec_node_id(node->table[i]);
- //printf("i=%d id=%s\n", i, id);
if (id == NULL)
continue;
if (strcmp(str, id))
/* if id matches, use a node provided by the user... */
eval = ec_node_clone(node->table[i]);
if (eval == NULL)
- return -ENOMEM;
+ return -1;
break;
}
if (eval == NULL) {
eval = ec_node_str(EC_NO_ID, str);
if (eval == NULL)
- return -ENOMEM;
+ return -1;
}
- //printf("eval var %s %p\n", str, eval);
*result = eval;
return 0;
static int
ec_node_cmd_eval_pre_op(void **result, void *userctx, void *operand,
- const struct ec_parsed *operator)
+ const struct ec_parse *operator)
{
(void)result;
(void)userctx;
(void)operand;
(void)operator;
- return -EINVAL;
+ errno = EINVAL;
+ return -1;
}
static int
ec_node_cmd_eval_post_op(void **result, void *userctx, void *operand,
- const struct ec_parsed *operator)
+ const struct ec_parse *operator)
{
const struct ec_strvec *vec;
- struct ec_node *eval = operand;;
+ struct ec_node *in = operand;;
+ struct ec_node *out = NULL;;
(void)userctx;
/* 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), "*"))
- eval = NULL; //XXX
- else
- return -EINVAL;
+ vec = ec_parse_strvec(operator);
+ if (ec_strvec_len(vec) != 1) {
+ errno = EINVAL;
+ return -1;
+ }
- //printf("eval post_op %p\n", eval);
- *result = eval;
+ if (!strcmp(ec_strvec_val(vec, 0), "*")) {
+ out = ec_node_many(EC_NO_ID,
+ ec_node_clone(in), 0, 0);
+ if (out == NULL)
+ return -1;
+ ec_node_free(in);
+ *result = out;
+ } else {
+ errno = EINVAL;
+ return -1;
+ }
return 0;
}
static int
ec_node_cmd_eval_bin_op(void **result, void *userctx, void *operand1,
- const struct ec_parsed *operator, void *operand2)
+ const struct ec_parse *operator, void *operand2)
{
const struct ec_strvec *vec;
(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;
+ vec = ec_parse_strvec(operator);
+ if (ec_strvec_len(vec) > 1) {
+ errno = EINVAL;
+ return -1;
+ }
- if (!strcmp(ec_strvec_val(vec, 0), "|")) {
- 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(in2);
- *result = out;
+ if (ec_strvec_len(vec) == 0) {
+ if (!strcmp(in1->type->name, "seq")) {
+ if (ec_node_seq_add(in1, ec_node_clone(in2)) < 0)
+ return -1;
+ ec_node_free(in2);
+ *result = in1;
+ } else {
+ out = EC_NODE_SEQ(EC_NO_ID, ec_node_clone(in1),
+ ec_node_clone(in2));
+ if (out == NULL)
+ return -1;
+ ec_node_free(in1);
+ ec_node_free(in2);
+ *result = out;
+ }
+ } else if (!strcmp(ec_strvec_val(vec, 0), "|")) {
+ if (!strcmp(in2->type->name, "or")) {
+ if (ec_node_or_add(in2, ec_node_clone(in1)) < 0)
+ return -1;
+ ec_node_free(in1);
+ *result = in2;
+ } else if (!strcmp(in1->type->name, "or")) {
+ if (ec_node_or_add(in1, ec_node_clone(in2)) < 0)
+ return -1;
+ ec_node_free(in2);
+ *result = in1;
+ } else {
+ out = EC_NODE_OR(EC_NO_ID, ec_node_clone(in1),
+ ec_node_clone(in2));
+ if (out == NULL)
+ return -1;
+ ec_node_free(in1);
+ ec_node_free(in2);
+ *result = out;
+ }
} else if (!strcmp(ec_strvec_val(vec, 0), ",")) {
if (!strcmp(in2->type->name, "subset")) {
if (ec_node_subset_add(in2, ec_node_clone(in1)) < 0)
- return -EINVAL;
+ return -1;
ec_node_free(in1);
*result = in2;
+ } else if (!strcmp(in1->type->name, "subset")) {
+ if (ec_node_subset_add(in1, ec_node_clone(in2)) < 0)
+ return -1;
+ ec_node_free(in2);
+ *result = in1;
} else {
out = EC_NODE_SUBSET(EC_NO_ID, ec_node_clone(in1),
ec_node_clone(in2));
if (out == NULL)
- return -EINVAL;
+ return -1;
ec_node_free(in1);
ec_node_free(in2);
*result = out;
}
} else {
- return -EINVAL;
+ errno = EINVAL;
+ return -1;
}
- //printf("eval bin_op out %p\n", *result);
-
return 0;
}
static int
ec_node_cmd_eval_parenthesis(void **result, void *userctx,
- const struct ec_parsed *open_paren,
- const struct ec_parsed *close_paren,
+ const struct ec_parse *open_paren,
+ const struct ec_parse *close_paren,
void *value)
{
const struct ec_strvec *vec;
(void)close_paren;
/* get parsed string vector, it should contain only one str */
- vec = ec_parsed_strvec(open_paren);
- if (ec_strvec_len(vec) != 1)
- return -EINVAL;
+ vec = ec_parse_strvec(open_paren);
+ if (ec_strvec_len(vec) != 1) {
+ errno = EINVAL;
+ return -1;
+ }
if (!strcmp(ec_strvec_val(vec, 0), "[")) {
out = ec_node_option(EC_NO_ID, ec_node_clone(in));
if (out == NULL)
- return -EINVAL;
+ return -1;
ec_node_free(in);
} else if (!strcmp(ec_strvec_val(vec, 0), "(")) {
out = in;
} else {
- return -EINVAL;
+ errno = EINVAL;
+ return -1;
}
- //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,
- const struct ec_strvec *strvec)
-{
- struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
-
- 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 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_parse *p = NULL;
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(EC_NO_ID, "[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(EC_NO_ID, ","));
if (ret < 0)
goto fail;
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("empty", EC_NO_ID));
if (ret < 0)
goto fail;
ret = ec_node_expr_add_post_op(expr, 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(EC_NO_ID,
- ec_node_many(EC_NO_ID, ec_node_clone(expr), 1, 0));
+ /* prepend a lexer to the expression node */
+ lex = ec_node_re_lex(EC_NO_ID, ec_node_clone(expr));
if (lex == NULL)
goto fail;
goto fail;
/* parse the command expression */
- ret = -ENOMEM;
p = ec_node_parse(lex, node->cmd_str);
if (p == NULL)
goto fail;
- ret = -EINVAL;
- if (!ec_parsed_matches(p))
- goto fail;
- if (!ec_parsed_has_child(p))
+ if (!ec_parse_matches(p)) {
+ errno = EINVAL;
goto fail;
- if (!ec_parsed_has_child(ec_parsed_get_first_child(p)))
+ }
+ if (!ec_parse_has_child(p)) {
+ errno = EINVAL;
goto fail;
+ }
- ret = -ENOMEM;
- cmd = ec_node("seq", EC_NO_ID);
- if (cmd == NULL)
+ ret = ec_node_expr_eval(&result, expr, ec_parse_get_first_child(p),
+ &test_ops, node);
+ if (ret < 0)
goto fail;
- 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)
- goto fail;
- ret = ec_node_seq_add(cmd, result);
- if (ret < 0)
- goto fail;
- }
- ec_parsed_free(p);
+ ec_parse_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;
+ node->cmd = result;
return 0;
fail:
- ec_parsed_free(p);
+ ec_parse_free(p);
ec_node_free(expr);
ec_node_free(lex);
ec_node_free(cmd);
- return ret;
+
+ return -1;
+}
+
+static int
+ec_node_cmd_parse(const struct ec_node *gen_node, struct ec_parse *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_comp *comp,
+ const struct ec_strvec *strvec)
+{
+ struct ec_node_cmd *node = (struct ec_node_cmd *)gen_node;
+
+ return ec_node_complete_child(node->cmd, comp, 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;
-
- // XXX check node type
+ int ret;
assert(node != NULL);
- if (child == NULL)
- return -EINVAL;
-
- gen_node->flags &= ~EC_NODE_F_BUILT;
-
- table = ec_realloc(node->table, (node->len + 1) * sizeof(*node->table));
- if (table == NULL) {
- ec_node_free(child);
- return -ENOMEM;
+ if (child == NULL) {
+ errno = EINVAL;
+ goto fail;
}
- node->table = table;
- table[node->len] = child;
- node->len++;
+ if (ec_node_check_type(gen_node, &ec_node_cmd_type) < 0)
+ goto fail;
- child->parent = gen_node;
- TAILQ_INSERT_TAIL(&gen_node->children, child, next); // XXX really needed?
+ if (node->cmd == NULL) {
+ ret = ec_node_cmd_build(node);
+ if (ret < 0)
+ return ret;
+ }
- return 0;
-}
+ table = ec_realloc(node->table, (node->len + 1) * sizeof(*node->table));
+ if (table == NULL)
+ goto fail;
-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;
+ node->table = table;
- gen_node = __ec_node(&ec_node_cmd_type, id);
- if (gen_node == NULL)
+ if (ec_node_add_child(gen_node, child) < 0)
goto fail;
- node = (struct ec_node_cmd *)gen_node;
- node->cmd_str = ec_strdup(cmd_str);
- if (node->cmd_str == NULL)
- goto fail;
+ table[node->len] = child;
+ node->len++;
- return gen_node;
+ return 0;
fail:
- ec_node_free(gen_node);
- return NULL;
+ ec_node_free(child);
+ return -1;
}
struct ec_node *__ec_node_cmd(const char *id, const char *cmd, ...)
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;
+ int testres = 0;
node = EC_NODE_CMD(EC_NO_ID,
- "command [option] (subset1, subset2, subset3) x|y",
+ "command [option] (subset1, subset2, subset3, subset4) x|y z*",
ec_node_int("x", 0, 10, 10),
ec_node_int("y", 20, 30, 10)
);
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, -1, "command", "15");
- ret |= EC_TEST_CHECK_PARSE(node, -1, "foo");
+ testres |= EC_TEST_CHECK_PARSE(node, 2, "command", "1");
+ testres |= EC_TEST_CHECK_PARSE(node, 3, "command", "subset1", "1");
+ testres |= EC_TEST_CHECK_PARSE(node, 4, "command", "subset3", "subset2",
+ "1");
+ testres |= EC_TEST_CHECK_PARSE(node, 5, "command", "subset2", "subset3",
+ "subset1", "1");
+ testres |= EC_TEST_CHECK_PARSE(node, 6, "command", "subset3", "subset1",
+ "subset4", "subset2", "4");
+ testres |= EC_TEST_CHECK_PARSE(node, 2, "command", "23");
+ testres |= EC_TEST_CHECK_PARSE(node, 3, "command", "option", "23");
+ testres |= EC_TEST_CHECK_PARSE(node, 5, "command", "option", "23",
+ "z", "z");
+ testres |= EC_TEST_CHECK_PARSE(node, -1, "command", "15");
+ testres |= EC_TEST_CHECK_PARSE(node, -1, "foo");
ec_node_free(node);
node = EC_NODE_CMD(EC_NO_ID, "good morning [count] bob|bobby|michael",
EC_LOG(EC_LOG_ERR, "cannot create node\n");
return -1;
}
- ret |= EC_TEST_CHECK_PARSE(node, 4, "good", "morning", "1", "bob");
+ testres |= EC_TEST_CHECK_PARSE(node, 4, "good", "morning", "1", "bob");
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"", EC_NODE_ENDLIST,
"good", EC_NODE_ENDLIST);
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"g", EC_NODE_ENDLIST,
"good", EC_NODE_ENDLIST);
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"good", "morning", "", EC_NODE_ENDLIST,
"bob", "bobby", "michael", EC_NODE_ENDLIST);
ec_node_free(node);
- return ret;
+ node = EC_NODE_CMD(EC_NO_ID, "[foo [bar]]");
+ if (node == NULL) {
+ EC_LOG(EC_LOG_ERR, "cannot create node\n");
+ return -1;
+ }
+ testres |= EC_TEST_CHECK_PARSE(node, 0);
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "foo");
+ testres |= EC_TEST_CHECK_PARSE(node, 2, "foo", "bar");
+ testres |= EC_TEST_CHECK_PARSE(node, 0, "x");
+ ec_node_free(node);
+
+ return testres;
}
/* LCOV_EXCL_STOP */
git.droids-corp.org / protos / libecoli.git / blobdiff