x

[protos/libecoli.git] / lib / ecoli_completed.h

diff --git a/lib/ecoli_completed.h b/lib/ecoli_completed.h
index d9fcdc3..4d0045e 100644 (file)
--- a/lib/ecoli_completed.h
+++ b/lib/ecoli_completed.h
@@ -34,24 +34,41 @@
 
 struct ec_node;
 
-struct ec_completed_elt {
-       TAILQ_ENTRY(ec_completed_elt) next;
+enum ec_completed_type {
+       EC_NO_MATCH = 1,
+       EC_MATCH = 2,
+       EC_PARTIAL = 4,
+};
+
+struct ec_completed_item {
+       TAILQ_ENTRY(ec_completed_item) next;
+       enum ec_completed_type type;
        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);
+TAILQ_HEAD(ec_completed_item_list, ec_completed_item);
+
+struct ec_completed_node {
+       const struct ec_node *node;
+};
 
+TAILQ_HEAD(ec_completed_node_list, ec_completed_node);
 
 struct ec_completed {
-       struct ec_completed_elt_list elts;
        unsigned count;
        unsigned count_match;
        char *smallest_start;
+       struct ec_completed_node_list nodes;
+       struct ec_completed_item_list matches;
 };
 
 /*
- * return a completed object filled with elts
+ * return a completed object filled with items
  * return NULL on error (nomem?)
  */
 struct ec_completed *ec_node_complete(struct ec_node *node,
@@ -59,44 +76,48 @@ struct ec_completed *ec_node_complete(struct ec_node *node,
 struct ec_completed *ec_node_complete_strvec(struct ec_node *node,
        const struct ec_strvec *strvec);
 
+/* internal: used by nodes */
+struct ec_completed *ec_node_complete_child(struct ec_node *node,
+                                       struct ec_parsed *state,
+                                       const struct ec_strvec *strvec);
+
 struct ec_completed *ec_completed(void);
-struct ec_completed_elt *ec_completed_elt(const struct ec_node *node,
-       const char *add);
-void ec_completed_add_elt(struct ec_completed *completed,
-       struct ec_completed_elt *elt);
-void ec_completed_elt_free(struct ec_completed_elt *elt);
+
+int ec_completed_add_match(struct ec_completed *completed,
+                       struct ec_parsed *state,
+                       const struct ec_node *node, const char *add);
+int ec_completed_add_no_match(struct ec_completed *completed,
+                       struct ec_parsed *state, const struct ec_node *node);
+
+void ec_completed_item_free(struct ec_completed_item *item);
 void ec_completed_merge(struct ec_completed *completed1,
        struct ec_completed *completed2);
 void ec_completed_free(struct ec_completed *completed);
 void ec_completed_dump(FILE *out,
        const struct ec_completed *completed);
 struct ec_completed *ec_node_default_complete(const struct ec_node *gen_node,
-       const struct ec_strvec *strvec);
+                                       struct ec_parsed *state,
+                                       const struct ec_strvec *strvec);
 
 /* cannot return NULL */
 const char *ec_completed_smallest_start(
        const struct ec_completed *completed);
 
-enum ec_completed_filter_flags {
-       EC_MATCH = 1,
-       EC_NO_MATCH = 2,
-};
-
 unsigned int ec_completed_count(
        const struct ec_completed *completed,
-       enum ec_completed_filter_flags flags);
+       enum ec_completed_type flags);
 
 struct ec_completed_iter {
-       enum ec_completed_filter_flags flags;
+       enum ec_completed_type type;
        const struct ec_completed *completed;
-       const struct ec_completed_elt *cur;
+       const struct ec_completed_item *cur_item;
 };
 
 struct ec_completed_iter *
 ec_completed_iter(struct ec_completed *completed,
-       enum ec_completed_filter_flags flags);
+       enum ec_completed_type type);
 
-const struct ec_completed_elt *ec_completed_iter_next(
+const struct ec_completed_item *ec_completed_iter_next(
        struct ec_completed_iter *iter);
 
 void ec_completed_iter_free(struct ec_completed_iter *iter);