From 050fc3a8a5e95ee648a1e2658d8078b2e085f3cf Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 9 Jan 2007 14:10:25 +0000 Subject: [PATCH] New modules 'unistr/u8-strspn', 'unistr/u16-strspn', 'unistr/u32-strspn'. --- lib/unistr/u-strspn.h | 56 +++++++++++++++++++++++++++++++++++++++++++++++ lib/unistr/u16-strspn.c | 31 ++++++++++++++++++++++++++ lib/unistr/u32-strspn.c | 52 +++++++++++++++++++++++++++++++++++++++++++ lib/unistr/u8-strspn.c | 31 ++++++++++++++++++++++++++ modules/unistr/u16-strspn | 28 ++++++++++++++++++++++++ modules/unistr/u32-strspn | 24 ++++++++++++++++++++ modules/unistr/u8-strspn | 28 ++++++++++++++++++++++++ 7 files changed, 250 insertions(+) create mode 100644 lib/unistr/u-strspn.h create mode 100644 lib/unistr/u16-strspn.c create mode 100644 lib/unistr/u32-strspn.c create mode 100644 lib/unistr/u8-strspn.c create mode 100644 modules/unistr/u16-strspn create mode 100644 modules/unistr/u32-strspn create mode 100644 modules/unistr/u8-strspn diff --git a/lib/unistr/u-strspn.h b/lib/unistr/u-strspn.h new file mode 100644 index 000000000..1bfbc65e9 --- /dev/null +++ b/lib/unistr/u-strspn.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 *accept) +{ + /* Optimize two cases. */ + if (accept[0] == 0) + return 0; + { + ucs4_t uc; + int count = U_STRMBTOUC (&uc, accept); + if (count >= 0 && accept[count] == 0) + { + const UNIT *ptr = str; + for (; *ptr != 0; ptr += count) + if (U_CMP (ptr, accept, count) != 0) + break; + return ptr - 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 (accept, uc)) + return ptr - str; + ptr += count; + } + return U_STRLEN (str); + } +} diff --git a/lib/unistr/u16-strspn.c b/lib/unistr/u16-strspn.c new file mode 100644 index 000000000..b5b70f285 --- /dev/null +++ b/lib/unistr/u16-strspn.c @@ -0,0 +1,31 @@ +/* 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_strspn +#define UNIT uint16_t +#define U_STRLEN u16_strlen +#define U_STRMBTOUC u16_strmbtouc +#define U_CMP u16_cmp +#define U_STRCHR u16_strchr +#include "u-strspn.h" diff --git a/lib/unistr/u32-strspn.c b/lib/unistr/u32-strspn.c new file mode 100644 index 000000000..ab1e2cd36 --- /dev/null +++ b/lib/unistr/u32-strspn.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 , 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_strspn +#define UNIT uint32_t +#define U_STRCHR u32_strchr + +size_t +FUNC (const UNIT *str, const UNIT *accept) +{ + /* Optimize two cases. */ + if (accept[0] == 0) + return 0; + if (accept[1] == 0) + { + ucs4_t uc = accept[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 (accept, *ptr)) + break; + return ptr - str; + } +} diff --git a/lib/unistr/u8-strspn.c b/lib/unistr/u8-strspn.c new file mode 100644 index 000000000..77885dee1 --- /dev/null +++ b/lib/unistr/u8-strspn.c @@ -0,0 +1,31 @@ +/* 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_strspn +#define UNIT uint8_t +#define U_STRLEN u8_strlen +#define U_STRMBTOUC u8_strmbtouc +#define U_CMP u8_cmp +#define U_STRCHR u8_strchr +#include "u-strspn.h" diff --git a/modules/unistr/u16-strspn b/modules/unistr/u16-strspn new file mode 100644 index 000000000..8429d475a --- /dev/null +++ b/modules/unistr/u16-strspn @@ -0,0 +1,28 @@ +Description: +Search for some characters in UTF-16 string. + +Files: +lib/unistr/u16-strspn.c +lib/unistr/u-strspn.h + +Depends-on: +unistr/base +unistr/u16-strlen +unistr/u16-strmbtouc +unistr/u16-cmp +unistr/u16-strchr + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u16-strspn.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + diff --git a/modules/unistr/u32-strspn b/modules/unistr/u32-strspn new file mode 100644 index 000000000..bf0efed2b --- /dev/null +++ b/modules/unistr/u32-strspn @@ -0,0 +1,24 @@ +Description: +Search for some characters in UTF-32 string. + +Files: +lib/unistr/u32-strspn.c + +Depends-on: +unistr/base +unistr/u32-strchr + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u32-strspn.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + diff --git a/modules/unistr/u8-strspn b/modules/unistr/u8-strspn new file mode 100644 index 000000000..1912e6b69 --- /dev/null +++ b/modules/unistr/u8-strspn @@ -0,0 +1,28 @@ +Description: +Search for some characters in UTF-8 string. + +Files: +lib/unistr/u8-strspn.c +lib/unistr/u-strspn.h + +Depends-on: +unistr/base +unistr/u8-strlen +unistr/u8-strmbtouc +unistr/u8-cmp +unistr/u8-strchr + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u8-strspn.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + -- 2.11.0