From 65615b66e805376b23f24a51e7d048f4f58e6525 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 8 Jan 1996 09:09:30 +0000 Subject: [PATCH] Function dfa_parse got 'const' string argument. --- dict/lookgrep.c | 7 +++++-- include/dfa.h | 27 +++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dict/lookgrep.c b/dict/lookgrep.c index e9623a7..2336970 100644 --- a/dict/lookgrep.c +++ b/dict/lookgrep.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: lookgrep.c,v $ - * Revision 1.12 1995-12-11 09:04:48 adam + * Revision 1.13 1996-01-08 09:09:30 adam + * Function dfa_parse got 'const' string argument. + * + * Revision 1.12 1995/12/11 09:04:48 adam * Bug fix: the lookup/scan/lookgrep didn't handle empty dictionary. * * Revision 1.11 1995/12/06 14:43:02 adam @@ -371,7 +374,7 @@ int dict_lookup_grep (Dict dict, Dict_char *pattern, int range, void *client, { MatchWord *Rj; Dict_char prefix[MAX_LENGTH+1]; - char *this_pattern = pattern; + const char *this_pattern = pattern; MatchContext *mc; struct DFA *dfa = dfa_init(); int i, d; diff --git a/include/dfa.h b/include/dfa.h index be34808..b609433 100644 --- a/include/dfa.h +++ b/include/dfa.h @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: dfa.h,v $ - * Revision 1.4 1995-01-25 11:31:04 adam + * Revision 1.5 1996-01-08 09:09:48 adam + * Function dfa_parse got 'const' string argument. + * + * Revision 1.4 1995/01/25 11:31:04 adam * Simple error reporting when parsing regular expressions. * * Revision 1.3 1995/01/24 16:01:30 adam @@ -45,6 +48,7 @@ struct DFA_state { short no; /* no of this state */ short tran_no; /* no of transitions to other states */ short rule_no; /* if non-zero, this holds accept rule no */ + short rule_nno; /* accept rule no - except start rules */ }; struct DFA { @@ -55,10 +59,15 @@ struct DFA { }; struct DFA *dfa_init (void); -int dfa_parse (struct DFA *, char **); +int dfa_parse (struct DFA *, const char **); void dfa_mkstate (struct DFA *); void dfa_delete (struct DFA **); +void dfa_parse_cmap_clean (struct DFA *d); +void dfa_parse_cmap_new (struct DFA *d, const int *cmap); +void dfa_parse_cmap_del (struct DFA *d, int from); +void dfa_parse_cmap_add (struct DFA *d, int from, int to); + extern int debug_dfa_trav; extern int debug_dfa_tran; extern int debug_dfa_followpos; @@ -68,6 +77,20 @@ extern unsigned short dfa_thompson_chars[], dfa_ccl_chars[]; +#define L_LP 1 +#define L_RP 2 +#define L_CHAR 3 +#define L_CHARS 4 +#define L_ANY 5 +#define L_ALT 6 +#define L_ANYZ 7 +#define L_WILD 8 +#define L_QUEST 9 +#define L_CLOS1 10 +#define L_CLOS0 11 +#define L_END 12 +#define L_START 13 + #define DFA_ERR_SYNTAX 1 #define DFA_ERR_LP 2 #define DFA_ERR_RP 3 -- 1.7.10.4