#include <readline/readline.h>
#include <readline/history.h>
-#include <ecoli_tk_str.h>
-#include <ecoli_tk_seq.h>
-#include <ecoli_tk_space.h>
-#include <ecoli_tk_or.h>
-#include <ecoli_tk_shlex.h>
-#include <ecoli_tk_int.h>
-
-static struct ec_tk *commands;
+#include <ecoli_node.h>
+#include <ecoli_parsed.h>
+#include <ecoli_completed.h>
+#include <ecoli_keyval.h>
+#include <ecoli_node_str.h>
+#include <ecoli_node_seq.h>
+#include <ecoli_node_space.h>
+#include <ecoli_node_or.h>
+#include <ecoli_node_sh_lex.h>
+#include <ecoli_node_int.h>
+#include <ecoli_node_option.h>
+#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;
static char *my_completion_entry(const char *s, int state)
{
- static struct ec_completed_tk *c;
- static struct ec_completed_tk_iter *iter;
- static const struct ec_completed_tk_elt *elt;
+ static struct ec_completed *c;
+ static struct ec_completed_iter *iter;
+ static const struct ec_completed_match *item;
char *out_string;
+ /* don't append a quote */
+ rl_completion_suppress_quote = 1;
+ rl_basic_quote_characters = "";
if (state == 0) {
char *line;
- ec_completed_tk_free(c);
+ ec_completed_free(c);
line = strdup(rl_line_buffer);
if (line == NULL)
return NULL;
line[rl_point] = '\0';
- c = ec_tk_complete(commands, line);
+ c = ec_node_complete(commands, line);
free(line);
if (c == NULL)
return NULL;
- ec_completed_tk_iter_free(iter);
- iter = ec_completed_tk_iter_new(c, ITER_MATCH);
+ ec_completed_iter_free(iter);
+ iter = ec_completed_iter(c, EC_MATCH | EC_PARTIAL_MATCH);
if (iter == NULL)
return NULL;
}
- elt = ec_completed_tk_iter_next(iter);
- if (elt == NULL)
+ item = ec_completed_iter_next(iter);
+ if (item == NULL)
return NULL;
- if (asprintf(&out_string, "%s%s", s, elt->add) < 0)
+ /* 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;
+ }
+
+ //XXX see printable_part() and rl_display_match_list()
+ //XXX or: if match count > 1, strip beginning (in node_file)
+
+ if (asprintf(&out_string, "%s%s", s, item->add) < 0) // XXX ec_asprintf (check all in code)
return NULL;
return out_string;
return rl_completion_matches(text, my_completion_entry);
}
+/* this function builds the help string */
+static char *get_node_help(const struct ec_completed_match *elt)
+{
+ const struct ec_node *node;
+ char *help = NULL;
+ const char *node_help = NULL;
+ const char *node_desc = NULL;
+ size_t i;
+
+ for (i = 0; i < elt->pathlen; i++) {
+ node = elt->path[i];
+ if (node_help == NULL)
+ node_help = ec_keyval_get(ec_node_attrs(node), "help");
+ if (node_desc == NULL)
+ node_desc = ec_node_desc(node);
+ }
+
+ if (node_help == NULL)
+ node_help = "";
+ if (node_desc == NULL)
+ return NULL;
+
+ if (asprintf(&help, "%-20s %s", node_desc, node_help) < 0)
+ return NULL;
+
+ return help;
+}
static int show_help(int ignore, int invoking_key)
{
- struct ec_completed_tk *c;
+ const struct ec_completed_node *compnode;
+// const struct ec_completed_match *item;
+// struct ec_completed_iter *iter;
+ struct ec_completed *c;
+ struct ec_parsed *p;
char *line;
+ unsigned int count, i;
+ char **helps = NULL;
+ int match = 0;
(void)ignore;
(void)invoking_key;
- printf("\nhelp:\n");
line = strdup(rl_line_buffer);
if (line == NULL)
return 1;
- line[rl_point] = '\0';
- c = ec_tk_complete(commands, line);
+ /* check if the current line matches */
+ p = ec_node_parse(commands, line);
+ if (ec_parsed_matches(p))
+ match = 1;
+ ec_parsed_free(p);
+
+ /* complete at current cursor position */
+ line[rl_point] = '\0';
+ c = ec_node_complete(commands, line);
+ //ec_completed_dump(stdout, c);
free(line);
if (c == NULL)
return 1;
- ec_completed_tk_dump(stdout, c);
- ec_completed_tk_free(c);
+
+#if 0 // old method
+ count = ec_completed_count(c, EC_MATCH | EC_NO_MATCH |
+ EC_PARTIAL_MATCH);
+ helps = calloc(count + match + 1, sizeof(char *));
+ if (helps == NULL)
+ return 1;
+
+ if (match)
+ helps[1] = "<return>";
+
+ iter = ec_completed_iter(c, EC_MATCH | EC_NO_MATCH |
+ EC_PARTIAL_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);
+ }
+#else
+ count = 0;
+ TAILQ_FOREACH(compnode, &c->nodes, next) {
+ if (TAILQ_EMPTY(&compnode->matches))
+ continue;
+ count++;
+ }
+
+ helps = calloc(count + match + 1, sizeof(char *));
+ if (helps == NULL)
+ return 1;
+
+ if (match)
+ helps[1] = "<return>";
+
+ i = match + 1;
+ TAILQ_FOREACH(compnode, &c->nodes, next) {
+ if (TAILQ_EMPTY(&compnode->matches))
+ continue;
+ // we should pass compnode instead
+ helps[i++] = get_node_help(TAILQ_FIRST(&compnode->matches)); //XXX
+ }
+#endif
+
+ ec_completed_dump(stdout, c);
+ ec_completed_free(c);
+
+ rl_display_match_list(helps, count + match, 1000); /* XXX 1000 */
rl_forced_update_display();
return 0;
+
+//fail:
+ free(helps);
+ // free helps[n] XXX
+ return 1;
}
-int main(void)
+static int create_commands(void)
{
- struct ec_parsed_tk *p;
-// const char *name;
- char *line;
+ struct ec_node *cmdlist = NULL, *cmd = NULL;
- rl_bind_key('?', show_help);
+ cmdlist = ec_node("or", NULL);
+ if (cmdlist == NULL)
+ goto fail;
- commands = ec_tk_shlex_new(NULL,
- ec_tk_seq_new_list(NULL,
- ec_tk_str_new(NULL, "hello"),
- ec_tk_or_new_list("name",
- ec_tk_str_new(NULL, "john"),
- ec_tk_str_new(NULL, "johnny"),
- ec_tk_str_new(NULL, "mike"),
- ec_tk_int_new(NULL, 0, 10, 10),
- EC_TK_ENDLIST
- ),
- EC_TK_ENDLIST
- )
+
+ cmd = EC_NODE_SEQ(NULL,
+ ec_node_str(NULL, "hello"),
+ EC_NODE_OR("name",
+ ec_node_str("john", "john"),
+ ec_node_str(NULL, "johnny"),
+ ec_node_str(NULL, "mike")
+ ),
+ ec_node_option(NULL, ec_node_int("int", 0, 10, 10))
+ );
+ if (cmd == NULL)
+ goto fail;
+ ec_keyval_set(ec_node_attrs(cmd), "help",
+ "say hello to someone several times", NULL);
+ ec_keyval_set(ec_node_attrs(ec_node_find(cmd, "john")),
+ "help", "specific help for john", NULL);
+ 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);
+ if (ec_node_or_add(cmdlist, cmd) < 0)
+ goto fail;
+
+
+ cmd = EC_NODE_CMD(NULL, "good morning name [count]",
+ EC_NODE_CMD("name", "bob|bobby|michael"),
+ ec_node_int("count", 0, 10, 10));
+ if (cmd == NULL)
+ goto fail;
+ ec_keyval_set(ec_node_attrs(cmd), "help",
+ "say good morning to someone several times", NULL);
+ ec_keyval_set(ec_node_attrs(ec_node_find(cmd, "name")), "help",
+ "the person to greet", NULL);
+ ec_keyval_set(ec_node_attrs(ec_node_find(cmd, "count")), "help",
+ "how many times to greet", NULL);
+ if (ec_node_or_add(cmdlist, cmd) < 0)
+ goto fail;
+
+
+ cmd = EC_NODE_CMD(NULL,
+ "buy potatoes,carrots,pumpkins");
+ if (cmd == NULL)
+ goto fail;
+ ec_keyval_set(ec_node_attrs(cmd), "help",
+ "buy some vegetables", NULL);
+ if (ec_node_or_add(cmdlist, cmd) < 0)
+ goto fail;
+
+
+ cmd = EC_NODE_CMD(NULL, "eat vegetables",
+ ec_node_many("vegetables",
+ EC_NODE_OR(NULL,
+ ec_node_str(NULL, "potatoes"),
+ ec_node_once(NULL,
+ ec_node_str(NULL, "carrots")),
+ ec_node_once(NULL,
+ ec_node_str(NULL, "pumpkins"))),
+ 1, 0));
+ if (cmd == NULL)
+ goto fail;
+ ec_keyval_set(ec_node_attrs(cmd), "help",
+ "eat vegetables (take some more potatoes)", NULL);
+ if (ec_node_or_add(cmdlist, cmd) < 0)
+ goto fail;
+
+
+ cmd = EC_NODE_SEQ(NULL,
+ ec_node_str(NULL, "bye")
+ );
+ ec_keyval_set(ec_node_attrs(cmd), "help", "say bye", NULL);
+ if (ec_node_or_add(cmdlist, cmd) < 0)
+ goto fail;
+
+
+ cmd = EC_NODE_SEQ(NULL,
+ ec_node_str(NULL, "load"),
+ ec_node("file", NULL)
);
- if (commands == NULL) {
- printf("cannot create token\n");
+ 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;
+
+ return 0;
+
+ fail:
+ fprintf(stderr, "cannot initialize nodes\n");
+ ec_node_free(cmdlist);
+ return -1;
+}
+
+int main(void)
+{
+ struct ec_parsed *p;
+ char *line;
+
+ if (create_commands() < 0)
return 1;
- }
+ rl_bind_key('?', show_help);
rl_attempted_completion_function = my_attempted_completion;
while (1) {
if (line == NULL)
break;
- p = ec_tk_parse(commands, line);
- ec_parsed_tk_dump(stdout, p);
+ p = ec_node_parse(commands, line);
+ ec_parsed_dump(stdout, p);
add_history(line);
- ec_parsed_tk_free(p);
+ ec_parsed_free(p);
}
- ec_tk_free(commands);
+ ec_node_free(commands);
return 0;
+
}