completed = ec_calloc(1, sizeof(*completed));
if (completed == NULL)
- return NULL;
+ goto fail;
TAILQ_INIT(&completed->nodes);
+ completed->attrs = ec_keyval();
+ if (completed->attrs == NULL)
+ goto fail;
+
return completed;
+
+ fail:
+ if (completed != NULL)
+ ec_keyval_free(completed->attrs);
+ ec_free(completed);
+
+ return NULL;
}
/* XXX on error, states are not freed ?
child_state->node = node;
ec_parsed_add_child(parsed_state, child_state);
- ret = ec_completed_add_node(completed, node);
- if (ret < 0)
- return ret;
-
- ret = node->type->complete(node, completed,
- child_state, strvec);
+ ret = node->type->complete(node, completed, child_state, strvec);
if (ret < 0)
return ret;
return NULL;
}
-/* count the number of identical chars at the beginning of 2 strings */
-static size_t strcmp_count(const char *s1, const char *s2)
-{
- size_t i = 0;
-
- while (s1[i] && s2[i] && s1[i] == s2[i])
- i++;
-
- return i;
-}
-
static struct ec_completed_node *
ec_completed_node(const struct ec_node *node)
{
return NULL;
compnode->node = node;
- TAILQ_INIT(&compnode->matches);
+ TAILQ_INIT(&compnode->items);
return compnode;
}
-static struct ec_completed_match *
-ec_completed_match(enum ec_completed_type type, struct ec_parsed *state,
- const struct ec_node *node, const char *add)
+struct ec_completed_item *
+ec_completed_item(struct ec_parsed *state, const struct ec_node *node)
{
- struct ec_completed_match *item = NULL;
+ struct ec_completed_item *item = NULL;
+ struct ec_parsed *p;
+ size_t len;
item = ec_calloc(1, sizeof(*item));
if (item == NULL)
- return NULL;
-
- /* XXX can state be NULL? */
- if (state != NULL) {
- struct ec_parsed *p;
- size_t len;
-
- /* get path len */
- for (p = state, len = 0; p != NULL;
- p = ec_parsed_get_parent(p), len++)
- ;
-
- item->path = ec_calloc(len, sizeof(*item->path));
- if (item->path == NULL)
- goto fail;
+ goto fail;
- item->pathlen = len;
+ item->attrs = ec_keyval();
+ if (item->attrs == NULL)
+ goto fail;
- /* write path in array */
- for (p = state, len = 0; p != NULL;
- p = ec_parsed_get_parent(p), len++)
- item->path[len] = p->node;
- }
+ /* get path len */
+ for (p = state, len = 0; p != NULL;
+ p = ec_parsed_get_parent(p), len++)
+ ;
+ /* allocate room for path */
+ item->path = ec_calloc(len, sizeof(*item->path));
+ if (item->path == NULL)
+ goto fail;
+ item->pathlen = len;
+ /* write path in array */
+ for (p = state, len = 0; p != NULL;
+ p = ec_parsed_get_parent(p), len++)
+ item->path[len] = p->node;
- item->type = type;
+ item->type = EC_NO_MATCH;
item->node = node;
- if (add != NULL) {
- item->add = ec_strdup(add);
- if (item->add == NULL)
- goto fail;
- }
return item;
fail:
if (item != NULL) {
ec_free(item->path);
- ec_free(item->add);
+ ec_free(item->str);
+ ec_free(item->display);
+ ec_keyval_free(item->attrs);
}
- ec_completed_match_free(item);
+ ec_free(item);
return NULL;
}
int
-ec_completed_add_match(struct ec_completed *completed,
- struct ec_parsed *parsed_state,
- const struct ec_node *node, const char *add)
+ec_completed_item_set(struct ec_completed_item *item,
+ enum ec_completed_type type, const char *str)
{
- struct ec_completed_node *compnode = NULL;
- struct ec_completed_match *item = NULL;
- int ret = -ENOMEM;
- size_t n;
+ char *str_copy = NULL;
+ char *display_copy = NULL;
+ int ret = 0;
- TAILQ_FOREACH(compnode, &completed->nodes, next) {
- if (compnode->node == node)
- break;
- }
- if (compnode == NULL)
- return -ENOENT;
-
- item = ec_completed_match(EC_MATCH, parsed_state, node, add);
if (item == NULL)
- goto fail;
+ return -EINVAL;
+ if (item->str != NULL)
+ return -EEXIST;
+
+ switch (type) {
+ case EC_NO_MATCH:
+ if (str != NULL)
+ return -EINVAL;
+ break;
+ case EC_MATCH:
+ case EC_PARTIAL_MATCH:
+ if (str == NULL)
+ return -EINVAL;
+ break;
+ default:
+ return -EINVAL;
+ }
- if (item->add != NULL) {
- if (completed->smallest_start == NULL) {
- completed->smallest_start = ec_strdup(item->add);
- if (completed->smallest_start == NULL)
- goto fail;
- } else {
- n = strcmp_count(item->add,
- completed->smallest_start);
- completed->smallest_start[n] = '\0';
- }
- completed->count_match++;
+ if (str != NULL) {
+ ret = -ENOMEM;
+ str_copy = ec_strdup(str);
+ if (str_copy == NULL)
+ goto fail;
+ display_copy = ec_strdup(str);
+ if (display_copy == NULL)
+ goto fail;
}
- TAILQ_INSERT_TAIL(&compnode->matches, item, next);
- completed->count++;
+ item->type = type;
+ item->str = str_copy;
+ item->display = display_copy;
+ return 0;
+
+fail:
+ ec_free(str_copy);
+ ec_free(display_copy);
+ return ret;
+}
+
+int ec_completed_item_set_display(struct ec_completed_item *item,
+ const char *display)
+{
+ char *display_copy = NULL;
+ int ret = 0;
+
+ if (item == NULL || display == NULL ||
+ item->type == EC_NO_MATCH || item->str == NULL)
+ return -EINVAL;
+
+ ret = -ENOMEM;
+ display_copy = ec_strdup(display);
+ if (display_copy == NULL)
+ goto fail;
+
+ ec_free(item->display);
+ item->display = display_copy;
return 0;
fail:
- ec_completed_match_free(item);
+ ec_free(display_copy);
return ret;
}
int
-ec_completed_add_node(struct ec_completed *completed,
- const struct ec_node *node)
+ec_completed_item_add(struct ec_completed *completed,
+ struct ec_completed_item *item)
{
- struct ec_completed_node *item = NULL;
+ struct ec_completed_node *compnode = NULL;
- item = ec_completed_node(node);
- if (item == NULL)
- return -ENOMEM;
+ if (completed == NULL || item == NULL || item->node == NULL)
+ return -EINVAL;
+
+ switch (item->type) {
+ case EC_NO_MATCH:
+ break;
+ case EC_MATCH:
+ case EC_PARTIAL_MATCH:
+ completed->count_match++; //XXX
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ /* find the compnode entry corresponding to this node */
+ TAILQ_FOREACH(compnode, &completed->nodes, next) {
+ if (compnode->node == item->node)
+ break;
+ }
+ if (compnode == NULL) {
+ compnode = ec_completed_node(item->node);
+ if (compnode == NULL)
+ return -ENOMEM;
+ TAILQ_INSERT_TAIL(&completed->nodes, compnode, next);
+ }
+
+ completed->count++;
+ TAILQ_INSERT_TAIL(&compnode->items, item, next);
- TAILQ_INSERT_TAIL(&completed->nodes, item, next);
return 0;
}
-void ec_completed_match_free(struct ec_completed_match *item)
+void ec_completed_item_free(struct ec_completed_item *item)
{
- ec_free(item->add);
+ if (item == NULL)
+ return;
+
+ ec_free(item->str);
+ ec_free(item->display);
ec_free(item->path);
+ ec_keyval_free(item->attrs);
ec_free(item);
}
-/* default completion function: return a no-item element */
+/* default completion function: return a no-match element */
int
-ec_node_default_complete(const struct ec_node *gen_node,
+ec_node_default_complete(const struct ec_node *gen_node, // XXX rename in nomatch
struct ec_completed *completed,
- struct ec_parsed *parsed,
+ struct ec_parsed *parsed_state,
const struct ec_strvec *strvec)
{
- (void)gen_node;
- (void)completed;
- (void)parsed;
+ struct ec_completed_item *item = NULL;
+ int ret;
- if (ec_strvec_len(strvec) != 1) //XXX needed?
+ if (ec_strvec_len(strvec) != 1)
return 0;
+ item = ec_completed_item(parsed_state, gen_node);
+ if (item == NULL)
+ return -ENOMEM;
+ ret = ec_completed_item_set(item, EC_NO_MATCH, NULL);
+ if (ret < 0) {
+ ec_completed_item_free(item);
+ return ret;
+ }
+ ret = ec_completed_item_add(completed, item);
+ if (ret < 0) {
+ ec_completed_item_free(item);
+ return ret;
+ }
+
return 0;
}
void ec_completed_free(struct ec_completed *completed)
{
struct ec_completed_node *compnode;
- struct ec_completed_match *item;
+ struct ec_completed_item *item;
if (completed == NULL)
return;
compnode = TAILQ_FIRST(&completed->nodes);
TAILQ_REMOVE(&completed->nodes, compnode, next);
- while (!TAILQ_EMPTY(&compnode->matches)) {
- item = TAILQ_FIRST(&compnode->matches);
- TAILQ_REMOVE(&compnode->matches, item, next);
- ec_completed_match_free(item);
+ while (!TAILQ_EMPTY(&compnode->items)) {
+ item = TAILQ_FIRST(&compnode->items);
+ TAILQ_REMOVE(&compnode->items, item, next);
+ ec_completed_item_free(item);
}
ec_free(compnode);
}
- ec_free(completed->smallest_start);
+ ec_keyval_free(completed->attrs);
ec_free(completed);
}
void ec_completed_dump(FILE *out, const struct ec_completed *completed)
{
struct ec_completed_node *compnode;
- struct ec_completed_match *item;
+ struct ec_completed_item *item;
if (completed == NULL || completed->count == 0) {
fprintf(out, "no completion\n");
return;
}
- fprintf(out, "completion: count=%u match=%u smallest_start=<%s>\n",
- completed->count, completed->count_match,
- completed->smallest_start);
+ fprintf(out, "completion: count=%u match=%u\n",
+ completed->count, completed->count_match);
TAILQ_FOREACH(compnode, &completed->nodes, next) {
fprintf(out, "node=%p, node_type=%s\n",
compnode->node, compnode->node->type->name);
- TAILQ_FOREACH(item, &compnode->matches, next) {
- fprintf(out, "add=<%s>\n", item->add); /* XXX comp type */
+ TAILQ_FOREACH(item, &compnode->items, next) {
+ const char *typestr;
+
+ switch (item->type) {
+ case EC_NO_MATCH: typestr = "no-match"; break;
+ case EC_MATCH: typestr = "match"; break;
+ case EC_PARTIAL_MATCH: typestr = "partial-match"; break;
+ default: typestr = "unknown"; break;
+ }
+
+ fprintf(out, " type=%s str=<%s> disp=<%s>\n",
+ typestr, item->str, item->display);
}
}
}
-const char *ec_completed_smallest_start(
- const struct ec_completed *completed)
-{
- if (completed == NULL || completed->smallest_start == NULL)
- return "";
-
- return completed->smallest_start;
-}
-
unsigned int ec_completed_count(
const struct ec_completed *completed,
enum ec_completed_type type)
return iter;
}
-const struct ec_completed_match *ec_completed_iter_next(
+const struct ec_completed_item *ec_completed_iter_next(
struct ec_completed_iter *iter)
{
const struct ec_completed *completed = iter->completed;
const struct ec_completed_node *cur_node;
- const struct ec_completed_match *cur_match;
+ const struct ec_completed_item *cur_match;
if (completed == NULL)
return NULL;
/* first call */
if (cur_node == NULL) {
TAILQ_FOREACH(cur_node, &completed->nodes, next) {
- TAILQ_FOREACH(cur_match, &cur_node->matches, next) {
- if (cur_match != NULL)
+ TAILQ_FOREACH(cur_match, &cur_node->items, next) {
+ if (cur_match != NULL &&
+ cur_match->type & iter->type)
goto found;
}
}
return NULL;
} else {
cur_match = TAILQ_NEXT(cur_match, next);
- if (cur_match != NULL)
+ if (cur_match != NULL &&
+ cur_match->type & iter->type)
goto found;
cur_node = TAILQ_NEXT(cur_node, next);
while (cur_node != NULL) {
- cur_match = TAILQ_FIRST(&cur_node->matches);
- if (cur_match != NULL)
+ cur_match = TAILQ_FIRST(&cur_node->items);
+ if (cur_match != NULL &&
+ cur_match->type & iter->type)
goto found;
cur_node = TAILQ_NEXT(cur_node, next);
}
git.droids-corp.org / protos / libecoli.git / blobdiff