* NEWS: Mention the change.
* lib/dfa.c, lib/dfa.h (dfaparse, dfamust, dfacomp): Update comments.
+2019-12-11 Paul Eggert <eggert@cs.ucla.edu>
+
+ dfa: update commentary for previous change
+ * NEWS: Mention the change.
+ * lib/dfa.c, lib/dfa.h (dfaparse, dfamust, dfacomp): Update comments.
+
2019-12-11 Norihiro Tanaka <noritnk@kcn.ne.jp>
dfa: separate parse and compile phase
Date Modules Changes
+2019-12-11 dfa To call dfamust, one must now call dfaparse
+ without yet calling dfacomp. This fixes a bug
+ introduced on 2018-10-22 that broke dfamust.
+
2019-12-07 xstrtol This module no longer defines the function
xstrtoll 'xstrtol_fatal'. Program that need this function
xstrtoimax should add the module 'xstrtol-error' to the list
}
}
-/* Main entry point for the parser. S is a string to be parsed, len is the
- length of the string, so s can include NUL characters. D is a pointer to
- the struct dfa to parse into. */
+/* Parse a string S of length LEN into D. S can include NUL characters.
+ This is the main entry point for the parser. */
void
dfaparse (char const *s, size_t len, struct dfa *d)
{
}
}
-/* Parse and analyze a single string of the given length. */
+/* Parse a string S of length LEN into D (but skip this step if S is null).
+ Then analyze D and build a matcher for it.
+ SEARCHFLAG says whether to build a searching or an exact matcher. */
void
dfacomp (char const *s, size_t len, struct dfa *d, bool searchflag)
{
extern void dfasyntax (struct dfa *, struct localeinfo const *,
reg_syntax_t, int);
-/* Build and return the struct dfamust from the given struct dfa. */
+/* Parse the given string of given length into the given struct dfa. */
+extern void dfaparse (char const *, size_t, struct dfa *);
+
+/* Allocate and return a struct dfamust from a struct dfa that was
+ initialized by dfaparse and not yet given to dfacomp. */
extern struct dfamust *dfamust (struct dfa const *);
/* Free the storage held by the components of a struct dfamust. */
extern void dfamustfree (struct dfamust *);
-/* Parse the given string of given length into the given struct dfa. */
-extern void dfaparse (char const *, size_t, struct dfa *);
-
/* Compile the given string of the given length into the given struct dfa.
- Final argument is a flag specifying whether to build a searching or an
- exact matcher. */
+ The last argument says whether to build a searching or an exact matcher.
+ A null first argument means the struct dfa has already been
+ initialized by dfaparse; the second argument is ignored. */
extern void dfacomp (char const *, size_t, struct dfa *, bool);
/* Search through a buffer looking for a match to the given struct dfa.