Adwaith-Rajesh/gperf
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 21:19:24 +00:00
Code Activity

Rework positions handling.

Browse Source
This commit is contained in:
Bruno Haible
2002-12-09 12:35:55 +00:00
parent d776b8df65
commit 5090f380e3
6 changed files with 197 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ChangeLog
View File

@@ -1,5 +1,30 @@
2002-11-02 Bruno Haible <bruno@clisp.org> 2002-11-02 Bruno Haible <bruno@clisp.org>
* src/options.h (DEFAULTCHARS): Remove.
(Positions::MAX_KEY_POS): Set to 255.
(Positions::_positions): Increase array size.
(PositionIterator::EOS): Set to -1.
(PositionIterator::_index): Change type to 'unsigned int'.
* src/options.icc (Positions::Positions): Don't store
PositionIterator::EOS.
(PositionIterator::next): Produce PositionIterator::EOS here.
* src/options.cc (Options::long_usage): Use MAX_KEY_POS, not
MAX_KEY_POS-1.
(PositionStringParser): Rename field _size to _in_range. Rename
field _curr_value to _range_curr_value. Rename field _upper_bound
to _range_upper_bound.
(PositionStringParser::nextPosition): Comments.
(Options::Options): Update.
(Options::~Options): Update.
(long_options): Use NULL, not 0.
(Options::parse_options): Set BAD_VALUE to -2; -1 is now EOS. Bug fix:
Check against array overflow when more than MAX_KEY_POS positions are
given. Don't store PositionIterator::EOS.
Check against extra arguments before opening the input file.
* src/output.cc (Output::output_hash_function): Change test which
was for option[DEFAULTCHARS].
* tests/test-6.exp: Update.
* src/options.h (Options::get_delimiters): Renamed from * src/options.h (Options::get_delimiters): Renamed from
Options::get_delimiter. Options::get_delimiter.
* src/options.icc (Options::get_delimiters): Renamed from * src/options.icc (Options::get_delimiters): Renamed from

215
src/options.cc
View File

