X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_sh_lex.c;h=b39ce213e580c725e3b6b7f94aa3777545f58e0d;hb=7c07e2a8b3b5851de0c238da830291f041185778;hp=1da0a90bbf5dadc784827e5406aee5614eb59c12;hpb=e746f568b6a3ab77d0100976d8fa5a68f611bcd3;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_sh_lex.c b/lib/ecoli_node_sh_lex.c index 1da0a90..b39ce21 100644 --- a/lib/ecoli_node_sh_lex.c +++ b/lib/ecoli_node_sh_lex.c @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2016, Olivier MATZ - * - * 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 */ #include @@ -35,16 +12,19 @@ #include #include +#include #include #include #include -#include -#include +#include +#include #include #include #include #include +EC_LOG_TYPE_REGISTER(node_sh_lex); + struct ec_node_sh_lex { struct ec_node gen; struct ec_node *child; @@ -113,7 +93,7 @@ static char *unquote_str(const char *str, size_t n, int allow_missing_quote, *missing_quote = str[0]; if (allow_missing_quote == 0) { ec_free(dst); - errno = EINVAL; + errno = EBADMSG; return NULL; } } @@ -157,31 +137,30 @@ static struct ec_strvec *tokenize(const char *str, int completion, char *word = NULL, *concat = NULL, *tmp; int last_is_space = 1; -// printf("str=%s\n", str); - strvec = ec_strvec(); if (strvec == NULL) goto fail; while (str[off] != '\0') { + if (missing_quote != NULL) + *missing_quote = '\0'; len = eat_spaces(&str[off]); if (len > 0) last_is_space = 1; -// printf("space=%zd\n", len); off += len; len = 0; suboff = off; while (str[suboff] != '\0') { + if (missing_quote != NULL) + *missing_quote = '\0'; last_is_space = 0; if (str[suboff] == '"' || str[suboff] == '\'') { sublen = eat_quoted_str(&str[suboff]); -// printf("sublen=%zd\n", sublen); word = unquote_str(&str[suboff], sublen, allow_missing_quote, missing_quote); } else { sublen = eat_str(&str[suboff]); -// printf("sublen=%zd\n", sublen); if (sublen == 0) break; word = ec_strndup(&str[suboff], sublen); @@ -189,7 +168,6 @@ static struct ec_strvec *tokenize(const char *str, int completion, if (word == NULL) goto fail; -// printf("word=%s\n", word); len += sublen; suboff += sublen; @@ -215,8 +193,6 @@ static struct ec_strvec *tokenize(const char *str, int completion, concat = NULL; } - /* XXX remove all printf comments */ -// printf("str off=%zd len=%zd\n", off, len); off += len; } @@ -238,12 +214,12 @@ static struct ec_strvec *tokenize(const char *str, int completion, static int ec_node_sh_lex_parse(const struct ec_node *gen_node, - struct ec_parsed *state, + struct ec_parse *state, const struct ec_strvec *strvec) { struct ec_node_sh_lex *node = (struct ec_node_sh_lex *)gen_node; struct ec_strvec *new_vec = NULL; - struct ec_parsed *child_parsed; + struct ec_parse *child_parse; const char *str; int ret; @@ -253,21 +229,22 @@ ec_node_sh_lex_parse(const struct ec_node *gen_node, str = ec_strvec_val(strvec, 0); new_vec = tokenize(str, 0, 0, NULL); } - if (new_vec == NULL) { - ret = -ENOMEM; + if (new_vec == NULL && errno == EBADMSG) /* quotes not closed */ + return EC_PARSE_NOMATCH; + if (new_vec == NULL) goto fail; - } ret = ec_node_parse_child(node->child, state, new_vec); - if (ret >= 0) { - if ((unsigned)ret == ec_strvec_len(new_vec)) { - ret = 1; - } else { - child_parsed = ec_parsed_get_last_child(state); - ec_parsed_del_child(state, child_parsed); - ec_parsed_free(child_parsed); - ret = EC_PARSED_NOMATCH; - } + if (ret < 0) + goto fail; + + 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); @@ -277,43 +254,85 @@ ec_node_sh_lex_parse(const struct ec_node *gen_node, fail: ec_strvec_free(new_vec); - return ret; + return -1; } static int ec_node_sh_lex_complete(const struct ec_node *gen_node, - struct ec_completed *completed, - struct ec_parsed *parsed, + struct ec_comp *comp, const struct ec_strvec *strvec) { struct ec_node_sh_lex *node = (struct ec_node_sh_lex *)gen_node; + struct ec_comp *tmp_comp = NULL; struct ec_strvec *new_vec = NULL; + struct ec_comp_iter *iter = NULL; + struct ec_comp_item *item = NULL; + char *new_str = NULL; const char *str; - char missing_quote; + char missing_quote = '\0'; int ret; if (ec_strvec_len(strvec) != 1) return 0; str = ec_strvec_val(strvec, 0); -// printf("\nold:%s\n", str); new_vec = tokenize(str, 1, 1, &missing_quote); if (new_vec == NULL) goto fail; -// printf("new:%s\n", ec_strvec_val(new_vec, 0)); - // XXX: complete should add the quotes for !EC_PARTIAL: use another - // completed object - ret = ec_node_complete_child(node->child, completed, parsed, new_vec); + /* we will store the completions in a temporary struct, because + * we want to update them (ex: add missing quotes) */ + tmp_comp = ec_comp(ec_comp_get_state(comp)); + if (tmp_comp == NULL) + goto fail; + + ret = ec_node_complete_child(node->child, tmp_comp, new_vec); if (ret < 0) goto fail; + /* add missing quote for full completions */ + if (missing_quote != '\0') { + iter = ec_comp_iter(tmp_comp, EC_COMP_FULL); + if (iter == NULL) + goto fail; + while ((item = ec_comp_iter_next(iter)) != NULL) { + str = ec_comp_item_get_str(item); + if (ec_asprintf(&new_str, "%c%s%c", missing_quote, str, + missing_quote) < 0) { + new_str = NULL; + goto fail; + } + if (ec_comp_item_set_str(item, new_str) < 0) + goto fail; + ec_free(new_str); + new_str = NULL; + + str = ec_comp_item_get_completion(item); + if (ec_asprintf(&new_str, "%s%c", str, + missing_quote) < 0) { + new_str = NULL; + goto fail; + } + if (ec_comp_item_set_completion(item, new_str) < 0) + goto fail; + ec_free(new_str); + new_str = NULL; + } + } + + ec_comp_iter_free(iter); ec_strvec_free(new_vec); + ec_comp_merge(comp, tmp_comp); + return 0; fail: + ec_comp_free(tmp_comp); + ec_comp_iter_free(iter); ec_strvec_free(new_vec); + ec_free(new_str); + return -1; } @@ -324,12 +343,35 @@ static void ec_node_sh_lex_free_priv(struct ec_node *gen_node) ec_node_free(node->child); } +static size_t +ec_node_sh_lex_get_children_count(const struct ec_node *gen_node) +{ + struct ec_node_sh_lex *node = (struct ec_node_sh_lex *)gen_node; + + if (node->child) + return 1; + return 0; +} + +static struct ec_node * +ec_node_sh_lex_get_child(const struct ec_node *gen_node, size_t i) +{ + struct ec_node_sh_lex *node = (struct ec_node_sh_lex *)gen_node; + + if (i >= 1) + return NULL; + + return node->child; +} + static struct ec_node_type ec_node_sh_lex_type = { .name = "sh_lex", .parse = ec_node_sh_lex_parse, .complete = ec_node_sh_lex_complete, .size = sizeof(struct ec_node_sh_lex), .free_priv = ec_node_sh_lex_free_priv, + .get_children_count = ec_node_sh_lex_get_children_count, + .get_child = ec_node_sh_lex_get_child, }; EC_NODE_TYPE_REGISTER(ec_node_sh_lex_type); @@ -356,82 +398,85 @@ struct ec_node *ec_node_sh_lex(const char *id, struct ec_node *child) static int ec_node_sh_lex_testcase(void) { struct ec_node *node; - int ret = 0; + int testres = 0; - node = ec_node_sh_lex(NULL, - EC_NODE_SEQ(NULL, - ec_node_str(NULL, "foo"), - ec_node_option(NULL, - ec_node_str(NULL, "toto") + node = ec_node_sh_lex(EC_NO_ID, + EC_NODE_SEQ(EC_NO_ID, + ec_node_str(EC_NO_ID, "foo"), + ec_node_option(EC_NO_ID, + ec_node_str(EC_NO_ID, "toto") ), - ec_node_str(NULL, "bar") + ec_node_str(EC_NO_ID, "bar") ) ); 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, 1, "foo bar"); - ret |= EC_TEST_CHECK_PARSE(node, 1, " foo bar"); - ret |= EC_TEST_CHECK_PARSE(node, 1, " 'foo' \"bar\""); - ret |= EC_TEST_CHECK_PARSE(node, 1, " 'f'oo 'toto' bar"); - ret |= EC_TEST_CHECK_PARSE(node, -1, " foo toto bar'"); + testres |= EC_TEST_CHECK_PARSE(node, 1, "foo bar"); + testres |= EC_TEST_CHECK_PARSE(node, 1, " foo bar"); + testres |= EC_TEST_CHECK_PARSE(node, 1, " 'foo' \"bar\""); + testres |= EC_TEST_CHECK_PARSE(node, 1, " 'f'oo 'toto' bar"); + testres |= EC_TEST_CHECK_PARSE(node, -1, " foo toto bar'"); ec_node_free(node); /* test completion */ - node = ec_node_sh_lex(NULL, - EC_NODE_SEQ(NULL, - ec_node_str(NULL, "foo"), - ec_node_option(NULL, - ec_node_str(NULL, "toto") + node = ec_node_sh_lex(EC_NO_ID, + EC_NODE_SEQ(EC_NO_ID, + ec_node_str(EC_NO_ID, "foo"), + ec_node_option(EC_NO_ID, + ec_node_str(EC_NO_ID, "toto") ), - ec_node_str(NULL, "bar"), - ec_node_str(NULL, "titi") + ec_node_str(EC_NO_ID, "bar"), + ec_node_str(EC_NO_ID, "titi") ) ); 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_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "", EC_NODE_ENDLIST, "foo", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, " ", EC_NODE_ENDLIST, "foo", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "f", EC_NODE_ENDLIST, "foo", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "foo", EC_NODE_ENDLIST, "foo", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "foo ", EC_NODE_ENDLIST, "bar", "toto", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "foo t", EC_NODE_ENDLIST, "toto", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "foo b", EC_NODE_ENDLIST, "bar", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "foo bar", EC_NODE_ENDLIST, "bar", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "foo bar ", EC_NODE_ENDLIST, "titi", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "foo toto bar ", EC_NODE_ENDLIST, "titi", EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "x", EC_NODE_ENDLIST, EC_NODE_ENDLIST); - ret |= EC_TEST_CHECK_COMPLETE(node, + testres |= EC_TEST_CHECK_COMPLETE(node, "foo barx", EC_NODE_ENDLIST, EC_NODE_ENDLIST); + testres |= EC_TEST_CHECK_COMPLETE(node, + "foo 'b", EC_NODE_ENDLIST, + "'bar'", EC_NODE_ENDLIST); ec_node_free(node); - return ret; + return testres; } /* LCOV_EXCL_STOP */