X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_re_lex.c;h=e0acdfec9e0077d5dcde52b1a7eec8fb40455fa7;hb=2be188c2858fa975d6b2ba3f91405d260d3c5b75;hp=672e952c9266ee8c5c90b88c3ed69eee5ba46cf0;hpb=0a2b19af9303c4a0ec05bea7afe1803a429517bf;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_node_re_lex.c b/lib/ecoli_node_re_lex.c
index 672e952..e0acdfe 100644
--- a/lib/ecoli_node_re_lex.c
+++ b/lib/ecoli_node_re_lex.c
@@ -14,7 +14,8 @@
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
 #include <ecoli_node.h>
-#include <ecoli_parsed.h>
+#include <ecoli_complete.h>
+#include <ecoli_parse.h>
 #include <ecoli_node_many.h>
 #include <ecoli_node_or.h>
 #include <ecoli_node_str.h>
@@ -96,12 +97,12 @@ fail:
 
 static int
 ec_node_re_lex_parse(const struct ec_node *gen_node,
-		struct ec_parsed *state,
+		struct ec_parse *state,
 		const struct ec_strvec *strvec)
 {
 	struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
 	struct ec_strvec *new_vec = NULL;
-	struct ec_parsed *child_parsed;
+	struct ec_parse *child_parse;
 	const char *str;
 	int ret;
 
@@ -111,10 +112,8 @@ ec_node_re_lex_parse(const struct ec_node *gen_node,
 		str = ec_strvec_val(strvec, 0);
 		new_vec = tokenize(node->table, node->len, str);
 	}
-	if (new_vec == NULL) {
-		ret = -ENOMEM;
+	if (new_vec == NULL)
 		goto fail;
-	}
 
 	ret = ec_node_parse_child(node->child, state, new_vec);
 	if (ret < 0)
@@ -122,11 +121,11 @@ ec_node_re_lex_parse(const struct ec_node *gen_node,
 
 	if ((unsigned)ret == ec_strvec_len(new_vec)) {
 		ret = 1;
-	} else if (ret != EC_PARSED_NOMATCH) {
-		child_parsed = ec_parsed_get_last_child(state);
-		ec_parsed_del_child(state, child_parsed);
-		ec_parsed_free(child_parsed);
-		ret = EC_PARSED_NOMATCH;
+	} 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);
@@ -136,7 +135,7 @@ ec_node_re_lex_parse(const struct ec_node *gen_node,
 
  fail:
 	ec_strvec_free(new_vec);
-	return ret;
+	return -1;
 }
 
 static void ec_node_re_lex_free_priv(struct ec_node *gen_node)
@@ -153,12 +152,35 @@ static void ec_node_re_lex_free_priv(struct ec_node *gen_node)
 	ec_node_free(node->child);
 }
 
+static size_t
+ec_node_re_lex_get_children_count(const struct ec_node *gen_node)
+{
+	struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
+
+	if (node->child)
+		return 1;
+	return 0;
+}
+
+static struct ec_node *
+ec_node_re_lex_get_child(const struct ec_node *gen_node, size_t i)
+{
+	struct ec_node_re_lex *node = (struct ec_node_re_lex *)gen_node;
+
+	if (i >= 1)
+		return NULL;
+
+	return node->child;
+}
+
 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_complete_unknown,
 	.size = sizeof(struct ec_node_re_lex),
 	.free_priv = ec_node_re_lex_free_priv,
+	.get_children_count = ec_node_re_lex_get_children_count,
+	.get_child = ec_node_re_lex_get_child,
 };
 
 EC_NODE_TYPE_REGISTER(ec_node_re_lex_type);
@@ -170,12 +192,10 @@ int ec_node_re_lex_add(struct ec_node *gen_node, const char *pattern, int keep)
 	int ret;
 	char *pat_dup = NULL;
 
-	ret = -ENOMEM;
 	pat_dup = ec_strdup(pattern);
 	if (pat_dup == NULL)
 		goto fail;
 
-	ret = -ENOMEM;
 	table = ec_realloc(node->table, sizeof(*table) * (node->len + 1));
 	if (table == NULL)
 		goto fail;
@@ -186,9 +206,9 @@ int ec_node_re_lex_add(struct ec_node *gen_node, const char *pattern, int keep)
 			"Regular expression <%s> compilation failed: %d\n",
 			pattern, ret);
 		if (ret == REG_ESPACE)
-			ret = -ENOMEM;
+			errno = ENOMEM;
 		else
-			ret = -EINVAL;
+			errno = EINVAL;
 
 		goto fail;
 	}
@@ -202,7 +222,7 @@ int ec_node_re_lex_add(struct ec_node *gen_node, const char *pattern, int keep)
 
 fail:
 	ec_free(pat_dup);
-	return ret;
+	return -1;
 }
 
 struct ec_node *ec_node_re_lex(const char *id, struct ec_node *child)
@@ -266,6 +286,11 @@ static int ec_node_re_lex_testcase(void)
 	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 testres;