save

diff --git a/lib/Makefile b/lib/Makefile
index e9f7f5eaaaa0a33fc3a58420d2bec9d6ebc96c49..8d447964339cca10fbe15ad7ca04a5db1fff9b60 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -30,9 +30,17 @@ include $(ECOLI)/mk/ecoli-pre.mk
 # output path with trailing slash
 O ?= build/
 
+# XXX -O0
 CFLAGS  = -g -O0 -Wall -Werror -W -Wextra -fPIC -Wmissing-prototypes
 CFLAGS += -I.
 
+# XXX coverage
+CFLAGS += --coverage -fprofile-arcs -ftest-coverage
+LDFLAGS += --coverage
+#  rm -rf build; rm -rf result; make && ./build/test
+#  lcov -d build -c -t build/test -o test.info && genhtml -o result test.info
+
+
 srcs :=
 srcs += ecoli_completed.c
 srcs += ecoli_keyval.c
@@ -45,6 +53,7 @@ srcs += ecoli_node_cmd.c
 srcs += ecoli_node_empty.c
 srcs += ecoli_node_expr.c
 srcs += ecoli_node_expr_test.c
+srcs += ecoli_node_file.c
 srcs += ecoli_node_int.c
 srcs += ecoli_node_many.c
 srcs += ecoli_node_once.c
@@ -59,6 +68,7 @@ srcs += ecoli_node_str.c
 srcs += ecoli_node_subset.c
 srcs += ecoli_node_weakref.c
 srcs += ecoli_parsed.c
+srcs += ecoli_vec.c
 
 shlib-y-$(O)libecoli.so := $(srcs)
 

diff --git a/lib/ecoli_completed.c b/lib/ecoli_completed.c
index 18e92edefffe80e075c418e357df2831d0662aaa..5e79ac2957a08bacdd07a3cd3153f9996b93a151 100644 (file)
--- a/lib/ecoli_completed.c
+++ b/lib/ecoli_completed.c
@@ -53,27 +53,6 @@ struct ec_completed *ec_completed(void)
        return completed;
 }
 