@@ -177,7 +177,7 @@ Options::long_usage (FILE * stream) const
" hash function to consider ALL key positions, and $\n" " hash function to consider ALL key positions, and $\n"
" indicates the \"final character\" of a key, e.g.,\n" " indicates the \"final character\" of a key, e.g.,\n"
" $,1,2,4,6-10.\n", " $,1,2,4,6-10.\n",
Positions::MAX_KEY_POS - 1); Positions::MAX_KEY_POS);
fprintf (stream, fprintf (stream,
" -l, --compare-strlen Compare key lengths before trying a string\n" " -l, --compare-strlen Compare key lengths before trying a string\n"
" comparison. This helps cut down on the number of\n" " comparison. This helps cut down on the number of\n"
@@ -294,12 +294,18 @@ Options::print_options () const
printf (" */"); printf (" */");
} }
/* ------------------------------------------------------------------------- */
/* Parses a string denoting key positions. */ /* Parses a string denoting key positions. */
class PositionStringParser class PositionStringParser
{ {
public: public:
PositionStringParser (const char *str, int low_bound, int high_bound, int end_word_marker, int error_value, int end_marker); /* Initializes a key position string parser for string STR. */
PositionStringParser (const char *str,
int low_bound, int high_bound,
int end_word_marker, int error_value, int end_marker);
/* Returns the next key position from the given string. */
int nextPosition (); int nextPosition ();
private: private:
/* A pointer to the string provided by the user. */ /* A pointer to the string provided by the user. */
@@ -314,67 +320,96 @@ private:
int const _error_value; int const _error_value;
/* Value returned after last key is processed. */ /* Value returned after last key is processed. */
int const _end_marker; int const _end_marker;
int _size; /* Intermediate state for producing a range of positions. */
int _curr_value; bool _in_range; /* True while producing a range of positions. */
int _upper_bound; int _range_upper_bound; /* Upper bound (inclusive) of the range. */
int _range_curr_value; /* Last value returned. */
}; };
PositionStringParser::PositionStringParser (const char *str, int low_bound, int high_bound, int end_word_marker, int error_value, int end_marker) /* Initializes a key position strng parser for string STR. */
PositionStringParser::PositionStringParser (const char *str,
int low_bound, int high_bound,
int end_word_marker, int error_value, int end_marker)
: _str (str), : _str (str),
_low_bound (low_bound), _low_bound (low_bound),
_high_bound (high_bound), _high_bound (high_bound),
_end_word_marker (end_word_marker), _end_word_marker (end_word_marker),
_error_value (error_value), _error_value (error_value),
_end_marker (end_marker), _end_marker (end_marker),
_size (0), _in_range (false)
_curr_value (0),
_upper_bound (0)
{ {
} }
int PositionStringParser::nextPosition () /* Returns the next key position from the given string. */
int
PositionStringParser::nextPosition ()
{ {
if (_size) if (_in_range)
{ {
if (++_curr_value >= _upper_bound) /* We are inside a range. Return the next value from the range. */
_size = 0; if (++_range_curr_value >= _range_upper_bound)
return _curr_value; _in_range = false;
return _range_curr_value;
} }
else else
{ {
/* Continue parsing the given string. */
while (*_str) while (*_str)
switch (*_str) switch (*_str)
{ {
default: return _error_value; case ',':
case ',': _str++; break; /* Skip the comma. */
case '$': _str++; return _end_word_marker; _str++;
break;
case '$':
/* Valid key position. */
_str++;
return _end_word_marker;
case '0': case '1': case '2': case '3': case '4': case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': case '5': case '6': case '7': case '8': case '9':
for (_curr_value = 0; isdigit (static_cast<unsigned char>(*_str)); _str++) /* Valid key position. */
_curr_value = _curr_value * 10 + (*_str - '0'); {
int curr_value;
for (curr_value = 0; isdigit (static_cast<unsigned char>(*_str)); _str++)
curr_value = curr_value * 10 + (*_str - '0');
if (*_str == '-') if (*_str == '-')
{ {
_str++;
/* Starting a range of key positions. */
_in_range = true;
for (_size = 1, _upper_bound = 0; for (_range_upper_bound = 0;
isdigit (static_cast<unsigned char>(*++_str)); isdigit (static_cast<unsigned char>(*_str));
_upper_bound = _upper_bound * 10 + (*_str - '0')); _str++)
_range_upper_bound = _range_upper_bound * 10 + (*_str - '0');
if (_upper_bound <= _curr_value || _upper_bound > _high_bound) /* Verify range's upper bound. */
return _error_value; if (!(_range_upper_bound > curr_value && _range_upper_bound <= _high_bound))
} return _error_value;
return _curr_value >= _low_bound && _curr_value <= _high_bound _range_curr_value = curr_value;
? _curr_value : _error_value; }
/* Verify range's lower bound. */
if (!(curr_value >= _low_bound && curr_value <= _high_bound))
return _error_value;
return curr_value;
}
default:
/* Invalid syntax. */
return _error_value;
} }
return _end_marker; return _end_marker;
} }
} }
/* ------------------------------------------------------------------------- */
/* Sets the default Options. */ /* Sets the default Options. */
Options::Options () Options::Options ()
: _option_word (DEFAULTCHARS | C), : _option_word (C),
_iterations (0), _iterations (0),
_jump (DEFAULT_JUMP_VALUE), _jump (DEFAULT_JUMP_VALUE),
_initial_asso_value (0), _initial_asso_value (0),
@@ -402,7 +437,6 @@ Options::~Options ()
"\nORDER is.......: %s" "\nORDER is.......: %s"
"\nTYPE is........: %s" "\nTYPE is........: %s"
"\nRANDOM is......: %s" "\nRANDOM is......: %s"
"\nDEFAULTCHARS is: %s"
"\nSWITCH is......: %s" "\nSWITCH is......: %s"
"\nNOLENGTH is....: %s" "\nNOLENGTH is....: %s"
"\nLENTABLE is....: %s" "\nLENTABLE is....: %s"
@@ -434,7 +468,6 @@ Options::~Options ()
_option_word & ORDER ? "enabled" : "disabled", _option_word & ORDER ? "enabled" : "disabled",
_option_word & TYPE ? "enabled" : "disabled", _option_word & TYPE ? "enabled" : "disabled",
_option_word & RANDOM ? "enabled" : "disabled", _option_word & RANDOM ? "enabled" : "disabled",
_option_word & DEFAULTCHARS ? "enabled" : "disabled",
_option_word & SWITCH ? "enabled" : "disabled", _option_word & SWITCH ? "enabled" : "disabled",
_option_word & NOLENGTH ? "enabled" : "disabled", _option_word & NOLENGTH ? "enabled" : "disabled",
_option_word & LENTABLE ? "enabled" : "disabled", _option_word & LENTABLE ? "enabled" : "disabled",
@@ -479,43 +512,43 @@ Options::~Options ()
static const struct option long_options[] = static const struct option long_options[] =
{ {
{ "delimiters", required_argument, 0, 'e' }, { "delimiters", required_argument, NULL, 'e' },
{ "struct-type", no_argument, 0, 't' }, { "struct-type", no_argument, NULL, 't' },
{ "language", required_argument, 0, 'L' }, { "language", required_argument, NULL, 'L' },
{ "slot-name", required_argument, 0, 'K' }, { "slot-name", required_argument, NULL, 'K' },
{ "initializer-suffix", required_argument, 0, 'F' }, { "initializer-suffix", required_argument, NULL, 'F' },
{ "hash-fn-name", required_argument, 0, 'H' }, { "hash-fn-name", required_argument, NULL, 'H' },
{ "lookup-fn-name", required_argument, 0, 'N' }, { "lookup-fn-name", required_argument, NULL, 'N' },
{ "class-name", required_argument, 0, 'Z' }, { "class-name", required_argument, NULL, 'Z' },
{ "seven-bit", no_argument, 0, '7' }, { "seven-bit", no_argument, NULL, '7' },
{ "compare-strncmp", no_argument, 0, 'c' }, { "compare-strncmp", no_argument, NULL, 'c' },
{ "readonly-tables", no_argument, 0, 'C' }, { "readonly-tables", no_argument, NULL, 'C' },
{ "enum", no_argument, 0, 'E' }, { "enum", no_argument, NULL, 'E' },
{ "includes", no_argument, 0, 'I' }, { "includes", no_argument, NULL, 'I' },
{ "global", no_argument, 0, 'G' }, { "global", no_argument, NULL, 'G' },
{ "word-array-name", required_argument, 0, 'W' }, { "word-array-name", required_argument, NULL, 'W' },
{ "switch", required_argument, 0, 'S' }, { "switch", required_argument, NULL, 'S' },
{ "omit-struct-type", no_argument, 0, 'T' }, { "omit-struct-type", no_argument, NULL, 'T' },
{ "key-positions", required_argument, 0, 'k' }, { "key-positions", required_argument, NULL, 'k' },
{ "compare-strlen", no_argument, 0, 'l' }, { "compare-strlen", no_argument, NULL, 'l' },
{ "duplicates", no_argument, 0, 'D' }, { "duplicates", no_argument, NULL, 'D' },
{ "fast", required_argument, 0, 'f' }, { "fast", required_argument, NULL, 'f' },
{ "initial-asso", required_argument, 0, 'i' }, { "initial-asso", required_argument, NULL, 'i' },
{ "jump", required_argument, 0, 'j' }, { "jump", required_argument, NULL, 'j' },
{ "no-strlen", no_argument, 0, 'n' }, { "no-strlen", no_argument, NULL, 'n' },
{ "occurrence-sort", no_argument, 0, 'o' }, { "occurrence-sort", no_argument, NULL, 'o' },
{ "random", no_argument, 0, 'r' }, { "random", no_argument, NULL, 'r' },
{ "size-multiple", required_argument, 0, 's' }, { "size-multiple", required_argument, NULL, 's' },
{ "help", no_argument, 0, 'h' }, { "help", no_argument, NULL, 'h' },
{ "version", no_argument, 0, 'v' }, { "version", no_argument, NULL, 'v' },
{ "debug", no_argument, 0, 'd' }, { "debug", no_argument, NULL, 'd' },
{ 0, no_argument, 0, 0 } { NULL, no_argument, NULL, 0 }
}; };
void void
Options::parse_options (int argc, char *argv[]) Options::parse_options (int argc, char *argv[])
{ {
int option_char; int option_char;
program_name = argv[0]; program_name = argv[0];
_argument_count = argc; _argument_count = argc;
@@ -553,7 +586,7 @@ Options::parse_options (int argc, char *argv[])
_option_word |= DUP; _option_word |= DUP;
break; break;
} }
case 'e': /* Allows user to provide keyword/attribute separator */ case 'e': /* Specify keyword/attribute separator */
{ {
_delimiters = /*getopt*/optarg; _delimiters = /*getopt*/optarg;
break; break;
@@ -563,7 +596,7 @@ Options::parse_options (int argc, char *argv[])
_option_word |= ENUM; _option_word |= ENUM;
break; break;
} }
case 'f': /* Generate the hash table ``fast.'' */ case 'f': /* Generate the hash table "fast". */
{ {
_option_word |= FAST; _option_word |= FAST;
if ((_iterations = atoi (/*getopt*/optarg)) < 0) if ((_iterations = atoi (/*getopt*/optarg)) < 0)
@@ -578,7 +611,7 @@ Options::parse_options (int argc, char *argv[])
_initializer_suffix = /*getopt*/optarg; _initializer_suffix = /*getopt*/optarg;
break; break;
} }
case 'g': /* Use the ``inline'' keyword for generated sub-routines, ifdef __GNUC__. */ case 'g': /* Use the 'inline' keyword for generated sub-routines, ifdef __GNUC__. */
break; /* This is now the default. */ break; /* This is now the default. */
case 'G': /* Make the keyword table a global variable. */ case 'G': /* Make the keyword table a global variable. */
{ {
@@ -622,30 +655,39 @@ Options::parse_options (int argc, char *argv[])
} }
case 'k': /* Sets key positions used for hash function. */ case 'k': /* Sets key positions used for hash function. */
{ {
const int BAD_VALUE = -1; const int BAD_VALUE = -2;
const int EOS = PositionIterator::EOS; const int EOS = PositionIterator::EOS;
int value; int value;
PositionStringParser sparser (/*getopt*/optarg, 1, Positions::MAX_KEY_POS - 1, Positions::LASTCHAR, BAD_VALUE, EOS); PositionStringParser sparser (/*getopt*/optarg, 1, Positions::MAX_KEY_POS, Positions::LASTCHAR, BAD_VALUE, EOS);
if (/*getopt*/optarg [0] == '*') /* Use all the characters for hashing!!!! */ if (/*getopt*/optarg [0] == '*') /* Use all the characters for hashing!!!! */
_option_word = (_option_word & ~DEFAULTCHARS) | ALLCHARS; _option_word |= ALLCHARS;
else else
{ {
unsigned char *key_positions = _key_positions.pointer(); unsigned char *key_positions = _key_positions.pointer();
unsigned char *key_pos; unsigned char *key_pos;
for (key_pos = key_positions; (value = sparser.nextPosition()) != EOS; key_pos++) for (key_pos = key_positions; (value = sparser.nextPosition()) != EOS; key_pos++)
if (value == BAD_VALUE) {
{ if (value == BAD_VALUE)
fprintf (stderr, "Illegal key value or range, use 1,2,3-%d,'$' or '*'.\n", {
Positions::MAX_KEY_POS - 1); fprintf (stderr, "Illegal key value or range, use 1,2,3-%d,'$' or '*'.\n",
short_usage (stderr); Positions::MAX_KEY_POS);
exit (1); short_usage (stderr);
} exit (1);
else }
if (key_pos - key_positions == Positions::MAX_KEY_POS + 1)
{
/* More than Positions::MAX_KEY_POS + 1 key positions.
Since all key positions are in the range
1..Positions::MAX_KEY_POS or == Positions::LASTCHAR,
there must be duplicates. */
fprintf (stderr, "Duplicate keys selected\n");
short_usage (stderr);
exit (1);
}
*key_pos = value; *key_pos = value;
}
*key_pos = EOS;
unsigned int total_keysig_size = key_pos - key_positions; unsigned int total_keysig_size = key_pos - key_positions;
if (total_keysig_size == 0) if (total_keysig_size == 0)
@@ -665,11 +707,6 @@ Options::parse_options (int argc, char *argv[])
short_usage (stderr); short_usage (stderr);
exit (1); exit (1);
} }
if (!(_key_positions.get_size() == 2
&& _key_positions[0] == 1
&& _key_positions[1] == Positions::LASTCHAR))
_option_word &= ~DEFAULTCHARS;
} }
break; break;
} }
@@ -777,16 +814,16 @@ Options::parse_options (int argc, char *argv[])
} }
if (argv[/*getopt*/optind] && ! freopen (argv[/*getopt*/optind], "r", stdin)) if (/*getopt*/optind + 1 < argc)
{ {
fprintf (stderr, "Cannot open keyword file `%s'\n", argv[/*getopt*/optind]); fprintf (stderr, "Extra trailing arguments to %s.\n", program_name);
short_usage (stderr); short_usage (stderr);
exit (1); exit (1);
} }
if (++/*getopt*/optind < argc) if (argv[/*getopt*/optind] && ! freopen (argv[/*getopt*/optind], "r", stdin))
{ {
fprintf (stderr, "Extra trailing arguments to %s.\n", program_name); fprintf (stderr, "Cannot open keyword file `%s'\n", argv[/*getopt*/optind]);
short_usage (stderr); short_usage (stderr);
exit (1); exit (1);
} }

