X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_space.c;h=761ed763f7f401cb67905f4715155ac0d23014c0;hb=dec2d7fa17ae1e8b3d1dec8e396d057757baf4f3;hp=48ffb6e5a627400c65ab1ed8819ca3837dd1ee72;hpb=e746f568b6a3ab77d0100976d8fa5a68f611bcd3;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_space.c b/lib/ecoli_node_space.c
index 48ffb6e..761ed76 100644
--- a/lib/ecoli_node_space.c
+++ b/lib/ecoli_node_space.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,17 +12,19 @@
 #include <ecoli_malloc.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_space.h>
 
+EC_LOG_TYPE_REGISTER(node_space);
+
 struct ec_node_space {
 	struct ec_node gen;
 };
 
 static int
 ec_node_space_parse(const struct ec_node *gen_node,
-		struct ec_parsed *state,
+		struct ec_parse *state,
 		const struct ec_strvec *strvec)
 {
 	const char *str;
@@ -55,13 +34,13 @@ ec_node_space_parse(const struct ec_node *gen_node,
 	(void)gen_node;
 
 	if (ec_strvec_len(strvec) == 0)
-		return EC_PARSED_NOMATCH;
+		return EC_PARSE_NOMATCH;
 
 	str = ec_strvec_val(strvec, 0);
 	while (isspace(str[len]))
 		len++;
 	if (len == 0 || len != strlen(str))
-		return EC_PARSED_NOMATCH;
+		return EC_PARSE_NOMATCH;
 
 	return 1;
 }
@@ -69,7 +48,7 @@ ec_node_space_parse(const struct ec_node *gen_node,
 static struct ec_node_type ec_node_space_type = {
 	.name = "space",
 	.parse = ec_node_space_parse,
-	.complete = ec_node_default_complete,
+	.complete = ec_node_complete_unknown,
 	.size = sizeof(struct ec_node_space),
 };
 
@@ -79,39 +58,39 @@ EC_NODE_TYPE_REGISTER(ec_node_space_type);
 static int ec_node_space_testcase(void)
 {
 	struct ec_node *node;
-	int ret = 0;
+	int testres = 0;
 
-	node = ec_node("space", NULL);
+	node = ec_node("space", 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, "");
-	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, "");
+	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("space", NULL);
+	node = ec_node("space", 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;
 	}
 	/* never completes whatever the input */
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"", EC_NODE_ENDLIST,
 		EC_NODE_ENDLIST);
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		" ", EC_NODE_ENDLIST,
 		EC_NODE_ENDLIST);
-	ret |= EC_TEST_CHECK_COMPLETE(node,
+	testres |= EC_TEST_CHECK_COMPLETE(node,
 		"foo", EC_NODE_ENDLIST,
 		EC_NODE_ENDLIST);
 	ec_node_free(node);
 
-	return ret;
+	return testres;
 }
 /* LCOV_EXCL_STOP */