X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_re_lex.c;h=252ebfd532640a1682c3c72a1a7d9340941d5934;hb=5ed49a34462399f481696db61f71e5c7f694af74;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..252ebfd 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 <zer0@droids-corp.org>
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -10,6 +14,7 @@
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
+#include <ecoli_completed.h>
 #include <ecoli_parsed.h>
 #include <ecoli_node_many.h>
 #include <ecoli_node_or.h>
@@ -152,7 +157,7 @@ static void ec_node_re_lex_free_priv(struct ec_node *gen_node)
 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_default_complete,
 	.size = sizeof(struct ec_node_re_lex),
 	.free_priv = ec_node_re_lex_free_priv,
 };
@@ -223,7 +228,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 +244,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 */