ssize_t
ec_editline_get_completions(const struct ec_comp *cmpl, char ***matches_out)
{
- const struct ec_comp_item *item;
- struct ec_comp_iter *iter = NULL;
+ struct ec_comp_item *item;
char **matches = NULL;
size_t count = 0;
- iter = ec_comp_iter(cmpl, EC_COMP_FULL | EC_COMP_PARTIAL);
- if (iter == NULL)
- goto fail;
-
- while ((item = ec_comp_iter_next(iter)) != NULL) {
+ EC_COMP_FOREACH(item, cmpl, EC_COMP_FULL | EC_COMP_PARTIAL) {
char **tmp;
tmp = realloc(matches, (count + 1) * sizeof(char *));
fail:
ec_editline_free_completions(matches, count);
*matches_out = NULL;
- ec_comp_iter_free(iter);
return -1;
}
char *
ec_editline_append_chars(const struct ec_comp *cmpl)
{
- const struct ec_comp_item *item;
- struct ec_comp_iter *iter = NULL;
+ struct ec_comp_item *item;
const char *append;
char *ret = NULL;
size_t n;
- iter = ec_comp_iter(cmpl, EC_COMP_FULL | EC_COMP_PARTIAL);
- if (iter == NULL)
- goto fail;
-
- while ((item = ec_comp_iter_next(iter)) != NULL) {
+ EC_COMP_FOREACH(item, cmpl, EC_COMP_FULL | EC_COMP_PARTIAL) {
append = ec_comp_item_get_completion(item);
if (ret == NULL) {
ret = ec_strdup(append);
ret[n] = '\0';
}
}
- ec_comp_iter_free(iter);
return ret;
fail:
- ec_comp_iter_free(iter);
ec_free(ret);
return NULL;
struct ec_editline_help *help)
{
const struct ec_comp_group *grp;
- const struct ec_parse *state;
+ const struct ec_pnode *pstate;
const struct ec_node *node;
const char *node_help = NULL;
- const char *node_desc = NULL;
+ char *node_desc = NULL;
help->desc = NULL;
help->help = NULL;
grp = ec_comp_item_get_grp(item);
- for (state = grp->state; state != NULL;
- state = ec_parse_get_parent(state)) {
- node = ec_parse_get_node(state);
+ for (pstate = ec_comp_group_get_pstate(grp); pstate != NULL;
+ pstate = ec_pnode_get_parent(pstate)) {
+ node = ec_pnode_get_node(pstate);
if (node_help == NULL)
node_help = ec_dict_get(ec_node_attrs(node), "help");
- if (node_desc == NULL)
+ if (node_desc == NULL) {
node_desc = ec_node_desc(node);
+ if (node_desc == NULL)
+ goto fail;
+ }
}
- if (node_help == NULL)
- node_help = "";
if (node_desc == NULL)
goto fail;
+ if (node_help == NULL)
+ node_help = "";
- help->desc = ec_strdup(node_desc);
- if (help->desc == NULL)
- goto fail;
-
+ help->desc = node_desc;
help->help = ec_strdup(node_help);
if (help->help == NULL)
goto fail;
return 0;
fail:
+ ec_free(node_desc);
ec_free(help->desc);
ec_free(help->help);
return -1;
ec_editline_get_helps(const struct ec_editline *editline, const char *line,
const char *full_line, struct ec_editline_help **helps_out)
{
- struct ec_comp_iter *iter = NULL;
const struct ec_comp_group *grp, *prev_grp = NULL;
- const struct ec_comp_item *item;
+ struct ec_comp_item *item;
struct ec_comp *cmpl = NULL;
- struct ec_parse *parse = NULL;
+ struct ec_pnode *parse = NULL;
unsigned int count = 0;
struct ec_editline_help *helps = NULL;
*helps_out = NULL;
/* check if the current line matches */
- parse = ec_node_parse(editline->node, full_line);
- if (ec_parse_matches(parse))
+ parse = ec_parse(editline->node, full_line);
+ if (ec_pnode_matches(parse))
count = 1;
- ec_parse_free(parse);
+ ec_pnode_free(parse);
parse = NULL;
/* complete at current cursor position */
- cmpl = ec_node_complete(editline->node, line);
+ cmpl = ec_complete(editline->node, line);
if (cmpl == NULL) //XXX log error
goto fail;
- /* let's display one contextual help per node */
- iter = ec_comp_iter(cmpl,
- EC_COMP_UNKNOWN | EC_COMP_FULL | EC_COMP_PARTIAL);
- if (iter == NULL)
- goto fail;
-
helps = ec_calloc(1, sizeof(*helps));
if (helps == NULL)
goto fail;
goto fail;
}
- while ((item = ec_comp_iter_next(iter)) != NULL) {
+ /* let's display one contextual help per node */
+ EC_COMP_FOREACH(item, cmpl,
+ EC_COMP_UNKNOWN | EC_COMP_FULL | EC_COMP_PARTIAL) {
struct ec_editline_help *tmp = NULL;
/* keep one help per group, skip other items */
count++;
}
- ec_comp_iter_free(iter);
ec_comp_free(cmpl);
*helps_out = helps;
return count;
fail:
- ec_comp_iter_free(iter);
- ec_parse_free(parse);
+ ec_pnode_free(parse);
ec_comp_free(cmpl);
if (helps != NULL) {
while (count--) {
goto fail;
}
- cmpl = ec_node_complete(editline->node, line);
+ cmpl = ec_complete(editline->node, line);
if (cmpl == NULL)
goto fail;
return NULL;
}
-struct ec_parse *
+struct ec_pnode *
ec_editline_parse(struct ec_editline *editline, const struct ec_node *node)
{
char *line = NULL;
- struct ec_parse *parse = NULL;
+ struct ec_pnode *parse = NULL;
/* XXX add sh_lex automatically? This node is required, parse and
* complete are based on it. */
if (line == NULL)
goto fail;
- parse = ec_node_parse(node, line);
+ parse = ec_parse(node, line);
if (parse == NULL)
goto fail;
fail:
ec_free(line);
- ec_parse_free(parse);
+ ec_pnode_free(parse);
return NULL;
}