1
0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00

delimiter -> delimiters.

This commit is contained in:
Bruno Haible
2002-12-06 16:46:14 +00:00
parent 218f1b2fac
commit d776b8df65
4 changed files with 21 additions and 11 deletions

View File

@@ -1,5 +1,11 @@
2002-11-02 Bruno Haible <bruno@clisp.org> 2002-11-02 Bruno Haible <bruno@clisp.org>
* src/options.h (Options::get_delimiters): Renamed from
Options::get_delimiter.
* src/options.icc (Options::get_delimiters): Renamed from
Options::get_delimiter.
* src/input.cc (Input::read_keys): Update.
Bug fix. Bug fix.
* src/options.cc (Options::print_options): Escape backquote inside * src/options.cc (Options::print_options): Escape backquote inside
double-quoted strings. double-quoted strings.

View File

@@ -343,14 +343,14 @@ Input::read_keys ()
} }
/* Read in all the keywords from the input file. */ /* Read in all the keywords from the input file. */
const char *delimiter = option.get_delimiter (); const char *delimiters = option.get_delimiters ();
_head = parse_line (ptr, delimiter); _head = parse_line (ptr, delimiters);
for (Keyword_List *temp = _head; for (Keyword_List *temp = _head;
(ptr = Read_Line::read_next_line ()) && strcmp (ptr, "%%"); (ptr = Read_Line::read_next_line ()) && strcmp (ptr, "%%");
temp = temp->rest()) temp = temp->rest())
temp->rest() = parse_line (ptr, delimiter); temp->rest() = parse_line (ptr, delimiters);
/* See if any additional C code is included at end of this file. */ /* See if any additional C code is included at end of this file. */
_additional_code = false; _additional_code = false;

View File

@@ -215,12 +215,14 @@ public:
const char * get_wordlist_name () const; const char * get_wordlist_name () const;
/* Returns the string used to delimit keywords from other attributes. */ /* Returns the string used to delimit keywords from other attributes. */
const char * get_delimiter () const; const char * get_delimiters () const;
/* Returns key positions. */ /* Returns key positions.
Only to be called if !options[ALLCHARS]. */
const Positions& get_key_positions () const; const Positions& get_key_positions () const;
/* Returns total distinct key positions. */ /* Returns total distinct key positions.
Only to be called if !options[ALLCHARS]. */
int get_max_keysig_size () const; int get_max_keysig_size () const;
private: private:

View File

@@ -193,19 +193,21 @@ Options::get_wordlist_name () const
/* Returns the string used to delimit keywords from other attributes. */ /* Returns the string used to delimit keywords from other attributes. */
INLINE const char * INLINE const char *
Options::get_delimiter () const Options::get_delimiters () const
{ {
return _delimiters; return _delimiters;
} }
/* Returns key positions. */ /* Returns key positions.
Only to be called if !options[ALLCHARS]. */
INLINE const Positions& INLINE const Positions&
Options::get_key_positions () const Options::get_key_positions () const
{ {
return _key_positions; return _key_positions;
} }
/* Returns total distinct key positions. */ /* Returns total distinct key positions.
Only to be called if !options[ALLCHARS]. */
INLINE int INLINE int
Options::get_max_keysig_size () const Options::get_max_keysig_size () const
{ {