BUG: Inconsistent --language=C++ use of register

[Trevor Boyd]

Hi gperf,

 

Not sure if this is inconsistent or just redundant or what, but thought I should bring it to your attention anyway.

 

Thanks,

Trev

 

Short story:

 

gperf --language=C++ generates inconsistent use of register.  Note no register in the declaration, but included in the definition:

 

class Perfect_Hash

{

private:

  static inline unsigned int hash (const char *str, unsigned int len);

public:

  static struct dicefn_name_address_index *in_word_set (const char *str, unsigned int len);

};

 

struct dicefn_name_address_index *

Perfect_Hash::in_word_set (register const char *str, register unsigned int len)

{

 

Not sure why register is even used any more.  MS C++ gives:

 

1>D:\Project\dicefn.gperf.txt(23,51): warning C5033: 'register' is no longer a supported storage class

 

Long story:

 

> gperf --version

GNU gperf 3.0.1

Copyright (C) 1989-1998, 2000-2003 Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Written by Douglas C. Schmidt and Bruno Haible.

 

> cat dicefn.gperf.txt

%{

#include <string.h>

%}

struct dicefn_name_address_index { char *name; int index; };

%%

abs,                                0

acos,                               1

asc,                                2

asin,                               3

atan,                               4

atan2,                              5

 

> gperf --struct-type --language=C++ dicefn.gperf.txt

/* C++ code produced by gperf version 3.0.1 */

/* Command-line: gperf --struct-type --language=C++ dicefn.gperf.txt  */

/* Computed positions: -k'2' */

 

#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \

      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \

      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \

      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \

      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \

      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \

      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \

      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \

      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \

      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \

      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \

      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \

      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \

      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \

      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \

      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \

      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \

      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \

      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \

      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \

      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \

      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \

      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))

/* The character set is not based on ISO-646.  */

#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."

#endif

 

#line 1 "dicefn.gperf.txt"

 

#include <string.h>

#line 4 "dicefn.gperf.txt"

struct dicefn_name_address_index { char *name; int index; };

 

#define TOTAL_KEYWORDS 6

#define MIN_WORD_LENGTH 3

#define MAX_WORD_LENGTH 5

#define MIN_HASH_VALUE 3

#define MAX_HASH_VALUE 9

/* maximum key range = 7, duplicates = 0 */

 

class Perfect_Hash

{

private:

  static inline unsigned int hash (const char *str, unsigned int len);

public:

  static struct dicefn_name_address_index *in_word_set (const char *str, unsigned int len);

};

 

inline unsigned int

Perfect_Hash::hash (register const char *str, register unsigned int len)

{

  static unsigned char asso_values[] =

    {

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10, 0, 2,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10, 5, 0,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10,10,10,10,10,

     10,10,10,10,10,10

    };

  return len + asso_values[(unsigned char)str[1]];

}

 

struct dicefn_name_address_index *

Perfect_Hash::in_word_set (register const char *str, register unsigned int len)

{

  static struct dicefn_name_address_index wordlist[] =

    {

      {""}, {""}, {""},

#line 6 "dicefn.gperf.txt"

      {"abs",                                0},

#line 10 "dicefn.gperf.txt"

      {"atan",                               4},

#line 11 "dicefn.gperf.txt"

      {"atan2",                              5},

#line 7 "dicefn.gperf.txt"

      {"acos",                               1},

      {""},

#line 8 "dicefn.gperf.txt"

      {"asc",                                2},

#line 9 "dicefn.gperf.txt"

      {"asin",                               3}

    };

 

  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)

    {

      register int key = hash (str, len);

 

      if (key <= MAX_HASH_VALUE && key >= 0)

        {

          register const char *s = wordlist[key].name;

 

          if (*str == *s && !strcmp (str + 1, s + 1))

            return &wordlist[key];

        }

    }

  return 0;

}