#endif
/**
- * NFA representation
+ * Automaton (NFA/DFA) representation.
*/
-struct GNUNET_REGEX_Nfa;
+struct GNUNET_REGEX_Automaton;
+
+
+/**
+ * Edge representation.
+ */
+struct GNUNET_REGEX_Edge
+{
+ /**
+ * Label of the edge. FIXME: might want to not consume exactly multiples of 8 bits, need length?
+ */
+ const char *label;
+
+ /**
+ * Destionation of the edge.
+ */
+ struct GNUNET_HashCode destination;
+};
+
/**
- * Construct an NFA data structure by parsing the regex string of
- * length len.
+ * Construct an NFA by parsing the regex string of length 'len'.
*
- * @param regex regular expression string
- * @param len length of the string
+ * @param regex regular expression string.
+ * @param len length of the string.
*
- * @return NFA data structure. Needs to be freed using
- * GNUNET_REGEX_destroy_nfa
+ * @return NFA, needs to be freed using GNUNET_REGEX_destroy_automaton.
*/
-struct GNUNET_REGEX_Nfa *
-GNUNET_REGEX_construct_nfa(const char *regex, size_t len);
+struct GNUNET_REGEX_Automaton *
+GNUNET_REGEX_construct_nfa (const char *regex, const size_t len);
+
/**
- * Free the memory allocated by constructing the GNUNET_REGEX_Nfa
+ * Construct DFA for the given 'regex' of length 'len'.
+ *
+ * @param regex regular expression string.
+ * @param len length of the regular expression.
+ *
+ * @return DFA, needs to be freed using GNUNET_REGEX_destroy_automaton.
+ */
+struct GNUNET_REGEX_Automaton *
+GNUNET_REGEX_construct_dfa (const char *regex, const size_t len);
+
+
+/**
+ * Free the memory allocated by constructing the GNUNET_REGEX_Automaton.
* data structure.
*
- * @param n NFA to be destroyed
+ * @param a automaton to be destroyed.
*/
void
-GNUNET_REGEX_destroy_nfa(struct GNUNET_REGEX_Nfa *n);
+GNUNET_REGEX_automaton_destroy (struct GNUNET_REGEX_Automaton *a);
+
/**
- * Save the given NFA as a GraphViz dot file
+ * Save the given automaton as a GraphViz dot file.
*
- * @param n NFA to be saved
- * @param filename where to save the file
+ * @param a the automaton to be saved.
+ * @param filename where to save the file.
*/
void
-GNUNET_REGEX_save_nfa_graph(struct GNUNET_REGEX_Nfa *n,
- const char *filename);
+GNUNET_REGEX_automaton_save_graph (struct GNUNET_REGEX_Automaton *a,
+ const char *filename);
+
+/**
+ * Evaluates the given 'string' against the given compiled regex.
+ *
+ * @param a automaton.
+ * @param string string to check.
+ *
+ * @return 0 if string matches, non 0 otherwise.
+ */
+int
+GNUNET_REGEX_eval (struct GNUNET_REGEX_Automaton *a,
+ const char *string);
+
+
+/**
+ * Get the first key for the given 'input_string'. This hashes
+ * the first x bits of the 'input_string'.
+ *
+ * @param input_string string.
+ * @param string_len length of the 'input_string'.
+ * @param key pointer to where to write the hash code.
+ *
+ * @return number of bits of 'input_string' that have been consumed
+ * to construct the key
+ */
+size_t
+GNUNET_REGEX_get_first_key (const char *input_string, size_t string_len,
+ struct GNUNET_HashCode * key);
+
+
+/**
+ * Check if the given 'proof' matches the given 'key'.
+ *
+ * @param proof partial regex of a state.
+ * @param key hash of a state.
+ *
+ * @return GNUNET_OK if the proof is valid for the given key.
+ */
+int
+GNUNET_REGEX_check_proof (const char *proof,
+ const struct GNUNET_HashCode *key);
+
+
+/**
+ * Iterator callback function.
+ *
+ * @param cls closure.
+ * @param key hash for current state.
+ * @param proof proof for current state.
+ * @param accepting GNUNET_YES if this is an accepting state, GNUNET_NO if not.
+ * @param num_edges number of edges leaving current state.
+ * @param edges edges leaving current state.
+ */
+typedef void (*GNUNET_REGEX_KeyIterator)(void *cls,
+ const struct GNUNET_HashCode *key,
+ const char *proof,
+ int accepting,
+ unsigned int num_edges,
+ const struct GNUNET_REGEX_Edge *edges);
+
+
+/**
+ * Iterate over all edges starting from start state of automaton 'a'. Calling
+ * iterator for each edge.
+ *
+ * @param a automaton.
+ * @param iterator iterator called for each edge.
+ * @param iterator_cls closure.
+ */
+void
+GNUNET_REGEX_iterate_all_edges (struct GNUNET_REGEX_Automaton *a,
+ GNUNET_REGEX_KeyIterator iterator,
+ void *iterator_cls);
+
#if 0 /* keep Emacsens' auto-indent happy */
{
/* end of gnunet_regex_lib.h */
#endif
+