52
src/options.h
View File

@@ -50,57 +50,54 @@ enum Option_Type
/* Randomly initialize the associated values table. */ /* Randomly initialize the associated values table. */
RANDOM = 1 << 4, RANDOM = 1 << 4,
/* Make default char positions be 1,$ (end of keyword). */
DEFAULTCHARS = 1 << 5,
/* Generate switch output to save space. */ /* Generate switch output to save space. */
SWITCH = 1 << 6, SWITCH = 1 << 5,
/* Don't include keyword length in hash computations. */ /* Don't include keyword length in hash computations. */
NOLENGTH = 1 << 7, NOLENGTH = 1 << 6,
/* Generate a length table for string comparison. */ /* Generate a length table for string comparison. */
LENTABLE = 1 << 8, LENTABLE = 1 << 7,
/* Handle duplicate hash values for keywords. */ /* Handle duplicate hash values for keywords. */
DUP = 1 << 9, DUP = 1 << 8,
/* Generate the hash function "fast". */ /* Generate the hash function "fast". */
FAST = 1 << 10, FAST = 1 << 9,
/* Don't include user-defined type definition in output -- it's already /* Don't include user-defined type definition in output -- it's already
defined elsewhere. */ defined elsewhere. */
NOTYPE = 1 << 11, NOTYPE = 1 << 10,
/* Generate strncmp rather than strcmp. */ /* Generate strncmp rather than strcmp. */
COMP = 1 << 12, COMP = 1 << 11,
/* Make the keyword table a global variable. */ /* Make the keyword table a global variable. */
GLOBAL = 1 << 13, GLOBAL = 1 << 12,
/* Make the generated tables readonly (const). */ /* Make the generated tables readonly (const). */
CONST = 1 << 14, CONST = 1 << 13,
/* Generate K&R C code: no prototypes, no const. */ /* Generate K&R C code: no prototypes, no const. */
KRC = 1 << 15, KRC = 1 << 14,
/* Generate C code: no prototypes, but const (user can #define it away). */ /* Generate C code: no prototypes, but const (user can #define it away). */
C = 1 << 16, C = 1 << 15,
/* Generate ISO/ANSI C code: prototypes and const, but no class. */ /* Generate ISO/ANSI C code: prototypes and const, but no class. */
ANSIC = 1 << 17, ANSIC = 1 << 16,
/* Generate C++ code: prototypes, const, class, inline, enum. */ /* Generate C++ code: prototypes, const, class, inline, enum. */
CPLUSPLUS = 1 << 18, CPLUSPLUS = 1 << 17,
/* Use enum for constants. */ /* Use enum for constants. */
ENUM = 1 << 19, ENUM = 1 << 18,
/* Generate #include statements. */ /* Generate #include statements. */
INCLUDE = 1 << 20, INCLUDE = 1 << 21,
/* Assume 7-bit, not 8-bit, characters. */ /* Assume 7-bit, not 8-bit, characters. */
SEVENBIT = 1 << 21 SEVENBIT = 1 << 22
}; };
/* This class denotes a set of key positions. */ /* This class denotes a set of key positions. */
@@ -112,8 +109,9 @@ public:
/* Denotes the last char of a keyword, depending on the keyword's length. */ /* Denotes the last char of a keyword, depending on the keyword's length. */
static const int LASTCHAR = 0; static const int LASTCHAR = 0;
/* Maximum size of the set. */ /* Maximum key position specifiable by the user.
static const int MAX_KEY_POS = 127; Note that this must fit into the element type of _positions[], below. */
static const int MAX_KEY_POS = 255;
/* Constructors. */ /* Constructors. */
Positions (); Positions ();
@@ -133,11 +131,13 @@ public:
bool sort (); bool sort ();
private: private:
/* Number of positions, excluding the terminating PositionIterator::EOS. */ /* Number of positions. */
unsigned int _size; unsigned int _size;
/* Array of positions. 1 for the first char, 2 for the second char etc., /* Array of positions. 1 for the first char, 2 for the second char etc.,
LASTCHAR for the last char. PositionIterator::EOS past the end. */ LASTCHAR for the last char.
unsigned char _positions[MAX_KEY_POS]; Note that since duplicates are eliminated, the maximum possible size
is MAX_KEY_POS + 1. */
unsigned char _positions[MAX_KEY_POS + 1];
}; };
/* This class denotes an iterator through a set of key positions. */ /* This class denotes an iterator through a set of key positions. */
@@ -149,14 +149,14 @@ public:
PositionIterator (Positions const& positions); PositionIterator (Positions const& positions);
/* End of iteration marker. */ /* End of iteration marker. */
static const int EOS = Positions::MAX_KEY_POS; static const int EOS = -1;
/* Retrieves the next position, or EOS past the end. */ /* Retrieves the next position, or EOS past the end. */
int next (); int next ();
private: private:
const Positions& _set; const Positions& _set;
int _index; unsigned int _index;
}; };
/* Class manager for gperf program Options. */ /* Class manager for gperf program Options. */

