git.droids-corp.org
/
protos
/
libecoli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename structures and functions
[protos/libecoli.git]
/
src
/
ecoli_editline.c
diff --git
a/src/ecoli_editline.c
b/src/ecoli_editline.c
index
2610bf5
..
6a6e23b
100644
(file)
--- a/
src/ecoli_editline.c
+++ b/
src/ecoli_editline.c
@@
-383,7
+383,7
@@
static int get_node_help(const struct ec_comp_item *item,
struct ec_editline_help *help)
{
const struct ec_comp_group *grp;
struct ec_editline_help *help)
{
const struct ec_comp_group *grp;
- const struct ec_p
ars
e *state;
+ const struct ec_p
nod
e *state;
const struct ec_node *node;
const char *node_help = NULL;
const char *node_desc = NULL;
const struct ec_node *node;
const char *node_help = NULL;
const char *node_desc = NULL;
@@
-394,8
+394,8
@@
static int get_node_help(const struct ec_comp_item *item,
grp = ec_comp_item_get_grp(item);
for (state = ec_comp_group_get_state(grp); state != NULL;
grp = ec_comp_item_get_grp(item);
for (state = ec_comp_group_get_state(grp); state != NULL;
- state = ec_p
ars
e_get_parent(state)) {
- node = ec_p
ars
e_get_node(state);
+ state = ec_p
nod
e_get_parent(state)) {
+ node = ec_p
nod
e_get_node(state);
if (node_help == NULL)
node_help = ec_dict_get(ec_node_attrs(node), "help");
if (node_desc == NULL)
if (node_help == NULL)
node_help = ec_dict_get(ec_node_attrs(node), "help");
if (node_desc == NULL)
@@
-431,21
+431,21
@@
ec_editline_get_helps(const struct ec_editline *editline, const char *line,
const struct ec_comp_group *grp, *prev_grp = NULL;
const struct ec_comp_item *item;
struct ec_comp *cmpl = NULL;
const struct ec_comp_group *grp, *prev_grp = NULL;
const struct ec_comp_item *item;
struct ec_comp *cmpl = NULL;
- struct ec_p
ars
e *parse = NULL;
+ struct ec_p
nod
e *parse = NULL;
unsigned int count = 0;
struct ec_editline_help *helps = NULL;
*helps_out = NULL;
/* check if the current line matches */
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_p
ars
e_matches(parse))
+ parse = ec_parse(editline->node, full_line);
+ if (ec_p
nod
e_matches(parse))
count = 1;
count = 1;
- ec_p
ars
e_free(parse);
+ ec_p
nod
e_free(parse);
parse = NULL;
/* complete at current cursor position */
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;
if (cmpl == NULL) //XXX log error
goto fail;
@@
-494,7
+494,7
@@
ec_editline_get_helps(const struct ec_editline *editline, const char *line,
fail:
ec_comp_iter_free(iter);
fail:
ec_comp_iter_free(iter);
- ec_p
ars
e_free(parse);
+ ec_p
nod
e_free(parse);
ec_comp_free(cmpl);
if (helps != NULL) {
while (count--) {
ec_comp_free(cmpl);
if (helps != NULL) {
while (count--) {
@@
-551,7
+551,7
@@
ec_editline_complete(EditLine *el, int c)
goto fail;
}
goto fail;
}
- cmpl = ec_
node_
complete(editline->node, line);
+ cmpl = ec_complete(editline->node, line);
if (cmpl == NULL)
goto fail;
if (cmpl == NULL)
goto fail;
@@
-653,11
+653,11
@@
fail:
return NULL;
}
return NULL;
}
-struct ec_p
ars
e *
+struct ec_p
nod
e *
ec_editline_parse(struct ec_editline *editline, const struct ec_node *node)
{
char *line = NULL;
ec_editline_parse(struct ec_editline *editline, const struct ec_node *node)
{
char *line = NULL;
- struct ec_p
ars
e *parse = NULL;
+ struct ec_p
nod
e *parse = NULL;
/* XXX add sh_lex automatically? This node is required, parse and
* complete are based on it. */
/* XXX add sh_lex automatically? This node is required, parse and
* complete are based on it. */
@@
-668,7
+668,7
@@
ec_editline_parse(struct ec_editline *editline, const struct ec_node *node)
if (line == NULL)
goto fail;
if (line == NULL)
goto fail;
- parse = ec_
node_
parse(node, line);
+ parse = ec_parse(node, line);
if (parse == NULL)
goto fail;
if (parse == NULL)
goto fail;
@@
-677,7
+677,7
@@
ec_editline_parse(struct ec_editline *editline, const struct ec_node *node)
fail:
ec_free(line);
fail:
ec_free(line);
- ec_p
ars
e_free(parse);
+ ec_p
nod
e_free(parse);
return NULL;
}
return NULL;
}