#include <ecoli_node_option.h>
#include <ecoli_node_many.h>
+EC_LOG_TYPE_REGISTER(node_many);
+
struct ec_node_many {
struct ec_node gen;
unsigned int min;
}
ret = ec_node_parse_child(node->child, state, childvec);
+ if (ret < 0)
+ goto fail;
+
ec_strvec_free(childvec);
childvec = NULL;
if (ret == EC_PARSED_NOMATCH)
break;
- else if (ret < 0)
- goto fail;
/* it matches an empty strvec, no need to continue */
if (ret == 0) {
return ret;
}
-#if 0 //XXX missing node_many_complete
-static struct ec_completed *ec_node_many_complete(const struct ec_node *gen_node,
- const struct ec_strvec *strvec)
+static int
+__ec_node_many_complete(struct ec_node_many *node, unsigned int max,
+ struct ec_completed *completed,
+ const struct ec_strvec *strvec)
{
- struct ec_node_many *node = (struct ec_node_many *)gen_node;
- struct ec_completed *completed, *child_completed;
- struct ec_strvec *childvec;
- struct ec_parsed *parsed;
- size_t len = 0;
+ struct ec_parsed *parsed = ec_completed_get_state(completed);
+ struct ec_strvec *childvec = NULL;
unsigned int i;
+ int ret;
- completed = ec_completed();
- if (completed == NULL)
- return NULL;
+ /* first, try to complete with the child node */
+ ret = ec_node_complete_child(node->child, completed, strvec);
+ if (ret < 0)
+ goto fail;
- if (node->len == 0)
- return completed;
+ /* we're done, we reached the max number of nodes */
+ if (max == 1)
+ return 0;
- for (i = 0; i < node->len; i++) {
- childvec = ec_strvec_ndup(strvec, len,
- ec_strvec_len(strvec) - len);
- if (childvec == NULL)
- goto fail; // XXX fail ?
+ /* if there is a maximum, decrease it before recursion */
+ if (max != 0)
+ max--;
- child_completed = ec_node_complete_strvec(node->table[i],
- childvec);
- if (child_completed == NULL)
+ /* then, if the node matches the beginning of the strvec, try to
+ * complete the rest */
+ for (i = 0; i < ec_strvec_len(strvec); i++) {
+ childvec = ec_strvec_ndup(strvec, 0, i);
+ if (childvec == NULL)
goto fail;
- ec_completed_merge(completed, child_completed);
-
- parsed = ec_node_parse_strvec(node->table[i], childvec);
- if (parsed == NULL)
+ ret = ec_node_parse_child(node->child, parsed, childvec);
+ if (ret < 0)
goto fail;
ec_strvec_free(childvec);
childvec = NULL;
- if (!ec_parsed_matches(parsed)) {
- ec_parsed_free(parsed);
- break;
+ if ((unsigned int)ret != i) {
+ if (ret != EC_PARSED_NOMATCH)
+ ec_parsed_del_last_child(parsed);
+ continue;
+ }
+
+ childvec = ec_strvec_ndup(strvec, i, ec_strvec_len(strvec) - i);
+ if (childvec == NULL) {
+ ec_parsed_del_last_child(parsed);
+ goto fail;
}
- len += ec_strvec_len(parsed->strvec);
- ec_parsed_free(parsed);
+ ret = __ec_node_many_complete(node, max, completed, childvec);
+ ec_parsed_del_last_child(parsed);
+ ec_strvec_free(childvec);
+ childvec = NULL;
+
+ if (ret < 0)
+ goto fail;
}
- return completed;
+ return 0;
fail:
ec_strvec_free(childvec);
- ec_completed_free(completed);
- return NULL;
+ return -1;
+}
+
+static int
+ec_node_many_complete(const struct ec_node *gen_node,
+ struct ec_completed *completed,
+ const struct ec_strvec *strvec)
+{
+ struct ec_node_many *node = (struct ec_node_many *)gen_node;
+
+ return __ec_node_many_complete(node, node->max, completed,
+ strvec);
}
-#endif
static void ec_node_many_free_priv(struct ec_node *gen_node)
{
static struct ec_node_type ec_node_many_type = {
.name = "many",
.parse = ec_node_many_parse,
- .complete = ec_node_default_complete,
-//XXX .complete = ec_node_many_complete,
+ .complete = ec_node_many_complete,
.size = sizeof(struct ec_node_many),
.free_priv = ec_node_many_free_priv,
};
return &node->gen;
}
+/* LCOV_EXCL_START */
static int ec_node_many_testcase(void)
{
struct ec_node *node;
node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 0, 0);
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, 0);
ret |= EC_TEST_CHECK_PARSE(node, 0, "bar");
ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar");
ret |= EC_TEST_CHECK_PARSE(node, 2, "foo", "foo", "bar");
node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 1, 0);
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, "bar");
node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 1, 2);
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, "bar");
ec_node_free(node);
/* test completion */
- /* XXX */
+ node = ec_node_many(NULL, ec_node_str(NULL, "foo"), 2, 4);
+ if (node == NULL) {
+ EC_LOG(EC_LOG_ERR, "cannot create node\n");
+ return -1;
+ }
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "", EC_NODE_ENDLIST,
+ "foo", EC_NODE_ENDLIST);
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "f", EC_NODE_ENDLIST,
+ "foo", EC_NODE_ENDLIST);
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "foo", EC_NODE_ENDLIST,
+ "foo", EC_NODE_ENDLIST);
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "foo", "", EC_NODE_ENDLIST,
+ "foo", EC_NODE_ENDLIST);
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "foo", "foo", "", EC_NODE_ENDLIST,
+ "foo", EC_NODE_ENDLIST);
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "foo", "foo", "foo", "", EC_NODE_ENDLIST,
+ "foo", EC_NODE_ENDLIST);
+ ret |= EC_TEST_CHECK_COMPLETE(node,
+ "foo", "foo", "foo", "foo", "", EC_NODE_ENDLIST,
+ EC_NODE_ENDLIST);
+ ec_node_free(node);
return ret;
}
+/* LCOV_EXCL_STOP */
static struct ec_test ec_node_many_test = {
- .name = "many",
+ .name = "node_many",
.test = ec_node_many_testcase,
};
git.droids-corp.org / protos / libecoli.git / blobdiff