19
src/options.icc
View File

@@ -21,11 +21,14 @@
If not, write to the Free Software Foundation, Inc., If not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* ---------------------------- Class Positions ---------------------------- */
/* Constructors. */
INLINE INLINE
Positions::Positions () Positions::Positions ()
: _size (0) : _size (0)
{ {
_positions[0] = PositionIterator::EOS;
} }
INLINE INLINE
@@ -33,7 +36,6 @@ Positions::Positions (int key1)
: _size (1) : _size (1)
{ {
_positions[0] = key1; _positions[0] = key1;
_positions[1] = PositionIterator::EOS;
} }
INLINE INLINE
@@ -42,9 +44,10 @@ Positions::Positions (int key1, int key2)
{ {
_positions[0] = key1; _positions[0] = key1;
_positions[1] = key2; _positions[1] = key2;
_positions[2] = PositionIterator::EOS;
} }
/* Accessors. */
INLINE int INLINE int
Positions::operator[] (unsigned int index) const Positions::operator[] (unsigned int index) const
{ {
@@ -57,6 +60,8 @@ Positions::get_size () const
return _size; return _size;
} }
/* Write access. */
INLINE unsigned char * INLINE unsigned char *
Positions::pointer () Positions::pointer ()
{ {
@@ -94,6 +99,9 @@ Positions::sort ()
return duplicate_free; return duplicate_free;
} }
/* ------------------------- Class PositionIterator ------------------------ */
/* Initializes an iterator through POSITIONS. */
INLINE INLINE
PositionIterator::PositionIterator (Positions const& positions) PositionIterator::PositionIterator (Positions const& positions)
: _set (positions), : _set (positions),
@@ -101,12 +109,15 @@ PositionIterator::PositionIterator (Positions const& positions)
{ {
} }
/* Retrieves the next position, or EOS past the end. */
INLINE int INLINE int
PositionIterator::next () PositionIterator::next ()
{ {
return _set._positions[_index++]; return (_index < _set._size ? _set._positions[_index++] : EOS);
} }
/* ----------------------------- Class Options ----------------------------- */
/* Tests a given boolean option. Returns true if set, false otherwise. */ /* Tests a given boolean option. Returns true if set, false otherwise. */
INLINE bool INLINE bool
Options::operator[] (Option_Type option) const Options::operator[] (Option_Type option) const

