New modules 'unistr/u8-strpbrk', 'unistr/u16-strpbrk', 'unistr/u32-strpbrk'.

diff --git a/lib/unistr/u-strpbrk.h b/lib/unistr/u-strpbrk.h
new file mode 100644 (file)
index 0000000..0ba151c
--- /dev/null
+++ b/lib/unistr/u-strpbrk.h
@@ -0,0 +1,48 @@
+/* Search for some characters in UTF-8/UTF-16/UTF-32 string.
+   Copyright (C) 1999, 2002, 2006 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.  */
+
+UNIT *
+FUNC (const UNIT *str, const UNIT *accept)
+{
+  /* Optimize two cases.  */
+  if (accept[0] == 0)
+    return NULL;
+  {
+    ucs4_t uc;
+    int count = U_STRMBTOUC (&uc, accept);
+    if (count >= 0 && accept[count] == 0)
+      return U_STRCHR (str, uc);
+  }
+  /* General case.  */
+  {
+    const UNIT *ptr = str;
+
+    for (;;)
+      {
+       ucs4_t uc;
+       int count = U_STRMBTOUC (&uc, ptr);
+       if (count <= 0)
+         break;
+       if (U_STRCHR (accept, uc))
+         return (UNIT *) ptr;
+       ptr += count;
+      }
+    return NULL;
+  }
+}

diff --git a/lib/unistr/u16-strpbrk.c b/lib/unistr/u16-strpbrk.c
new file mode 100644 (file)
index 0000000..4fe8b95
--- /dev/null
+++ b/lib/unistr/u16-strpbrk.c
@@ -0,0 +1,29 @@
+/* Search for some characters in UTF-16 string.
+   Copyright (C) 1999, 2002, 2006 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"
+
+#define FUNC u16_strpbrk
+#define UNIT uint16_t
+#define U_STRMBTOUC u16_strmbtouc
+#define U_STRCHR u16_strchr
+#include "u-strpbrk.h"

diff --git a/lib/unistr/u32-strpbrk.c b/lib/unistr/u32-strpbrk.c
new file mode 100644 (file)
index 0000000..fb3994f
--- /dev/null
+++ b/lib/unistr/u32-strpbrk.c
@@ -0,0 +1,52 @@
+/* Search for some characters in UTF-32 string.
+   Copyright (C) 1999, 2002, 2006 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"
+
+#define FUNC u32_strpbrk
+#define UNIT uint32_t
+#define U_STRCHR u32_strchr
+
+UNIT *
+FUNC (const UNIT *str, const UNIT *accept)
+{
+  /* Optimize two cases.  */
+  if (accept[0] == 0)
+    return NULL;
+  if (accept[1] == 0)
+    {
+      ucs4_t uc = accept[0];
+      const UNIT *ptr = str;
+      for (; *ptr != 0; ptr++)
+       if (*ptr == uc)
+         return (UNIT *) ptr;
+      return NULL;
+    }
+  /* General case.  */
+  {
+    const UNIT *ptr = str;
+    for (; *ptr != 0; ptr++)
+      if (U_STRCHR (accept, *ptr))
+       return (UNIT *) ptr;
+    return NULL;
+  }
+}

diff --git a/lib/unistr/u8-strpbrk.c b/lib/unistr/u8-strpbrk.c
new file mode 100644 (file)
index 0000000..e2728ca
--- /dev/null
+++ b/lib/unistr/u8-strpbrk.c
@@ -0,0 +1,29 @@
+/* Search for some characters in UTF-8 string.
+   Copyright (C) 1999, 2002, 2006 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"
+
+#define FUNC u8_strpbrk
+#define UNIT uint8_t
+#define U_STRMBTOUC u8_strmbtouc
+#define U_STRCHR u8_strchr
+#include "u-strpbrk.h"

diff --git a/modules/unistr/u16-strpbrk b/modules/unistr/u16-strpbrk
new file mode 100644 (file)
index 0000000..b66ef56
--- /dev/null
+++ b/modules/unistr/u16-strpbrk
@@ -0,0 +1,26 @@
+Description:
+Search for some characters in UTF-16 string.
+
+Files:
+lib/unistr/u16-strpbrk.c
+lib/unistr/u-strpbrk.h
+
+Depends-on:
+unistr/base
+unistr/u16-strmbtouc
+unistr/u16-strchr
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u16-strpbrk.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

diff --git a/modules/unistr/u32-strpbrk b/modules/unistr/u32-strpbrk
new file mode 100644 (file)
index 0000000..9aaa96d
--- /dev/null
+++ b/modules/unistr/u32-strpbrk
@@ -0,0 +1,24 @@
+Description:
+Search for some characters in UTF-32 string.
+
+Files:
+lib/unistr/u32-strpbrk.c
+
+Depends-on:
+unistr/base
+unistr/u32-strchr
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u32-strpbrk.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

diff --git a/modules/unistr/u8-strpbrk b/modules/unistr/u8-strpbrk
new file mode 100644 (file)
index 0000000..ffbdb82
--- /dev/null
+++ b/modules/unistr/u8-strpbrk
@@ -0,0 +1,26 @@
+Description:
+Search for some characters in UTF-8 string.
+
+Files:
+lib/unistr/u8-strpbrk.c
+lib/unistr/u-strpbrk.h
+
+Depends-on:
+unistr/base
+unistr/u8-strmbtouc
+unistr/u8-strchr
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u8-strpbrk.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+