Regenerated and updated.

15 files changed, 46 insertions, 88 deletions

diff --git a/tests/c-parse.exp b/tests/c-parse.exp
index 260589b..d370941 100644
--- a/tests/c-parse.exp
+++ b/tests/c-parse.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -L C -F ', 0, 0' -j1 -i 1 -g -o -t -G -N is_reserved_word -k'1,3,$'  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
diff --git a/tests/charsets.exp b/tests/charsets.exp
index 9256f89..ccbd078 100644
--- a/tests/charsets.exp
+++ b/tests/charsets.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -C -E -G -I -t  */
 /* Computed positions: -k'1-11,22,$' */
 
@@ -26,7 +26,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 
@@ -56,9 +56,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static const unsigned short asso_values[] =
     {
@@ -1810,9 +1808,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const struct charset *
-in_word_set (str, len)
-     register const char *str;
-     register unsigned int len;
+in_word_set (register const char *str, register unsigned int len)
 {
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
diff --git a/tests/chill.exp b/tests/chill.exp
index 5a87301..7007f4d 100644
--- a/tests/chill.exp
+++ b/tests/chill.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -L C -F ', 0, 0, 0' -D -E -S1 -j1 -i 1 -g -o -t -k'*'  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
diff --git a/tests/cplusplus.exp b/tests/cplusplus.exp
index 119f344..29bca4d 100644
--- a/tests/cplusplus.exp
+++ b/tests/cplusplus.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -L C -F ', 0, 0' -j1 -g -o -t -N is_reserved_word -k'1,4,7,$'  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
diff --git a/tests/gpc.exp b/tests/gpc.exp
index a2ea16f..b2a77b6 100644
--- a/tests/gpc.exp
+++ b/tests/gpc.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -g -o -j1 -t -N is_reserved_word  */
 /* Computed positions: -k'1,$' */
 
@@ -26,7 +26,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 
@@ -56,9 +56,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
     {
@@ -99,9 +97,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 struct resword *
-is_reserved_word (str, len)
-     register const char *str;
-     register unsigned int len;
+is_reserved_word (register const char *str, register unsigned int len)
 {
   static struct resword wordlist[] =
     {
diff --git a/tests/incomplete.exp b/tests/incomplete.exp
index 1f951af..ab4e24f 100644
--- a/tests/incomplete.exp
+++ b/tests/incomplete.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -t  */
 /* Computed positions: -k'1,3' */
 
@@ -26,7 +26,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 struct month;
@@ -46,9 +46,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
     {
@@ -89,9 +87,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 struct month *
-in_word_set (str, len)
-     register const char *str;
-     register unsigned int len;
+in_word_set (register const char *str, register unsigned int len)
 {
   static struct month wordlist[] =
     {
diff --git a/tests/java.exp b/tests/java.exp
index ffb1bbe..90ad5a3 100644
--- a/tests/java.exp
+++ b/tests/java.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -L C -F ', 0' -t -j1 -i 1 -g -o -N java_keyword -k'1,3,$'  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
diff --git a/tests/languages.exp b/tests/languages.exp
index 54cbb00..3abe0fc 100644
--- a/tests/languages.exp
+++ b/tests/languages.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -C -E -G -I -t  */
 /* Computed positions: -k'1-3,5,$' */
 
@@ -26,7 +26,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 
@@ -59,9 +59,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static const unsigned short asso_values[] =
     {
@@ -1467,9 +1465,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const struct language *
-in_word_set (str, len)
-     register const char *str;
-     register unsigned int len;
+in_word_set (register const char *str, register unsigned int len)
 {
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
diff --git a/tests/modula2.exp b/tests/modula2.exp
index b3b8a92..50f1c48 100644
--- a/tests/modula2.exp
+++ b/tests/modula2.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -n -k1-8 -l  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -25,7 +25,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 
@@ -44,9 +44,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
     {
@@ -116,9 +114,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const char *
-in_word_set (str, len)
-     register const char *str;
-     register unsigned int len;
+in_word_set (register const char *str, register unsigned int len)
 {
   static unsigned char lengthtable[] =
     {
diff --git a/tests/objc.exp b/tests/objc.exp
index d03e251..21be290 100644
--- a/tests/objc.exp
+++ b/tests/objc.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -j1 -i 1 -g -o -t -N is_reserved_word -k'1,3,$'  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -25,7 +25,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 
@@ -47,9 +47,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
     {
@@ -102,9 +100,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 struct resword *
-is_reserved_word (str, len)
-     register const char *str;
-     register unsigned int len;
+is_reserved_word (register const char *str, register unsigned int len)
 {
   static struct resword wordlist[] =
     {
diff --git a/tests/permut2.exp b/tests/permut2.exp
index 3f818c7..7db6857 100644
--- a/tests/permut2.exp
+++ b/tests/permut2.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -m5  */
 /* Computed positions: -k'1-2' */
 
@@ -26,7 +26,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 
@@ -46,9 +46,7 @@ inline
 #endif
 /*ARGSUSED*/
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
     {
@@ -89,9 +87,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const char *
-in_word_set (str, len)
-     register const char *str;
-     register unsigned int len;
+in_word_set (register const char *str, register unsigned int len)
 {
   static const char * wordlist[] =
     {
diff --git a/tests/permut3.exp b/tests/permut3.exp
index f0f0c73..967c084 100644
--- a/tests/permut3.exp
+++ b/tests/permut3.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -m5  */
 /* Computed positions: -k'1-2' */
 
@@ -26,7 +26,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 
@@ -46,9 +46,7 @@ inline
 #endif
 /*ARGSUSED*/
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
     {
@@ -89,9 +87,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const char *
-in_word_set (str, len)
-     register const char *str;
-     register unsigned int len;
+in_word_set (register const char *str, register unsigned int len)
 {
   static const char * wordlist[] =
     {
diff --git a/tests/permutc2.exp b/tests/permutc2.exp
index 8f1dc53..4a29918 100644
--- a/tests/permutc2.exp
+++ b/tests/permutc2.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -m5 --ignore-case  */
 /* Computed positions: -k'1-2' */
 
@@ -26,7 +26,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 
@@ -69,9 +69,7 @@ static unsigned char gperf_downcase[256] =
 #ifndef GPERF_CASE_STRCMP
 #define GPERF_CASE_STRCMP 1
 static int
-gperf_case_strcmp (s1, s2)
-     register const char *s1;
-     register const char *s2;
+gperf_case_strcmp (register const char *s1, register const char *s2)
 {
   for (;;)
     {
@@ -93,9 +91,7 @@ inline
 #endif
 /*ARGSUSED*/
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
     {
@@ -136,9 +132,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 const char *
-in_word_set (str, len)
-     register const char *str;
-     register unsigned int len;
+in_word_set (register const char *str, register unsigned int len)
 {
   static const char * wordlist[] =
     {
diff --git a/tests/test-4.exp b/tests/test-4.exp
index cd39077..2b97abc 100644
--- a/tests/test-4.exp
+++ b/tests/test-4.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: ../src/gperf -D -t -k'1,$'  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -25,7 +25,7 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
 
@@ -47,9 +47,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register unsigned int len)
 {
   static unsigned char asso_values[] =
     {
@@ -90,9 +88,7 @@ __attribute__ ((__gnu_inline__))
 #endif
 #endif
 struct resword *
-in_word_set (str, len)
-     register const char *str;
-     register unsigned int len;
+in_word_set (register const char *str, register unsigned int len)
 {
   static struct resword wordlist[] =
     {
diff --git a/tests/test-6.exp b/tests/test-6.exp
index 8a08b8f..080c628 100644
--- a/tests/test-6.exp
+++ b/tests/test-6.exp
@@ -28,7 +28,7 @@ Language for the output code:
   -L, --language=LANGUAGE-NAME
                          Generates code in the specified language. Languages
                          handled are currently C++, ANSI-C, C, and KR-C. The
-                         default is C.
+                         default is ANSI-C.
 
 Details in the output code:
   -K, --slot-name=NAME   Select name of the keyword component in the keyword