X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_str.c;h=0100fecf26a07867df94ef01b4d8d39326f2ff8e;hb=ea3c5a3c8510621f5b30c2cc11bbc12ac2eff1bb;hp=85a40461bc06a8e2bcdec4749485998389427eb5;hpb=98d9724d716589bcb2e0982f4d1c08dce58ae13c;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_str.c b/lib/ecoli_node_str.c
index 85a4046..0100fec 100644
--- a/lib/ecoli_node_str.c
+++ b/lib/ecoli_node_str.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,10 +12,13 @@
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
-#include <ecoli_parsed.h>
-#include <ecoli_completed.h>
+#include <ecoli_config.h>
+#include <ecoli_parse.h>
+#include <ecoli_complete.h>
 #include <ecoli_node_str.h>
 
+EC_LOG_TYPE_REGISTER(node_str);
+
 struct ec_node_str {
 	struct ec_node gen;
 	char *string;
@@ -47,7 +27,7 @@ struct ec_node_str {
 
 static int
 ec_node_str_parse(const struct ec_node *gen_node,
-		struct ec_parsed *state,
+		struct ec_parse *state,
 		const struct ec_strvec *strvec)
 {
 	struct ec_node_str *node = (struct ec_node_str *)gen_node;
@@ -55,34 +35,32 @@ ec_node_str_parse(const struct ec_node *gen_node,
 
 	(void)state;
 
-	if (ec_strvec_len(strvec) != 1)
-		return EC_PARSED_NOMATCH;
+	if (node->string == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (ec_strvec_len(strvec) == 0)
+		return EC_PARSE_NOMATCH;
 
 	str = ec_strvec_val(strvec, 0);
 	if (strcmp(str, node->string) != 0)
-		return EC_PARSED_NOMATCH;
+		return EC_PARSE_NOMATCH;
 
 	return 1;
 }
 
-static struct ec_completed *
+static int
 ec_node_str_complete(const struct ec_node *gen_node,
-		struct ec_parsed *state,
+		struct ec_comp *comp,
 		const struct ec_strvec *strvec)
 {
 	struct ec_node_str *node = (struct ec_node_str *)gen_node;
-	struct ec_completed *completed;
-	const char *str, *add;
+	const char *str;
 	size_t n = 0;
 
-	(void)state;
-
-	completed = ec_completed();
-	if (completed == NULL)
-		return NULL;
-
 	if (ec_strvec_len(strvec) != 1)
-		return completed;
+		return 0;
 
 	str = ec_strvec_val(strvec, 0);
 	for (n = 0; n < node->len; n++) {
@@ -90,17 +68,15 @@ ec_node_str_complete(const struct ec_node *gen_node,
 			break;
 	}
 
+	/* no completion */
 	if (str[n] != '\0')
-		add = NULL;
-	else
-		add = node->string + n;
+		return EC_PARSE_NOMATCH;
 
-	if (ec_completed_add_elt(completed, state, gen_node, add) < 0) {
-		ec_completed_free(completed);
-		return NULL;
-	}
+	if (ec_comp_add_item(comp, gen_node, NULL, EC_COMP_FULL,
+					str, node->string) < 0)
+		return -1;
 
-	return completed;
+	return 0;
 }
 
 static const char *ec_node_str_desc(const struct ec_node *gen_node)
@@ -117,17 +93,49 @@ static void ec_node_str_free_priv(struct ec_node *gen_node)
 	ec_free(node->string);
 }
 
-static size_t ec_node_str_get_max_parse_len(const struct ec_node *gen_node)
+static const struct ec_config_schema ec_node_str_schema[] = {
+	{
+		.key = "string",
+		.desc = "The string to match.",
+		.type = EC_CONFIG_TYPE_STRING,
+	},
+};
+
+static int ec_node_str_set_config(struct ec_node *gen_node,
+				const struct ec_config *config)
 {
-	(void)gen_node;
-	return 1;
+	struct ec_node_str *node = (struct ec_node_str *)gen_node;
+	const struct ec_config *value = NULL;
+	char *s = NULL;
+
+	value = ec_config_dict_get(config, "string");
+	if (value == NULL) {
+		errno = EINVAL;
+		goto fail;
+	}
+
+	s = ec_strdup(value->string);
+	if (s == NULL)
+		goto fail;
+
+	ec_free(node->string);
+	node->string = s;
+	node->len = strlen(node->string);
+
+	return 0;
+
+fail:
+	ec_free(s);
+	return -1;
 }
 
 static struct ec_node_type ec_node_str_type = {
 	.name = "str",
+	.schema = ec_node_str_schema,
+	.schema_len = EC_COUNT_OF(ec_node_str_schema),
+	.set_config = ec_node_str_set_config,
 	.parse = ec_node_str_parse,
 	.complete = ec_node_str_complete,
-	.get_max_parse_len = ec_node_str_get_max_parse_len,
 	.desc = ec_node_str_desc,
 	.size = sizeof(struct ec_node_str),
 	.free_priv = ec_node_str_free_priv,
@@ -137,20 +145,35 @@ EC_NODE_TYPE_REGISTER(ec_node_str_type);
 
 int ec_node_str_set_str(struct ec_node *gen_node, const char *str)
 {
-	struct ec_node_str *node = (struct ec_node_str *)gen_node;
+	struct ec_config *config = NULL;
+	int ret;
 
-	if (str == NULL)
-		return -EINVAL;
-	if (node->string != NULL)
-		return -EEXIST; // XXX allow to replace
+	if (ec_node_check_type(gen_node, &ec_node_str_type) < 0)
+		goto fail;
 
-	node->string = ec_strdup(str);
-	if (node->string == NULL)
-		return -ENOMEM;
+	if (str == NULL) {
+		errno = EINVAL;
+		goto fail;
+	}
 
-	node->len = strlen(node->string);
+	config = ec_config_dict();
+	if (config == NULL)
+		goto fail;
+
+	ret = ec_config_dict_set(config, "string", ec_config_string(str));
+	if (ret < 0)
+		goto fail;
+
+	ret = ec_node_set_config(gen_node, config);
+	config = NULL;
+	if (ret < 0)
+		goto fail;
 
 	return 0;
+
+fail:
+	ec_config_free(config);
+	return -1;
 }
 
 struct ec_node *ec_node_str(const char *id, const char *str)
@@ -175,73 +198,69 @@ fail:
 static int ec_node_str_testcase(void)
 {
 	struct ec_node *node;
-	int ret = 0;
+	int testres = 0;
 
-	/* XXX use EC_NO_ID instead of NULL */
-	node = ec_node_str(NULL, "foo");
+	node = ec_node_str(EC_NO_ID, "foo");
 	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");
-	ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
-	ret |= EC_TEST_CHECK_PARSE(node, -1, "foobar");
-	ret |= EC_TEST_CHECK_PARSE(node, -1, " foo");
-	ret |= EC_TEST_CHECK_PARSE(node, -1, "");
+	testres |= EC_TEST_CHECK(!strcmp(ec_node_desc(node), "foo"),
+		"Invalid node description.");
+	testres |= EC_TEST_CHECK_PARSE(node, 1, "foo");
+	testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
+	testres |= EC_TEST_CHECK_PARSE(node, -1, "foobar");
+	testres |= EC_TEST_CHECK_PARSE(node, -1, " foo");
+	testres |= EC_TEST_CHECK_PARSE(node, -1, "");
 	ec_node_free(node);
 
-	node = ec_node_str(NULL, "Здравствуйте");
+	node = ec_node_str(EC_NO_ID, "Здравствуйте");
 	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, "Здравствуйте");
-	ret |= EC_TEST_CHECK_PARSE(node, 1, "Здравствуйте",
+	testres |= EC_TEST_CHECK_PARSE(node, 1, "Здравствуйте");
+	testres |= EC_TEST_CHECK_PARSE(node, 1, "Здравствуйте",
 		"John!");
-	ret |= EC_TEST_CHECK_PARSE(node, -1, "foo");
-	ret |= EC_TEST_CHECK_PARSE(node, -1, "");
+	testres |= EC_TEST_CHECK_PARSE(node, -1, "foo");
+	testres |= EC_TEST_CHECK_PARSE(node, -1, "");
 	ec_node_free(node);
 
 	/* an empty string node always matches */
-	node = ec_node_str(NULL, "");
+	node = ec_node_str(EC_NO_ID, "");
 	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, "");
-	ret |= EC_TEST_CHECK_PARSE(node, 1, "", "foo");
-	ret |= EC_TEST_CHECK_PARSE(node, -1, "foo");
+	testres |= EC_TEST_CHECK_PARSE(node, 1, "");
+	testres |= EC_TEST_CHECK_PARSE(node, 1, "", "foo");
+	testres |= EC_TEST_CHECK_PARSE(node, -1, "foo");
 	ec_node_free(node);
 
 	/* test completion */
-	node = ec_node_str(NULL, "foo");
+	node = ec_node_str(EC_NO_ID, "foo");
 	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,
-		EC_NODE_ENDLIST,
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		EC_NODE_ENDLIST,
-		"");
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+		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,
 		"x", EC_NODE_ENDLIST,
-		EC_NODE_ENDLIST,
-		"");
+		EC_NODE_ENDLIST);
 	ec_node_free(node);
 
-	return ret;
+	return testres;
 }
 /* LCOV_EXCL_STOP */