X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_re_lex.c;h=0120367ecff6f710cceb77e4ed4eb3dbf1983d87;hb=51028779e0a8772091aec5ab96bcf2519cf2f1ad;hp=d5431784db225917950a01d7cb4ab9e4ce06b4cd;hpb=b058e053d494129ee861cd2ca1e0ea9a0cc9814f;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_re_lex.c b/lib/ecoli_node_re_lex.c index d543178..0120367 100644 --- a/lib/ecoli_node_re_lex.c +++ b/lib/ecoli_node_re_lex.c @@ -1,3 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2016, Olivier MATZ + */ + #include #include #include @@ -10,7 +14,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -92,12 +97,12 @@ fail: 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; @@ -107,10 +112,8 @@ ec_node_re_lex_parse(const struct ec_node *gen_node, str = ec_strvec_val(strvec, 0); new_vec = tokenize(node->table, node->len, str); } - if (new_vec == NULL) { - ret = -ENOMEM; + if (new_vec == NULL) goto fail; - } ret = ec_node_parse_child(node->child, state, new_vec); if (ret < 0) @@ -118,11 +121,11 @@ ec_node_re_lex_parse(const struct ec_node *gen_node, 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); @@ -132,7 +135,7 @@ ec_node_re_lex_parse(const struct ec_node *gen_node, fail: ec_strvec_free(new_vec); - return ret; + return -1; } static void ec_node_re_lex_free_priv(struct ec_node *gen_node) @@ -140,21 +143,47 @@ static void ec_node_re_lex_free_priv(struct ec_node *gen_node) struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node; unsigned int i; + ec_node_free(node->child); for (i = 0; i < node->len; i++) { ec_free(node->table[i].pattern); regfree(&node->table[i].r); } ec_free(node->table); - 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 int +ec_node_re_lex_get_child(const struct ec_node *gen_node, size_t i, + struct ec_node **child, unsigned int *refs) +{ + struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node; + + if (i >= 1) + return -1; + + *child = node->child; + *refs = 1; + return 0; } 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); @@ -166,12 +195,10 @@ int ec_node_re_lex_add(struct ec_node *gen_node, const char *pattern, int keep) 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; @@ -182,9 +209,9 @@ int ec_node_re_lex_add(struct ec_node *gen_node, const char *pattern, int keep) "Regular expression <%s> compilation failed: %d\n", pattern, ret); if (ret == REG_ESPACE) - ret = -ENOMEM; + errno = ENOMEM; else - ret = -EINVAL; + errno = EINVAL; goto fail; } @@ -198,7 +225,7 @@ int ec_node_re_lex_add(struct ec_node *gen_node, const char *pattern, int keep) fail: ec_free(pat_dup); - return ret; + return -1; } struct ec_node *ec_node_re_lex(const char *id, struct ec_node *child) @@ -223,7 +250,7 @@ struct ec_node *ec_node_re_lex(const char *id, struct ec_node *child) 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, @@ -239,27 +266,37 @@ static int ec_node_re_lex_testcase(void) 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 */