guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-4-137-gd0


From: Ludovic Courtès
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-4-137-gd02f313
Date: Mon, 16 Nov 2009 13:57:16 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=d02f3137146bafe944d8c6736f9044dbf54868f9

The branch, master has been updated
       via  d02f3137146bafe944d8c6736f9044dbf54868f9 (commit)
      from  1119e493687ad4a0a2b1375cdad423dba3dda9ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d02f3137146bafe944d8c6736f9044dbf54868f9
Author: Ludovic Courtès <address@hidden>
Date:   Mon Nov 16 14:57:01 2009 +0100

    Add `iconv_open-solaris.h' to remove dependency on gperf.
    
    * lib/iconv_open-solaris.h: New file.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                      |    1 -
 lib/{iconv_open-irix.h => iconv_open-solaris.h} |  193 +++++++++++------------
 2 files changed, 92 insertions(+), 102 deletions(-)
 copy lib/{iconv_open-irix.h => iconv_open-solaris.h} (50%)

diff --git a/.gitignore b/.gitignore
index fe40025..27680d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,7 +109,6 @@ INSTALL
 /lib/unistd.h
 /lib/unistr/.dirstamp
 /lib/arpa/inet.h
-/lib/iconv_open-solaris.h
 /lib/stdio.h
 /lib/sys/stat.h
 /GPATH
diff --git a/lib/iconv_open-irix.h b/lib/iconv_open-solaris.h
similarity index 50%
copy from lib/iconv_open-irix.h
copy to lib/iconv_open-solaris.h
index 520582e..630cde1 100644
--- a/lib/iconv_open-irix.h
+++ b/lib/iconv_open-solaris.h
@@ -1,6 +1,6 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
-/* Command-line: gperf -m 10 ./iconv_open-irix.gperf  */
-/* Computed positions: -k'1,$' */
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -m 10 ./iconv_open-solaris.gperf  */
+/* Computed positions: -k'10' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -29,15 +29,15 @@
 #error "gperf generated tables don't work with this execution character set. 
Please report a bug to <address@hidden>."
 #endif
 
-#line 1 "./iconv_open-irix.gperf"
+#line 1 "./iconv_open-solaris.gperf"
 struct mapping { int standard_name; const char vendor_name[10 + 1]; };
 
-#define TOTAL_KEYWORDS 19
+#define TOTAL_KEYWORDS 13
 #define MIN_WORD_LENGTH 5
 #define MAX_WORD_LENGTH 11
 #define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 23
-/* maximum key range = 19, duplicates = 0 */
+#define MAX_HASH_VALUE 19
+/* maximum key range = 15, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -51,128 +51,119 @@ mapping_hash (register const char *str, register unsigned 
int len)
 {
   static const unsigned char asso_values[] =
     {
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24,  8,  2,
-       5, 12, 11,  0, 10,  9,  8,  7, 24, 24,
-      24, 24, 24, 24, 24, 24, 24,  0, 24,  0,
-      24,  5, 24,  0, 24,  7, 24, 24, 24, 24,
-       7, 24,  1,  0,  8, 24, 24,  0, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-      24, 24, 24, 24, 24, 24
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20,  0,
+       9,  8,  7,  6,  5,  4,  3,  2, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20
     };
-  return len + asso_values[(unsigned char)str[len - 1]] + 
asso_values[(unsigned char)str[0]];
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[9]];
+      /*FALLTHROUGH*/
+      case 9:
+      case 8:
+      case 7:
+      case 6:
+      case 5:
+        break;
+    }
+  return hval;
 }
 
 struct stringpool_t
   {
-    char stringpool_str5[sizeof("CP855")];
-    char stringpool_str6[sizeof("EUC-TW")];
-    char stringpool_str7[sizeof("EUC-KR")];
-    char stringpool_str8[sizeof("CP1251")];
-    char stringpool_str9[sizeof("SHIFT_JIS")];
-    char stringpool_str10[sizeof("ISO-8859-5")];
+    char stringpool_str5[sizeof("ASCII")];
+    char stringpool_str6[sizeof("CP1251")];
+    char stringpool_str7[sizeof("$   abc")];
+    char stringpool_str10[sizeof("ISO-8859-1")];
     char stringpool_str11[sizeof("ISO-8859-15")];
-    char stringpool_str12[sizeof("ISO-8859-1")];
-    char stringpool_str13[sizeof("EUC-JP")];
-    char stringpool_str14[sizeof("KOI8-R")];
-    char stringpool_str15[sizeof("ISO-8859-2")];
-    char stringpool_str16[sizeof("GB2312")];
-    char stringpool_str17[sizeof("ISO-8859-9")];
-    char stringpool_str18[sizeof("ISO-8859-8")];
-    char stringpool_str19[sizeof("ISO-8859-7")];
-    char stringpool_str20[sizeof("ISO-8859-6")];
-    char stringpool_str21[sizeof("ISO-8859-4")];
-    char stringpool_str22[sizeof("ISO-8859-3")];
-    char stringpool_str23[sizeof("TIS-620")];
+    char stringpool_str12[sizeof("ISO-8859-9")];
+    char stringpool_str13[sizeof("ISO-8859-8")];
+    char stringpool_str14[sizeof("ISO-8859-7")];
+    char stringpool_str15[sizeof("ISO-8859-6")];
+    char stringpool_str16[sizeof("ISO-8859-5")];
+    char stringpool_str17[sizeof("ISO-8859-4")];
+    char stringpool_str18[sizeof("ISO-8859-3")];
+    char stringpool_str19[sizeof("ISO-8859-2")];
   };
 static const struct stringpool_t stringpool_contents =
   {
-    "CP855",
-    "EUC-TW",
-    "EUC-KR",
+    "ASCII",
     "CP1251",
-    "SHIFT_JIS",
-    "ISO-8859-5",
-    "ISO-8859-15",
+    "$   abc",
     "ISO-8859-1",
-    "EUC-JP",
-    "KOI8-R",
-    "ISO-8859-2",
-    "GB2312",
+    "ISO-8859-15",
     "ISO-8859-9",
     "ISO-8859-8",
     "ISO-8859-7",
     "ISO-8859-6",
+    "ISO-8859-5",
     "ISO-8859-4",
     "ISO-8859-3",
-    "TIS-620"
+    "ISO-8859-2"
   };
 #define stringpool ((const char *) &stringpool_contents)
 
 static const struct mapping mappings[] =
   {
     {-1}, {-1}, {-1}, {-1}, {-1},
-#line 24 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, "DOS855"},
-#line 29 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "eucTW"},
-#line 28 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, "eucKR"},
-#line 25 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str8, "WIN1251"},
-#line 30 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, "sjis"},
-#line 17 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-5"},
-#line 22 "./iconv_open-irix.gperf"
+#line 19 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, "646"},
+#line 30 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str6, "ansi-1251"},
+#line 18 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str7},
+    {-1}, {-1},
+#line 20 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, "ISO8859-1"},
+#line 29 "./iconv_open-solaris.gperf"
     {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, "ISO8859-15"},
-#line 13 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-1"},
-#line 27 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "eucJP"},
-#line 23 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "KOI8"},
-#line 14 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "ISO8859-2"},
-#line 26 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "eucCN"},
-#line 21 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "ISO8859-9"},
-#line 20 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "ISO8859-8"},
-#line 19 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-7"},
-#line 18 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, "ISO8859-6"},
-#line 16 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, "ISO8859-4"},
-#line 15 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, "ISO8859-3"},
-#line 31 "./iconv_open-irix.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, "TIS620"}
+#line 28 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, "ISO8859-9"},
+#line 27 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, "ISO8859-8"},
+#line 26 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, "ISO8859-7"},
+#line 25 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, "ISO8859-6"},
+#line 24 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, "ISO8859-5"},
+#line 23 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, "ISO8859-4"},
+#line 22 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, "ISO8859-3"},
+#line 21 "./iconv_open-solaris.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, "ISO8859-2"}
   };
 
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif


hooks/post-receive
-- 
GNU Guile




reply via email to

[Prev in Thread] Current Thread [Next in Thread]