X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_sh_lex.c;h=e27f21bdb1135635c3a5a83aca54751fe2571dab;hb=833dc6c2a9c47b821548b197a1d1f96f60df7de8;hp=b92af1f8d4d68cad113f537f72651cd80c941c98;hpb=90d09f5806b457e758ac7f4fadf485d24162d38f;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_sh_lex.c b/lib/ecoli_node_sh_lex.c
index b92af1f..e27f21b 100644
--- a/lib/ecoli_node_sh_lex.c
+++ b/lib/ecoli_node_sh_lex.c
@@ -1,28 +1,5 @@
-/*
- * Copyright (c) 2016, 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 <stdio.h>
@@ -35,16 +12,19 @@
 
 #include <ecoli_malloc.h>
 #include <ecoli_log.h>
+#include <ecoli_string.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_seq.h>
 #include <ecoli_node_str.h>
 #include <ecoli_node_option.h>
 #include <ecoli_node_sh_lex.h>
 
+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;
 		}
 	}
@@ -141,8 +121,9 @@ static size_t eat_str(const char *str)
 {
 	size_t i = 0;
 
-	/* skip spaces */
-	while (!isblank(str[i]) && str[i] != '\0')
+	/* eat chars until we find a quote, space, or end of string  */
+	while (!isblank(str[i]) && str[i] != '\0' &&
+			str[i] != '"' && str[i] != '\'')
 		i++;
 
 	return i;
@@ -156,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);
@@ -188,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;
@@ -214,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;
 	}
 
@@ -235,93 +212,128 @@ static struct ec_strvec *tokenize(const char *str, int completion,
 	return NULL;
 }
 
-static struct ec_parsed *ec_node_sh_lex_parse(const struct ec_node *gen_node,
-	const struct ec_strvec *strvec)
+static int
+ec_node_sh_lex_parse(const struct ec_node *gen_node,
+		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, *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(str, 0, 0, NULL);
+	if (ec_strvec_len(strvec) == 0) {
+		new_vec = ec_strvec();
+	} else {
+		str = ec_strvec_val(strvec, 0);
+		new_vec = tokenize(str, 0, 0, NULL);
+	}
+	if (new_vec == NULL && errno == EBADMSG) /* quotes not closed */
+		return EC_PARSE_NOMATCH;
 	if (new_vec == NULL)
 		goto fail;
 
-	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 struct ec_completed *ec_node_sh_lex_complete(const struct ec_node *gen_node,
-	const struct ec_strvec *strvec)
+static int
+ec_node_sh_lex_complete(const struct ec_node *gen_node,
+			struct ec_comp *comp,
+			const struct ec_strvec *strvec)
 {
 	struct ec_node_sh_lex *node = (struct ec_node_sh_lex *)gen_node;
-	struct ec_completed *completed, *child_completed = NULL;
+	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;
-
-//	printf("==================\n");
-	completed = ec_completed();
-	if (completed == NULL)
-		return NULL;
+	char missing_quote = '\0';
+	int ret;
 
 	if (ec_strvec_len(strvec) != 1)
-		return completed;
+		return 0;
 
 	str = ec_strvec_val(strvec, 0);
 	new_vec = tokenize(str, 1, 1, &missing_quote);
 	if (new_vec == NULL)
 		goto fail;
 
-//	ec_strvec_dump(new_vec, stdout);
+	/* 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;
 
-	child_completed = ec_node_complete_strvec(node->child, new_vec);
-	if (child_completed == NULL)
+	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);
-	new_vec = NULL;
-	ec_completed_merge(completed, child_completed);
 
-	return completed;
+	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_completed_free(completed);
-	return NULL;
+	ec_free(new_str);
+
+	return -1;
 }
 
 static void ec_node_sh_lex_free_priv(struct ec_node *gen_node)
@@ -331,12 +343,38 @@ 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 int
+ec_node_sh_lex_get_child(const struct ec_node *gen_node, size_t i,
+	struct ec_node **child, unsigned int *refs)
+{
+	struct ec_node_sh_lex *node = (struct ec_node_sh_lex *)gen_node;
+
+	if (i >= 1)
+		return -1;
+
+	*refs = 1;
+	*child = node->child;
+	return 0;
+}
+
 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);
@@ -348,7 +386,7 @@ struct ec_node *ec_node_sh_lex(const char *id, struct ec_node *child)
 	if (child == NULL)
 		return NULL;
 
-	node = (struct ec_node_sh_lex *)__ec_node(&ec_node_sh_lex_type, id);
+	node = (struct ec_node_sh_lex *)ec_node_from_type(&ec_node_sh_lex_type, id);
 	if (node == NULL) {
 		ec_node_free(child);
 		return NULL;
@@ -359,97 +397,91 @@ struct ec_node *ec_node_sh_lex(const char *id, struct ec_node *child)
 	return &node->gen;
 }
 
+/* LCOV_EXCL_START */
 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");
+	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,
-		"foo");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		" ", EC_NODE_ENDLIST,
-		"foo", EC_NODE_ENDLIST,
-		"foo");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"f", EC_NODE_ENDLIST,
-		"oo", EC_NODE_ENDLIST,
-		"oo");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo", EC_NODE_ENDLIST,
-		"", EC_NODE_ENDLIST,
-		"");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"foo", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo ", EC_NODE_ENDLIST,
-		"bar", "toto", EC_NODE_ENDLIST,
-		"");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"bar", "toto", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo t", EC_NODE_ENDLIST,
-		"oto", EC_NODE_ENDLIST,
-		"oto");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"toto", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo b", EC_NODE_ENDLIST,
-		"ar", EC_NODE_ENDLIST,
-		"ar");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"bar", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo bar", EC_NODE_ENDLIST,
-		"", EC_NODE_ENDLIST,
-		"");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"bar", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo bar ", EC_NODE_ENDLIST,
-		"titi", EC_NODE_ENDLIST,
-		"titi");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"titi", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo toto bar ", EC_NODE_ENDLIST,
-		"titi", EC_NODE_ENDLIST,
-		"titi");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		"titi", EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"x", EC_NODE_ENDLIST,
-		EC_NODE_ENDLIST,
-		"");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		EC_NODE_ENDLIST);
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo barx", EC_NODE_ENDLIST,
-		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 */
 
 static struct ec_test ec_node_sh_lex_test = {
 	.name = "node_sh_lex",