From: Bruno Haible Date: Tue, 9 Jan 2007 14:09:47 +0000 (+0000) Subject: New modules 'unistr/u8-strcspn', 'unistr/u16-strcspn', 'unistr/u32-strcspn'. X-Git-Tag: cvs-readonly~1385 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=61789de541dfd8a793be0d73ce8d1ba8d595311e;p=gnulib.git New modules 'unistr/u8-strcspn', 'unistr/u16-strcspn', 'unistr/u32-strcspn'. --- diff --git a/lib/unistr/u-strcspn.h b/lib/unistr/u-strcspn.h new file mode 100644 index 000000000..a989a56ba --- /dev/null +++ b/lib/unistr/u-strcspn.h @@ -0,0 +1,56 @@ +/* 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 , 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. */ + +size_t +FUNC (const UNIT *str, const UNIT *reject) +{ + /* Optimize two cases. */ + if (reject[0] == 0) + return U_STRLEN (str); + { + ucs4_t uc; + int count = U_STRMBTOUC (&uc, reject); + if (count >= 0 && reject[count] == 0) + { + const UNIT *found = U_STRCHR (str, uc); + if (found != NULL) + return found - str; + else + return U_STRLEN (str); + } + } + /* General case. */ + { + const UNIT *ptr = str; + + for (;;) + { + ucs4_t uc; + int count = U_STRMBTOUC (&uc, ptr); + if (count == 0) + return ptr - str; + if (count < 0) + break; + if (U_STRCHR (reject, uc)) + return ptr - str; + ptr += count; + } + return U_STRLEN (str); + } +} diff --git a/lib/unistr/u16-strcspn.c b/lib/unistr/u16-strcspn.c new file mode 100644 index 000000000..170716941 --- /dev/null +++ b/lib/unistr/u16-strcspn.c @@ -0,0 +1,30 @@ +/* Search for some characters in UTF-16 string. + Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc. + Written by Bruno Haible , 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 + +/* Specification. */ +#include "unistr.h" + +#define FUNC u16_strcspn +#define UNIT uint16_t +#define U_STRLEN u16_strlen +#define U_STRMBTOUC u16_strmbtouc +#define U_STRCHR u16_strchr +#include "u-strcspn.h" diff --git a/lib/unistr/u32-strcspn.c b/lib/unistr/u32-strcspn.c new file mode 100644 index 000000000..c543d4f92 --- /dev/null +++ b/lib/unistr/u32-strcspn.c @@ -0,0 +1,53 @@ +/* Search for some characters in UTF-32 string. + Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc. + Written by Bruno Haible , 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 + +/* Specification. */ +#include "unistr.h" + +#define FUNC u32_strcspn +#define UNIT uint32_t +#define U_STRLEN u32_strlen +#define U_STRCHR u32_strchr + +size_t +FUNC (const UNIT *str, const UNIT *reject) +{ + /* Optimize two cases. */ + if (reject[0] == 0) + return U_STRLEN (str); + if (reject[1] == 0) + { + ucs4_t uc = reject[0]; + const UNIT *ptr = str; + for (; *ptr != 0; ptr++) + if (*ptr == uc) + break; + return ptr - str; + } + /* General case. */ + { + const UNIT *ptr = str; + for (; *ptr != 0; ptr++) + if (U_STRCHR (reject, *ptr)) + break; + return ptr - str; + } +} diff --git a/lib/unistr/u8-strcspn.c b/lib/unistr/u8-strcspn.c new file mode 100644 index 000000000..e5a575c98 --- /dev/null +++ b/lib/unistr/u8-strcspn.c @@ -0,0 +1,30 @@ +/* Search for some characters in UTF-8 string. + Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc. + Written by Bruno Haible , 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 + +/* Specification. */ +#include "unistr.h" + +#define FUNC u8_strcspn +#define UNIT uint8_t +#define U_STRLEN u8_strlen +#define U_STRMBTOUC u8_strmbtouc +#define U_STRCHR u8_strchr +#include "u-strcspn.h" diff --git a/modules/unistr/u16-strcspn b/modules/unistr/u16-strcspn new file mode 100644 index 000000000..ed318e308 --- /dev/null +++ b/modules/unistr/u16-strcspn @@ -0,0 +1,27 @@ +Description: +Search for some characters in UTF-16 string. + +Files: +lib/unistr/u16-strcspn.c +lib/unistr/u-strcspn.h + +Depends-on: +unistr/base +unistr/u16-strlen +unistr/u16-strmbtouc +unistr/u16-strchr + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u16-strcspn.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + diff --git a/modules/unistr/u32-strcspn b/modules/unistr/u32-strcspn new file mode 100644 index 000000000..e1a3ba264 --- /dev/null +++ b/modules/unistr/u32-strcspn @@ -0,0 +1,25 @@ +Description: +Search for some characters in UTF-32 string. + +Files: +lib/unistr/u32-strcspn.c + +Depends-on: +unistr/base +unistr/u32-strlen +unistr/u32-strchr + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u32-strcspn.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + diff --git a/modules/unistr/u8-strcspn b/modules/unistr/u8-strcspn new file mode 100644 index 000000000..95c487b6e --- /dev/null +++ b/modules/unistr/u8-strcspn @@ -0,0 +1,27 @@ +Description: +Search for some characters in UTF-8 string. + +Files: +lib/unistr/u8-strcspn.c +lib/unistr/u-strcspn.h + +Depends-on: +unistr/base +unistr/u8-strlen +unistr/u8-strmbtouc +unistr/u8-strchr + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u8-strcspn.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible +