New modules 'unistr/u8-prev', 'unistr/u16-prev', 'unistr/u32-prev'.
authorBruno Haible <bruno@clisp.org>
Tue, 9 Jan 2007 14:09:15 +0000 (14:09 +0000)
committerBruno Haible <bruno@clisp.org>
Tue, 9 Jan 2007 14:09:15 +0000 (14:09 +0000)
lib/unistr/u16-prev.c [new file with mode: 0644]
lib/unistr/u32-prev.c [new file with mode: 0644]
lib/unistr/u8-prev.c [new file with mode: 0644]
modules/unistr/u16-prev [new file with mode: 0644]
modules/unistr/u32-prev [new file with mode: 0644]
modules/unistr/u8-prev [new file with mode: 0644]

diff --git a/lib/unistr/u16-prev.c b/lib/unistr/u16-prev.c
new file mode 100644 (file)
index 0000000..9601ed7
--- /dev/null
@@ -0,0 +1,55 @@
+/* Iterate over previous character in UTF-16 string.
+   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unistr.h"
+
+const uint16_t *
+u16_prev (ucs4_t *puc, const uint16_t *s, const uint16_t *start)
+{
+  /* Keep in sync with utf16-ucs4.h and utf16-ucs4.c.  */
+  if (s != start)
+    {
+      uint16_t c_1 = s[-1];
+
+      if (c_1 < 0xd800 || c_1 >= 0xe000)
+       {
+         *puc = c_1;
+         return s - 1;
+       }
+#if CONFIG_UNICODE_SAFETY
+      if (c_1 >= 0xdc00)
+#endif
+       if (s - 1 != start)
+         {
+           uint16_t c_2 = s[-2];
+
+#if CONFIG_UNICODE_SAFETY
+           if (c_2 >= 0xd800 && c_2 < 0xdc00)
+#endif
+             {
+               *puc = 0x10000 + ((c_2 - 0xd800) << 10) + (c_1 - 0xdc00);
+               return s - 2;
+             }
+         }
+    }
+  return NULL;
+}
diff --git a/lib/unistr/u32-prev.c b/lib/unistr/u32-prev.c
new file mode 100644 (file)
index 0000000..d2bebe7
--- /dev/null
@@ -0,0 +1,41 @@
+/* Iterate over previous character in UTF-32 string.
+   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unistr.h"
+
+const uint32_t *
+u32_prev (ucs4_t *puc, const uint32_t *s, const uint32_t *start)
+{
+  if (s != start)
+    {
+      uint32_t c_1 = s[-1];
+
+#if CONFIG_UNICODE_SAFETY
+      if (c_1 < 0xd800 || (c_1 >= 0xe000 && c_1 < 0x110000))
+#endif
+       {
+         *puc = c_1;
+         return s - 1;
+       }
+    }
+  return NULL;
+}
diff --git a/lib/unistr/u8-prev.c b/lib/unistr/u8-prev.c
new file mode 100644 (file)
index 0000000..b3b56dd
--- /dev/null
@@ -0,0 +1,95 @@
+/* Iterate over previous character in UTF-8 string.
+   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unistr.h"
+
+const uint8_t *
+u8_prev (ucs4_t *puc, const uint8_t *s, const uint8_t *start)
+{
+  /* Keep in sync with utf8-ucs4.h and utf8-ucs4.c.  */
+  if (s != start)
+    {
+      uint8_t c_1 = s[-1];
+
+      if (c_1 < 0x80)
+       {
+         *puc = c_1;
+         return s - 1;
+       }
+#if CONFIG_UNICODE_SAFETY
+      if ((c_1 ^ 0x80) < 0x40)
+#endif
+       if (s - 1 != start)
+         {
+           uint8_t c_2 = s[-2];
+
+           if (c_2 >= 0xc2 && c_2 < 0xe0)
+             {
+               *puc = ((unsigned int) (c_2 & 0x1f) << 6)
+                      | (unsigned int) (c_1 ^ 0x80);
+               return s - 2;
+             }
+#if CONFIG_UNICODE_SAFETY
+           if ((c_2 ^ 0x80) < 0x40)
+#endif
+             if (s - 2 != start)
+               {
+                 uint8_t c_3 = s[-3];
+
+                 if (c_3 >= 0xe0 && c_3 < 0xf0
+#if CONFIG_UNICODE_SAFETY
+                     && (c_3 >= 0xe1 || c_2 >= 0xa0)
+                     && (c_3 != 0xed || c_2 < 0xa0)
+#endif
+                    )
+                   {
+                     *puc = ((unsigned int) (c_3 & 0x0f) << 12)
+                            | ((unsigned int) (c_2 ^ 0x80) << 6)
+                            | (unsigned int) (c_1 ^ 0x80);
+                     return s - 3;
+                   }
+#if CONFIG_UNICODE_SAFETY
+                 if ((c_3 ^ 0x80) < 0x40)
+#endif
+                   if (s - 3 != start)
+                     {
+                       uint8_t c_4 = s[-4];
+
+                       if (c_4 >= 0xf0 && c_4 < 0xf8
+#if CONFIG_UNICODE_SAFETY
+                           && (c_4 >= 0xf1 || c_3 >= 0x90)
+                           && (c_4 < 0xf4 || (c_4 == 0xf4 && c_3 < 0x90))
+#endif
+                          )
+                         {
+                           *puc = ((unsigned int) (c_4 & 0x07) << 18)
+                                  | ((unsigned int) (c_3 ^ 0x80) << 12)
+                                  | ((unsigned int) (c_2 ^ 0x80) << 6)
+                                  | (unsigned int) (c_1 ^ 0x80);
+                           return s - 4;
+                         }
+                     }
+               }
+         }
+    }
+  return NULL;
+}
diff --git a/modules/unistr/u16-prev b/modules/unistr/u16-prev
new file mode 100644 (file)
index 0000000..88c754e
--- /dev/null
@@ -0,0 +1,23 @@
+Description:
+Iterate over previous character in UTF-16 string.
+
+Files:
+lib/unistr/u16-prev.c
+
+Depends-on:
+unistr/base
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u16-prev.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/modules/unistr/u32-prev b/modules/unistr/u32-prev
new file mode 100644 (file)
index 0000000..837e4a2
--- /dev/null
@@ -0,0 +1,23 @@
+Description:
+Iterate over previous character in UTF-32 string.
+
+Files:
+lib/unistr/u32-prev.c
+
+Depends-on:
+unistr/base
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u32-prev.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/modules/unistr/u8-prev b/modules/unistr/u8-prev
new file mode 100644 (file)
index 0000000..372b416
--- /dev/null
@@ -0,0 +1,23 @@
+Description:
+Iterate over previous character in UTF-8 string.
+
+Files:
+lib/unistr/u8-prev.c
+
+Depends-on:
+unistr/base
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u8-prev.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+