+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <ecoli_test.h>
#include <ecoli_strvec.h>
#include <ecoli_node.h>
-#include <ecoli_parsed.h>
+#include <ecoli_complete.h>
+#include <ecoli_parse.h>
#include <ecoli_node_many.h>
#include <ecoli_node_or.h>
#include <ecoli_node_str.h>
static int
ec_node_re_lex_parse(const struct ec_node *gen_node,
- struct ec_parsed *state,
+ struct ec_parse *state,
const struct ec_strvec *strvec)
{
struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
struct ec_strvec *new_vec = NULL;
- struct ec_parsed *child_parsed;
+ struct ec_parse *child_parse;
const char *str;
int ret;
if ((unsigned)ret == ec_strvec_len(new_vec)) {
ret = 1;
- } else if (ret != EC_PARSED_NOMATCH) {
- child_parsed = ec_parsed_get_last_child(state);
- ec_parsed_del_child(state, child_parsed);
- ec_parsed_free(child_parsed);
- ret = EC_PARSED_NOMATCH;
+ } else if (ret != EC_PARSE_NOMATCH) {
+ child_parse = ec_parse_get_last_child(state);
+ ec_parse_unlink_child(state, child_parse);
+ ec_parse_free(child_parse);
+ ret = EC_PARSE_NOMATCH;
}
ec_strvec_free(new_vec);
static struct ec_node_type ec_node_re_lex_type = {
.name = "re_lex",
.parse = ec_node_re_lex_parse,
- //.complete = ec_node_re_lex_complete, //XXX
+ .complete = ec_node_complete_unknown,
.size = sizeof(struct ec_node_re_lex),
.free_priv = ec_node_re_lex_free_priv,
};
static int ec_node_re_lex_testcase(void)
{
struct ec_node *node;
- int ret = 0;
+ int ret, testres = 0;
node = ec_node_re_lex(EC_NO_ID,
ec_node_many(EC_NO_ID,
return -1;
}
- /* XXX add ^ automatically ? */
- ret |= ec_node_re_lex_add(node, "[a-zA-Z]+", 1);
- ret |= ec_node_re_lex_add(node, "[0-9]+", 1);
- ret |= ec_node_re_lex_add(node, "=", 1);
- ret |= ec_node_re_lex_add(node, "-", 1);
- ret |= ec_node_re_lex_add(node, "\\+", 1);
- ret |= ec_node_re_lex_add(node, "[ ]+", 0);
+ ret = ec_node_re_lex_add(node, "[a-zA-Z]+", 1);
+ testres |= EC_TEST_CHECK(ret == 0, "cannot add regexp");
+ ret = ec_node_re_lex_add(node, "[0-9]+", 1);
+ testres |= EC_TEST_CHECK(ret == 0, "cannot add regexp");
+ ret = ec_node_re_lex_add(node, "=", 1);
+ testres |= EC_TEST_CHECK(ret == 0, "cannot add regexp");
+ ret = ec_node_re_lex_add(node, "-", 1);
+ testres |= EC_TEST_CHECK(ret == 0, "cannot add regexp");
+ ret = ec_node_re_lex_add(node, "\\+", 1);
+ testres |= EC_TEST_CHECK(ret == 0, "cannot add regexp");
+ ret = ec_node_re_lex_add(node, "[ ]+", 0);
+ testres |= EC_TEST_CHECK(ret == 0, "cannot add regexp");
if (ret != 0) {
EC_LOG(EC_LOG_ERR, "cannot add regexp to node\n");
ec_node_free(node);
return -1;
}
- ret |= EC_TEST_CHECK_PARSE(node, 1, " foo bar 324 bar234");
- ret |= EC_TEST_CHECK_PARSE(node, 1, "foo bar324");
- ret |= EC_TEST_CHECK_PARSE(node, 1, "");
- ret |= EC_TEST_CHECK_PARSE(node, -1, "foobar");
+ testres |= EC_TEST_CHECK_PARSE(node, 1, " foo bar 324 bar234");
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "foo bar324");
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "");
+ testres |= EC_TEST_CHECK_PARSE(node, -1, "foobar");
+
+ /* no completion */
+ testres |= EC_TEST_CHECK_COMPLETE(node,
+ "", EC_NODE_ENDLIST,
+ EC_NODE_ENDLIST);
ec_node_free(node);
- return ret;
+ return testres;
}
/* LCOV_EXCL_STOP */