save

[protos/libecoli.git] / lib / main-readline.c

diff --git a/lib/main-readline.c b/lib/main-readline.c
index b147e8a..4601ae8 100644 (file)
--- a/lib/main-readline.c
+++ b/lib/main-readline.c
@@ -47,6 +47,7 @@
 #include <ecoli_node_cmd.h>
 #include <ecoli_node_many.h>
 #include <ecoli_node_once.h>
+#include <ecoli_node_file.h>
 
 static struct ec_node *commands;
 
@@ -54,9 +55,13 @@ static char *my_completion_entry(const char *s, int state)
 {
        static struct ec_completed *c;
        static struct ec_completed_iter *iter;
-       static const struct ec_completed_item *item;
-       char *out_string;
+       const struct ec_completed_item *item;
+
+       (void)s;
 
+       /* don't append a quote */
+       rl_completion_suppress_quote = 1;
+       rl_basic_quote_characters = "";
 
        if (state == 0) {
                char *line;
@@ -74,7 +79,7 @@ static char *my_completion_entry(const char *s, int state)
                        return NULL;
 
                ec_completed_iter_free(iter);
-               iter = ec_completed_iter(c, EC_MATCH);
+               iter = ec_completed_iter(c, EC_MATCH | EC_PARTIAL_MATCH);
                if (iter == NULL)
                        return NULL;
        }
@@ -83,10 +88,23 @@ static char *my_completion_entry(const char *s, int state)
        if (item == NULL)
                return NULL;
 
-       if (asprintf(&out_string, "%s%s", s, item->add) < 0)
-               return NULL;
+       if (c->count_match == 1) {
+
+               /* don't add the trailing space for partial completions */
+               if (state == 0) {
+                       if (item->type == EC_MATCH)
+                               rl_completion_suppress_append = 0;
+                       else
+                               rl_completion_suppress_append = 1;
+               }
+
+               return strdup(item->str);
+       } else if (rl_completion_type == '?') {
+               /* on second try only show the display part */
+               return strdup(item->display);
+       }
 
-       return out_string;
+       return strdup(item->str);
 }
 
 static char **my_attempted_completion(const char *text, int start, int end)
@@ -101,14 +119,19 @@ static char **my_attempted_completion(const char *text, int start, int end)
 }
 
 /* this function builds the help string */
-static char *get_node_help(const struct ec_completed_item *item)
+static char *get_node_help(const struct ec_completed_node *compnode)
 {
+       const struct ec_completed_item *item;
        const struct ec_node *node;
        char *help = NULL;
        const char *node_help = NULL;
        const char *node_desc = NULL;
        size_t i;
 
+       /* Since we display only one help per node, only look at the first item
+        * to get the path. The objective is to retrieve the most precise
+        * help for this node. */
+       item = TAILQ_FIRST(&compnode->items);
        for (i = 0; i < item->pathlen; i++) {
                node = item->path[i];
                if (node_help == NULL)
@@ -130,8 +153,7 @@ static char *get_node_help(const struct ec_completed_item *item)
 
 static int show_help(int ignore, int invoking_key)
 {
-       const struct ec_completed_item *item;
-       struct ec_completed_iter *iter;
+       const struct ec_completed_node *compnode;
        struct ec_completed *c;
        struct ec_parsed *p;
        char *line;
@@ -160,7 +182,14 @@ static int show_help(int ignore, int invoking_key)
        if (c == NULL)
                return 1;
 
-       count = ec_completed_count(c, EC_MATCH | EC_NO_MATCH);
+       /* let's display one contextual help per node */
+       count = 0;
+       TAILQ_FOREACH(compnode, &c->nodes, next) {
+               if (TAILQ_EMPTY(&compnode->items))
+                       continue;
+               count++;
+       }
+
        helps = calloc(count + match + 1, sizeof(char *));
        if (helps == NULL)
                return 1;
@@ -168,15 +197,12 @@ static int show_help(int ignore, int invoking_key)
        if (match)
                helps[1] = "<return>";
 
-       iter = ec_completed_iter(c, EC_MATCH | EC_NO_MATCH);
-       if (iter == NULL)
-               goto fail;
-
        /* strangely, rl_display_match_list() expects first index at 1 */
-       for (i = match + 1, item = ec_completed_iter_next(iter);
-            i < count + match + 1 && item != NULL;
-            i++, item = ec_completed_iter_next(iter)) {
-               helps[i] = get_node_help(item);
+       i = match + 1;
+       TAILQ_FOREACH(compnode, &c->nodes, next) {
+               if (TAILQ_EMPTY(&compnode->items))
+                       continue;
+               helps[i++] = get_node_help(compnode);
        }
 
        ec_completed_free(c);
@@ -187,10 +213,7 @@ static int show_help(int ignore, int invoking_key)
 
        return 0;
 
-fail:
-       free(helps);
-       // free helps[n] XXX
-       return 1;
+       // free helps[n] XXX on error ?
 }
 
 static int create_commands(void)
@@ -220,7 +243,7 @@ static int create_commands(void)
        ec_keyval_set(ec_node_attrs(ec_node_find(cmd, "name")),
                "help", "the name of the person", NULL);
        ec_keyval_set(ec_node_attrs(ec_node_find(cmd, "int")),
-               "help", "an integer", NULL);
+               "help", "an integer (0-10)", NULL);
        if (ec_node_or_add(cmdlist, cmd) < 0)
                goto fail;
 
@@ -275,6 +298,15 @@ static int create_commands(void)
                goto fail;
 
 
+       cmd = EC_NODE_SEQ(NULL,
+               ec_node_str(NULL, "load"),
+               ec_node("file", NULL)
+       );
+       ec_keyval_set(ec_node_attrs(cmd), "help", "load a file", NULL);
+       if (ec_node_or_add(cmdlist, cmd) < 0)
+               goto fail;
+
+
        commands = ec_node_sh_lex(NULL, cmdlist);
        if (commands == NULL)
                goto fail;
@@ -290,10 +322,8 @@ static int create_commands(void)
 int main(void)
 {
        struct ec_parsed *p;
-//     const char *name;
        char *line;
 
-
        if (create_commands() < 0)
                return 1;