+/* 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>
#include <ecoli_node_int.h>
#include <ecoli_node_re_lex.h>
+EC_LOG_TYPE_REGISTER(node_re_lex);
+
struct regexp_pattern {
char *pattern;
regex_t r;
c = dup[pos.rm_eo + off];
dup[pos.rm_eo + off] = '\0';
- ec_log(EC_LOG_DEBUG, "re_lex match <%s>\n", &dup[off]);
+ EC_LOG(EC_LOG_DEBUG, "re_lex match <%s>\n", &dup[off]);
if (ec_strvec_add(strvec, &dup[off]) < 0)
goto fail;
return NULL;
}
-static struct ec_parsed *ec_node_re_lex_parse(const struct ec_node *gen_node,
- const struct ec_strvec *strvec)
+static int
+ec_node_re_lex_parse(const struct ec_node *gen_node,
+ 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, *match_strvec;
- struct ec_parsed *parsed = NULL, *child_parsed;
+ struct ec_strvec *new_vec = NULL;
+ struct ec_parse *child_parse;
const char *str;
+ int ret;
- parsed = ec_parsed();
- if (parsed == NULL)
- return NULL;
-
- if (ec_strvec_len(strvec) == 0)
- return parsed;
-
- str = ec_strvec_val(strvec, 0);
- new_vec = tokenize(node->table, node->len, str);
+ if (ec_strvec_len(strvec) == 0) {
+ new_vec = ec_strvec();
+ } else {
+ str = ec_strvec_val(strvec, 0);
+ new_vec = tokenize(node->table, node->len, str);
+ }
if (new_vec == NULL)
goto fail;
- printf("--------\n");
- ec_strvec_dump(stdout, new_vec);
- child_parsed = ec_node_parse_strvec(node->child, new_vec);
- if (child_parsed == NULL)
+ ret = ec_node_parse_child(node->child, state, new_vec);
+ if (ret < 0)
goto fail;
- if (!ec_parsed_matches(child_parsed) ||
- ec_parsed_len(child_parsed) !=
- ec_strvec_len(new_vec)) {
- ec_strvec_free(new_vec);
- ec_parsed_free(child_parsed);
- return parsed;
+ if ((unsigned)ret == ec_strvec_len(new_vec)) {
+ ret = 1;
+ } 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);
new_vec = NULL;
- ec_parsed_add_child(parsed, child_parsed);
- match_strvec = ec_strvec_ndup(strvec, 0, 1);
- if (match_strvec == NULL)
- goto fail;
- ec_parsed_set_match(parsed, gen_node, match_strvec);
-
- return parsed;
+ return ret;
fail:
ec_strvec_free(new_vec);
- ec_parsed_free(parsed);
-
- return NULL;
+ return -1;
}
static void ec_node_re_lex_free_priv(struct ec_node *gen_node)
ec_node_free(node->child);
}
+static size_t
+ec_node_re_lex_get_children_count(const struct ec_node *gen_node)
+{
+ struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
+
+ if (node->child)
+ return 1;
+ return 0;
+}
+
+static struct ec_node *
+ec_node_re_lex_get_child(const struct ec_node *gen_node, size_t i)
+{
+ struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
+
+ if (i >= 1)
+ return NULL;
+
+ return node->child;
+}
+
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,
+ .get_children_count = ec_node_re_lex_get_children_count,
+ .get_child = ec_node_re_lex_get_child,
};
EC_NODE_TYPE_REGISTER(ec_node_re_lex_type);
int ret;
char *pat_dup = NULL;
- ret = -ENOMEM;
pat_dup = ec_strdup(pattern);
if (pat_dup == NULL)
goto fail;
- ret = -ENOMEM;
table = ec_realloc(node->table, sizeof(*table) * (node->len + 1));
if (table == NULL)
goto fail;
ret = regcomp(&table[node->len].r, pattern, REG_EXTENDED);
if (ret != 0) {
- ec_log(EC_LOG_ERR,
+ EC_LOG(EC_LOG_ERR,
"Regular expression <%s> compilation failed: %d\n",
pattern, ret);
if (ret == REG_ESPACE)
- ret = -ENOMEM;
+ errno = ENOMEM;
else
- ret = -EINVAL;
+ errno = EINVAL;
goto fail;
}
fail:
ec_free(pat_dup);
- return ret;
+ return -1;
}
struct ec_node *ec_node_re_lex(const char *id, struct ec_node *child)
return &node->gen;
}
-
+/* LCOV_EXCL_START */
static int ec_node_re_lex_testcase(void)
{
struct ec_node *node;
- int ret = 0;
-
- node = ec_node_re_lex(NULL,
- ec_node_many(NULL,
- EC_NODE_OR(NULL,
- ec_node_str(NULL, "foo"),
- ec_node_str(NULL, "bar"),
- ec_node_int(NULL, 0, 1000, 0)
+ int ret, testres = 0;
+
+ node = ec_node_re_lex(EC_NO_ID,
+ ec_node_many(EC_NO_ID,
+ EC_NODE_OR(EC_NO_ID,
+ ec_node_str(EC_NO_ID, "foo"),
+ ec_node_str(EC_NO_ID, "bar"),
+ ec_node_int(EC_NO_ID, 0, 1000, 0)
), 0, 0
)
);
if (node == NULL) {
- ec_log(EC_LOG_ERR, "cannot create node\n");
+ EC_LOG(EC_LOG_ERR, "cannot create node\n");
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_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 */
static struct ec_test ec_node_re_lex_test = {
.name = "node_re_lex",
git.droids-corp.org / protos / libecoli.git / blobdiff