5
src/output.cc
View File

@@ -471,7 +471,10 @@ Output::output_hash_function ()
" };\n"); " };\n");
/* Optimize special case of ``-k 1,$'' */ /* Optimize special case of ``-k 1,$'' */
if (option[DEFAULTCHARS]) if (!option[ALLCHARS]
&& option.get_key_positions().get_size() == 2
&& option.get_key_positions()[0] == 1
&& option.get_key_positions()[1] == Positions::LASTCHAR)
printf (" return %sasso_values[%sstr[len - 1]] + asso_values[%sstr[0]];\n", printf (" return %sasso_values[%sstr[len - 1]] + asso_values[%sstr[0]];\n",
option[NOLENGTH] ? "" : "len + ", option[NOLENGTH] ? "" : "len + ",
char_to_index, char_to_index); char_to_index, char_to_index);

2
tests/test-6.exp
View File

@@ -69,7 +69,7 @@ Details in the output code:
Algorithm employed by gperf: Algorithm employed by gperf:
-k, --key-positions=KEYS -k, --key-positions=KEYS
Select the key positions used in the hash function. Select the key positions used in the hash function.
The allowable choices range between 1-126, inclusive. The allowable choices range between 1-255, inclusive.
The positions are separated by commas, ranges may be The positions are separated by commas, ranges may be
used, and key positions may occur in any order. used, and key positions may occur in any order.
Also, the meta-character '*' causes the generated Also, the meta-character '*' causes the generated