diff options
| author | Bruno Haible <bruno@clisp.org> | 2003-01-30 12:43:30 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2003-01-30 12:43:30 +0000 |
| commit | b0faccc7ef435f9c0713f5369bbfdae16525360b (patch) | |
| tree | 94e7d96bc031720e6f5f40af00b57aa126a5261a | |
| parent | 3aff1fd64fdbf04ec108e989e342a66f353892c5 (diff) | |
| download | gperf-b0faccc7ef435f9c0713f5369bbfdae16525360b.tar.gz | |
Remove newline from default --delimiters.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | doc/gperf.texi | 2 | ||||
| -rw-r--r-- | src/options.cc | 4 | ||||
| -rw-r--r-- | tests/test-6.exp | 2 |
4 files changed, 9 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2002-11-16 Bruno Haible <bruno@clisp.org> + * src/options.cc (DEFAULT_DELIMITERS): Remove newline. + * src/options.cc (Options::long_usage): Change default --delimiters. + * doc/gperf.texi (Input Details): Likewise. + * tests/test-6.exp: Update. + * doc/gperf.texi: Move description of option -l from section Algorithmic Details to section Output Details. * src/options.cc (Options::long_usage): Likewise. diff --git a/doc/gperf.texi b/doc/gperf.texi index 52fb95e..cc39f30 100644 --- a/doc/gperf.texi +++ b/doc/gperf.texi @@ -577,7 +577,7 @@ or if it is @samp{-}. @itemx --delimiters=@var{keyword-delimiter-list} @cindex Delimiters Allows the user to provide a string containing delimiters used to -separate keywords from their attributes. The default is ",\n". This +separate keywords from their attributes. The default is ",". This option is essential if you want to use keywords that have embedded commas or newlines. One useful trick is to use -e'TAB', where TAB is the literal tab character. diff --git a/src/options.cc b/src/options.cc index dd901ed..c38adae 100644 --- a/src/options.cc +++ b/src/options.cc @@ -59,7 +59,7 @@ static const char *const DEFAULT_HASH_NAME = "hash"; static const char *const DEFAULT_WORDLIST_NAME = "wordlist"; /* Default delimiters that separate keywords from their attributes. */ -static const char *const DEFAULT_DELIMITERS = ",\n"; +static const char *const DEFAULT_DELIMITERS = ","; /* Prints program usage to given stream. */ @@ -99,7 +99,7 @@ Options::long_usage (FILE * stream) const " -e, --delimiters=DELIMITER-LIST\n" " Allow user to provide a string containing delimiters\n" " used to separate keywords from their attributes.\n" - " Default is \",\\n\".\n"); + " Default is \",\".\n"); fprintf (stream, " -t, --struct-type Allows the user to include a structured type\n" " declaration for generated code. Any text before %%%%\n" diff --git a/tests/test-6.exp b/tests/test-6.exp index 75c2ee3..f73a9a5 100644 --- a/tests/test-6.exp +++ b/tests/test-6.exp @@ -14,7 +14,7 @@ Input file interpretation: -e, --delimiters=DELIMITER-LIST Allow user to provide a string containing delimiters used to separate keywords from their attributes. - Default is ",\n". + Default is ",". -t, --struct-type Allows the user to include a structured type declaration for generated code. Any text before %% is considered part of the type declaration. Key |