-static struct ec_completed_elt *
-ec_completed_elt(const struct ec_node *node, const char *add)
-{
-       struct ec_completed_elt *elt = NULL;
-
-       elt = ec_calloc(1, sizeof(*elt));
-       if (elt == NULL)
-               return NULL;
-
-       elt->node = node;
-       if (add != NULL) {
-               elt->add = ec_strdup(add);
-               if (elt->add == NULL) {
-                       ec_completed_elt_free(elt);
-                       return NULL;
-               }
-       }
-
-       return elt;
-}
-
 struct ec_completed *
 ec_node_complete_child(struct ec_node *node,
                struct ec_parsed *state,
@@ -181,7 +160,7 @@ struct ec_completed *ec_node_default_complete(const struct ec_node *gen_node,
        if (ec_strvec_len(strvec) != 1)
                return completed;
 
-       if (ec_completed_add_elt(completed, gen_node, NULL) < 0) {
+       if (ec_completed_add_elt(completed, state, gen_node, NULL) < 0) {
                ec_completed_free(completed);
                return NULL;
        }
@@ -200,6 +179,56 @@ static size_t strcmp_count(const char *s1, const char *s2)
        return i;
 }
 
+static struct ec_completed_elt *
+ec_completed_elt(struct ec_parsed *parsed,
+               const struct ec_node *node, const char *add)
+{
+       struct ec_completed_elt *elt = NULL;
+
+       elt = ec_calloc(1, sizeof(*elt));
+       if (elt == NULL)
+               return NULL;
+
+       if (parsed != NULL) {
+               struct ec_parsed *p;
+               size_t len;
+
+               /* get path len */
+               for (p = parsed, len = 0; p != NULL;
+                    p = ec_parsed_get_parent(p), len++)
+                       ;
+
+               elt->path = ec_calloc(len, sizeof(*elt->path));
+               if (elt->path == NULL)
+                       goto fail;
+
+               elt->pathlen = len;
+
+               /* write path in array */
+               for (p = parsed, len = 0; p != NULL;
+                    p = ec_parsed_get_parent(p), len++)
+                       elt->path[len] = p->node;
+       }
+
+       elt->node = node;
+       if (add != NULL) {
+               elt->add = ec_strdup(add);
+               if (elt->add == NULL)
+                       goto fail;
+       }
+
+       return elt;
+
+fail:
+       if (elt != NULL) {
+               ec_free(elt->path);
+               ec_free(elt->add);
+       }
+       ec_completed_elt_free(elt);
+
+       return NULL;
+}
+
 static int __ec_completed_add_elt(struct ec_completed *completed,
                                struct ec_completed_elt *elt)
 {
@@ -222,11 +251,12 @@ static int __ec_completed_add_elt(struct ec_completed *completed,
 }
 
 int ec_completed_add_elt(struct ec_completed *completed,
+                       struct ec_parsed *parsed,
                        const struct ec_node *node, const char *add)
 {
        struct ec_completed_elt *elt;
 
-       elt = ec_completed_elt(node, add);
+       elt = ec_completed_elt(parsed, node, add);
        if (elt == NULL)
                return -ENOMEM;
 
@@ -236,6 +266,7 @@ int ec_completed_add_elt(struct ec_completed *completed,
 void ec_completed_elt_free(struct ec_completed_elt *elt)
 {
        ec_free(elt->add);
+       ec_free(elt->path);
        ec_free(elt);
 }
 
@@ -341,11 +372,10 @@ const struct ec_completed_elt *ec_completed_iter_next(
                return NULL;
 
        do {
-               if (iter->cur == NULL) {
+               if (iter->cur == NULL)
                        iter->cur = TAILQ_FIRST(&iter->completed->elts);
-               } else {
+               else
                        iter->cur = TAILQ_NEXT(iter->cur, next);
-               }
 
                if (iter->cur == NULL)
                        break;

diff --git a/lib/ecoli_completed.h b/lib/ecoli_completed.h
index 993db7f4b142b021ba1a0f799dd7ad681850cda9..26ac77ad36c3dfff178bc88786c39433f3c33c5f 100644 (file)
--- a/lib/ecoli_completed.h
+++ b/lib/ecoli_completed.h
@@ -38,6 +38,10 @@ struct ec_completed_elt {
        TAILQ_ENTRY(ec_completed_elt) next;
        const struct ec_node *node;
        char *add;
+
+       /* reverse order: [0] = last parsed, [len-1] = root */
+       const struct ec_node **path;
+       size_t pathlen;
 };
 
 TAILQ_HEAD(ec_completed_elt_list, ec_completed_elt);
@@ -67,6 +71,7 @@ struct ec_completed *ec_completed(void);
 
 /* XXX add completion type: full, partial, none */
 int ec_completed_add_elt(struct ec_completed *completed,
+                       struct ec_parsed *parsed,
                        const struct ec_node *node, const char *add);
 void ec_completed_elt_free(struct ec_completed_elt *elt);
 void ec_completed_merge(struct ec_completed *completed1,

diff --git a/lib/ecoli_keyval.c b/lib/ecoli_keyval.c
index 2572ba0be92fd7825e4fdcff09755944f8d37025..c1d881f55898211e25c82fa49283d0c3de52f7db 100644 (file)
--- a/lib/ecoli_keyval.c
+++ b/lib/ecoli_keyval.c
@@ -187,6 +187,7 @@ void ec_keyval_dump(const struct ec_keyval *keyval, FILE *out)
        }
 }
 
+/* LCOV_EXCL_START */
 static int ec_keyval_testcase(void)
 {
        struct ec_keyval *keyval;
@@ -226,6 +227,7 @@ static int ec_keyval_testcase(void)
 
        return 0;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_keyval_test = {
        .name = "keyval",

diff --git a/lib/ecoli_node_cmd.c b/lib/ecoli_node_cmd.c
index 2082bddb0334a502c6db96da972018ec11ef2bf1..7d11dfa3ee55514ca85dc84d47bedeb21bf0d71d 100644 (file)
--- a/lib/ecoli_node_cmd.c
+++ b/lib/ecoli_node_cmd.c
@@ -491,6 +491,7 @@ fail:
        return NULL;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_cmd_testcase(void)
 {
        struct ec_node *node;
@@ -525,6 +526,7 @@ static int ec_node_cmd_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_cmd_test = {
        .name = "node_cmd",

diff --git a/lib/ecoli_node_empty.c b/lib/ecoli_node_empty.c
index 6a6ed610fabdd6e1165257cf77aeee07eac9f6fc..cc29779f54eca5f888dffa3a63a0ec366efa17a2 100644 (file)
--- a/lib/ecoli_node_empty.c
+++ b/lib/ecoli_node_empty.c
@@ -62,6 +62,7 @@ static struct ec_node_type ec_node_empty_type = {
 
 EC_NODE_TYPE_REGISTER(ec_node_empty_type);
 
+/* LCOV_EXCL_START */
 static int ec_node_empty_testcase(void)
 {
        struct ec_node *node;
@@ -95,6 +96,7 @@ static int ec_node_empty_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_empty_test = {
        .name = "node_empty",

diff --git a/lib/ecoli_node_expr_test.c b/lib/ecoli_node_expr_test.c
index 1e78212e4fa911e18b93afd6c8b37850c7393afb..c0e149ae7f8b7406337aadc653424efc42be6da4 100644 (file)
--- a/lib/ecoli_node_expr_test.c
+++ b/lib/ecoli_node_expr_test.c
@@ -216,6 +216,7 @@ static int ec_node_expr_test_eval(struct ec_node *lex_node,
        return ret;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_expr_testcase(void)
 {
        struct ec_node *node = NULL, *lex_node = NULL;
@@ -298,6 +299,7 @@ fail:
        ec_node_free(node);
        return -1;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_expr_test = {
        .name = "expr",

diff --git a/lib/ecoli_node_int.c b/lib/ecoli_node_int.c
index 2ba1b28b3d2ce9d6752a4de4e08c57349173f0b7..0635a16799878c5934dc6313869dd269fcef9adb 100644 (file)
--- a/lib/ecoli_node_int.c
+++ b/lib/ecoli_node_int.c
@@ -139,6 +139,7 @@ long long ec_node_int_getval(struct ec_node *gen_node, const char *str)
        return val;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_int_testcase(void)
 {
        struct ec_parsed *p;
@@ -220,6 +221,7 @@ static int ec_node_int_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_int_test = {
        .name = "node_int",

diff --git a/lib/ecoli_node_many.c b/lib/ecoli_node_many.c
index 87534a390fd3b6032a115000e18b3fd5789dcdcb..7e1582c002d638325435f7c7919b933c2cf55970 100644 (file)
--- a/lib/ecoli_node_many.c
+++ b/lib/ecoli_node_many.c
@@ -224,6 +224,7 @@ struct ec_node *ec_node_many(const char *id, struct ec_node *child,
        return &node->gen;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_many_testcase(void)
 {
        struct ec_node *node;
@@ -302,6 +303,7 @@ static int ec_node_many_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_many_test = {
        .name = "node_many",

diff --git a/lib/ecoli_node_once.c b/lib/ecoli_node_once.c
index deb9baa65ab9f170aff544b66c51f085ee3b3e62..b89b80e10d8ebeaf7d7ccb8baade1434f131ba44 100644 (file)
--- a/lib/ecoli_node_once.c
+++ b/lib/ecoli_node_once.c
@@ -171,6 +171,7 @@ struct ec_node *ec_node_once(const char *id, struct ec_node *child)
        return gen_node;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_once_testcase(void)
 {
        struct ec_node *node;
@@ -223,6 +224,7 @@ static int ec_node_once_testcase(void)
 #endif
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_once_test = {
        .name = "node_once",

diff --git a/lib/ecoli_node_option.c b/lib/ecoli_node_option.c
index 0c72f983956af0ccc0b417c849f41c2e6cca70e2..4b5281473a1f2d8d583cc8fb3724ee9b23468558 100644 (file)
--- a/lib/ecoli_node_option.c
+++ b/lib/ecoli_node_option.c
@@ -113,6 +113,7 @@ struct ec_node *ec_node_option(const char *id, struct ec_node *child)
        return &node->gen;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_option_testcase(void)
 {
        struct ec_node *node;
@@ -151,6 +152,7 @@ static int ec_node_option_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_option_test = {
        .name = "node_option",

diff --git a/lib/ecoli_node_or.c b/lib/ecoli_node_or.c
index 8925cc727330787c937c03b467b2efc5cca0cdbe..a8d653cf88f022a3c5ea161fe7bd0e950ad3843b 100644 (file)
--- a/lib/ecoli_node_or.c
+++ b/lib/ecoli_node_or.c
@@ -180,6 +180,7 @@ fail:
        return NULL;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_or_testcase(void)
 {
        struct ec_node *node;
@@ -246,6 +247,7 @@ static int ec_node_or_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_or_test = {
        .name = "node_or",

diff --git a/lib/ecoli_node_re.c b/lib/ecoli_node_re.c
index 63e2d3e5a9c3ef6121f0be7516b52b5afdcd9364..984e686c72f71b1d41f9054b919c758948dce8b5 100644 (file)
--- a/lib/ecoli_node_re.c
+++ b/lib/ecoli_node_re.c
@@ -131,6 +131,7 @@ fail:
        return NULL;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_re_testcase(void)
 {
        struct ec_node *node;
@@ -151,6 +152,7 @@ static int ec_node_re_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_re_test = {
        .name = "node_re",

diff --git a/lib/ecoli_node_re_lex.c b/lib/ecoli_node_re_lex.c
index c4d5104567f76f52c3b8d49b8b429ea0391206f6..2de1c643245d8725f7652ba26d175348120e35a4 100644 (file)
--- a/lib/ecoli_node_re_lex.c
+++ b/lib/ecoli_node_re_lex.c
@@ -216,7 +216,7 @@ struct ec_node *ec_node_re_lex(const char *id, struct ec_node *child)
        return &node->gen;
 }
 
-
+/* LCOV_EXCL_START */
 static int ec_node_re_lex_testcase(void)
 {
        struct ec_node *node;
@@ -258,6 +258,7 @@ static int ec_node_re_lex_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_re_lex_test = {
        .name = "node_re_lex",

diff --git a/lib/ecoli_node_seq.c b/lib/ecoli_node_seq.c
index 8b7b2ee7fdcc77775c02049640cec0e3544884bf..2d6363e346244b206ebd67a35a0ff286f8621ec6 100644 (file)
--- a/lib/ecoli_node_seq.c
+++ b/lib/ecoli_node_seq.c
@@ -271,6 +271,7 @@ fail:
        return NULL;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_seq_testcase(void)
 {
        struct ec_node *node;
@@ -343,6 +344,7 @@ static int ec_node_seq_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_seq_test = {
        .name = "node_seq",

diff --git a/lib/ecoli_node_sh_lex.c b/lib/ecoli_node_sh_lex.c
index ec15fc7fad4efc6ff11df8bf0c5aa9d9f6ecca19..0ce54fe0d83c0a280624e3957ec1605df893dba3 100644 (file)
--- a/lib/ecoli_node_sh_lex.c
+++ b/lib/ecoli_node_sh_lex.c
@@ -356,6 +356,7 @@ struct ec_node *ec_node_sh_lex(const char *id, struct ec_node *child)
        return &node->gen;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_sh_lex_testcase(void)
 {
        struct ec_node *node;
@@ -447,6 +448,7 @@ static int ec_node_sh_lex_testcase(void)
        ec_node_free(node);
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_sh_lex_test = {
        .name = "node_sh_lex",

diff --git a/lib/ecoli_node_space.c b/lib/ecoli_node_space.c
index 265cc9b4f66b01338254041944f0a52df9d2ee18..fd526e6a3d3578fd5b6ec168f5e7d2ccbb07a208 100644 (file)
--- a/lib/ecoli_node_space.c
+++ b/lib/ecoli_node_space.c
@@ -75,6 +75,7 @@ static struct ec_node_type ec_node_space_type = {
 
 EC_NODE_TYPE_REGISTER(ec_node_space_type);
 
+/* LCOV_EXCL_START */
 static int ec_node_space_testcase(void)
 {
        struct ec_node *node;
@@ -114,6 +115,7 @@ static int ec_node_space_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_space_test = {
        .name = "space",

diff --git a/lib/ecoli_node_str.c b/lib/ecoli_node_str.c
index 011a86ce94f9cd8e8c64c787489b0cb52a2ec896..62ec788906b458a1c28d2be6c49676310e2585e6 100644 (file)
--- a/lib/ecoli_node_str.c
+++ b/lib/ecoli_node_str.c
@@ -95,7 +95,7 @@ ec_node_str_complete(const struct ec_node *gen_node,
        else
                add = node->string + n;
 
-       if (ec_completed_add_elt(completed, gen_node, add) < 0) {
+       if (ec_completed_add_elt(completed, state, gen_node, add) < 0) {
                ec_completed_free(completed);
                return NULL;
        }
@@ -164,6 +164,7 @@ fail:
        return NULL;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_str_testcase(void)
 {
        struct ec_node *node;
@@ -235,6 +236,7 @@ static int ec_node_str_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_str_test = {
        .name = "node_str",

diff --git a/lib/ecoli_node_subset.c b/lib/ecoli_node_subset.c
index 6b5fee0236bc1a615a17eb82f3efacaa0b76c4bb..599c76166627d5aa18b0278e97c0fd5627763bd1 100644 (file)
--- a/lib/ecoli_node_subset.c
+++ b/lib/ecoli_node_subset.c
@@ -358,6 +358,7 @@ fail:
        return NULL;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_subset_testcase(void)
 {
        struct ec_node *node;
@@ -438,6 +439,7 @@ static int ec_node_subset_testcase(void)
 
        return ret;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_subset_test = {
        .name = "node_subset",

diff --git a/lib/ecoli_node_weakref.c b/lib/ecoli_node_weakref.c
index 9ad52fb156716faaf6b1a49fb11fd28107bd1539..735f831938ecab1f146dae068bb8a8fce1d5d612 100644 (file)
--- a/lib/ecoli_node_weakref.c
+++ b/lib/ecoli_node_weakref.c
@@ -114,11 +114,13 @@ struct ec_node *ec_node_weakref(const char *id, struct ec_node *child)
        return gen_node;
 }
 
+/* LCOV_EXCL_START */
 static int ec_node_weakref_testcase(void)
 {
        //XXX weakref testcase
        return 0;
 }
+/* LCOV_EXCL_STOP */
 
 static struct ec_test ec_node_weakref_test = {
        .name = "node_weakref",

diff --git a/lib/ecoli_parsed.c b/lib/ecoli_parsed.c
index 140edeafe1a24865e4680358fdcae457c852c725..e3a05e987ecdb6086042cee57cdc8c65a59046f0 100644 (file)
--- a/lib/ecoli_parsed.c
+++ b/lib/ecoli_parsed.c
@@ -274,6 +274,14 @@ struct ec_parsed *ec_parsed_get_root(struct ec_parsed *parsed)
        return parsed;
 }
 
+struct ec_parsed *ec_parsed_get_parent(struct ec_parsed *parsed)
+{
+       if (parsed == NULL)
+               return NULL;
+
+       return parsed->parent;
+}
+
 struct ec_parsed *ec_parsed_find_first(struct ec_parsed *parsed,
        const char *id)
 {

diff --git a/lib/ecoli_parsed.h b/lib/ecoli_parsed.h
index 1ebea9e3e3c36ccd05016830e76bab50f76eb36f..df24f055019da9ea2a7e49fd65056ae7b10a9472 100644 (file)
--- a/lib/ecoli_parsed.h
+++ b/lib/ecoli_parsed.h
@@ -89,9 +89,12 @@ void ec_parsed_add_child(struct ec_parsed *parsed,
                        struct ec_parsed *child);
 void ec_parsed_del_child(struct ec_parsed *parsed,
                        struct ec_parsed *child);
+
 struct ec_parsed *ec_parsed_get_root(struct ec_parsed *parsed);
+struct ec_parsed *ec_parsed_get_parent(struct ec_parsed *parsed);
 struct ec_parsed *ec_parsed_get_last_child(struct ec_parsed *parsed);
 void ec_parsed_del_last_child(struct ec_parsed *parsed);
+int ec_parsed_get_path(struct ec_parsed *parsed, struct ec_node **path);
 
 void ec_parsed_dump(FILE *out, const struct ec_parsed *parsed);
 

diff --git a/lib/ecoli_strvec.h b/lib/ecoli_strvec.h
index af1db57f653df8d48e9d4cd88b7db3017f771c8a..ee3313ea3b5e9273158c3e53e1f91207d0502eb5 100644 (file)
--- a/lib/ecoli_strvec.h
+++ b/lib/ecoli_strvec.h
@@ -28,7 +28,6 @@
 #ifndef ECOLI_STRVEC_
 #define ECOLI_STRVEC_
 
-#include <sys/types.h>
 #include <stdio.h>
 
 struct ec_strvec *ec_strvec(void);

diff --git a/lib/main-readline.c b/lib/main-readline.c
index 9d898ff2a06c03ad168103448b4c218281806e6e..7aef334063f615bae33a416a5520cb4a0aba1032 100644 (file)
--- a/lib/main-readline.c
+++ b/lib/main-readline.c
@@ -101,21 +101,28 @@ static char **my_attempted_completion(const char *text, int start, int end)
 }
 
 /* this function builds the help string */
-static char *get_tk_help(const struct ec_node *node)
+static char *get_node_help(const struct ec_completed_elt *elt)
 {
-       const struct ec_node *node2;
+       const struct ec_node *node;
        char *help = NULL;
-       char *tk_help = NULL;
-
-       for (node2 = node;
-            node2 != NULL && tk_help == NULL;
-            node2 = ec_node_parent(node2))
-               tk_help = ec_keyval_get(ec_node_attrs(node2), "help");
+       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 (tk_help == NULL)
-               tk_help = "";
+       if (node_help == NULL)
+               node_help = "";
+       if (node_desc == NULL)
+               return NULL;
 
-       if (asprintf(&help, "%-20s %s", ec_node_desc(node), tk_help) < 0)
+       if (asprintf(&help, "%-20s %s", node_desc, node_help) < 0)
                return NULL;
 
        return help;
@@ -169,7 +176,7 @@ static int show_help(int ignore, int invoking_key)
        for (i = match + 1, elt = ec_completed_iter_next(iter);
             i < count + match + 1 && elt != NULL;
             i++, elt = ec_completed_iter_next(iter)) {
-               helps[i] = get_tk_help(elt->node);
+               helps[i] = get_node_help(elt);
        }
 
        ec_completed_free(c);
@@ -198,7 +205,7 @@ static int create_commands(void)
        cmd = EC_NODE_SEQ(NULL,
                ec_node_str(NULL, "hello"),
                EC_NODE_OR("name",
-                       ec_node_str(NULL, "john"),
+                       ec_node_str("john", "john"),
                        ec_node_str(NULL, "johnny"),
                        ec_node_str(NULL, "mike")
                ),
@@ -208,6 +215,8 @@ static int create_commands(void)
                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")),
@@ -216,12 +225,17 @@ static int create_commands(void)
                goto fail;
 
 
-       cmd = EC_NODE_CMD(NULL, "good morning bob|bobby|michael [count]",
+       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;
 
@@ -236,11 +250,10 @@ static int create_commands(void)
                goto fail;
 
 
-       cmd = EC_NODE_CMD(NULL, "sell vegetable",
-                       ec_node_many("vegetable",
+       cmd = EC_NODE_CMD(NULL, "eat vegetables",
+                       ec_node_many("vegetables",
                                EC_NODE_OR(NULL,
-                                       ec_node_once(NULL,
-                                               ec_node_str(NULL, "potatoes")),
+                                       ec_node_str(NULL, "potatoes"),
                                        ec_node_once(NULL,
                                                ec_node_str(NULL, "carrots")),
                                        ec_node_once(NULL,
@@ -249,7 +262,7 @@ static int create_commands(void)
        if (cmd == NULL)
                goto fail;
        ec_keyval_set(ec_node_attrs(cmd), "help",
-               "sell vegetables", NULL);
+               "eat vegetables (take some more potatoes)", NULL);
        if (ec_node_or_add(cmdlist, cmd) < 0)
                goto fail;
 
@@ -257,7 +270,7 @@ static int create_commands(void)
        cmd = EC_NODE_SEQ(NULL,
                ec_node_str(NULL, "bye")
        );
-       ec_keyval_set(ec_node_attrs(cmd), "help", "say bye to someone", NULL);
+       ec_keyval_set(ec_node_attrs(cmd), "help", "say bye", NULL);
        if (ec_node_or_add(cmdlist, cmd) < 0)
                goto fail;
 

diff --git a/lib/main.c b/lib/main.c
index 1f36b69d383e90ca5f800576fd58dd154d26d3d6..25cc4ca1a31942f12e4bf0bf84e377f8994541bc 100644 (file)
--- a/lib/main.c
+++ b/lib/main.c
@@ -65,8 +65,7 @@ static const struct option ec_long_options[] = {
 
 static void usage(const char *prgname)
 {
-       /* XXX add a parameter to test only one testcase */
-       printf("%s [options]\n"
+       printf("%s [options] [test1 test2 test3...]\n"
                "  -h\n"
                "  --"EC_OPT_HELP"\n"
                "      Show this help.\n"

diff --git a/lib/todo.txt b/lib/todo.txt
index c34e1047a04b7240a29a4c72c2b6d19b8ba1678b..0597ecb513c14ca14310c1eacd40392beaec8321 100644 (file)
--- a/lib/todo.txt
+++ b/lib/todo.txt
@@ -2,15 +2,16 @@ tk_cmd
 ======
 
 X evaluate expression tree in ec_tk_expr
-- cmd token
+X cmd token
 - example
 X tk_re
 
-cleanup
-=======
+cleanup / rework
+================
 
 - check XXX in code
 X remove the _new() functions
+- iterate children nodes without chaining them
 - add a tk vector type: will be used in several nodes (ex: or, seq, ...)
 - check allocation model everywhere
 - checkpatch?
@@ -25,17 +26,21 @@ X split ecoli_tk.h
 - cache results when appropriate?
 - size_t or unsigned int?
 X rename:
-  - ec_tk -> ec_node
-  - ec_parsed_tk -> ec_parsed
-  - ec_completed_tk -> ec_completed
-  - tk, gen_tk, token, ... -> node
-  - tokens -> input_str / input_strvec ?
+  X ec_tk -> ec_node
+  X ec_parsed_tk -> ec_parsed
+  X ec_completed_tk -> ec_completed
+  X tk, gen_tk, token, ... -> node
+  X tokens -> input_str / input_strvec ?
 - use is_err() or errno for funcs returning ptrs
+- save node path in completion to fix help string
+- code coverage
+- try to hide structures
 
 dependencies
 ============
 
-- pass the current parsed state when parsing/completing
+X pass the current parsed state when parsing/completing
+X new node "once"
 - new node "condition"
 
 logs