From dca752e3ba6eb642265f00d3e0b16b685352b2e2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 9 Jan 2007 14:10:21 +0000 Subject: [PATCH] New modules 'unistr/u8-strrchr', 'unistr/u16-strrchr', 'unistr/u32-strrchr'. --- lib/unistr/u16-strrchr.c | 68 ++++++++++++++++++++++++ lib/unistr/u32-strrchr.c | 40 ++++++++++++++ lib/unistr/u8-strrchr.c | 105 +++++++++++++++++++++++++++++++++++++ modules/unistr/u16-strrchr | 24 +++++++++ modules/unistr/u32-strrchr | 23 ++++++++ modules/unistr/u8-strrchr | 24 +++++++++ 6 files changed, 284 insertions(+) create mode 100644 lib/unistr/u16-strrchr.c create mode 100644 lib/unistr/u32-strrchr.c create mode 100644 lib/unistr/u8-strrchr.c create mode 100644 modules/unistr/u16-strrchr create mode 100644 modules/unistr/u32-strrchr create mode 100644 modules/unistr/u8-strrchr diff --git a/lib/unistr/u16-strrchr.c b/lib/unistr/u16-strrchr.c new file mode 100644 index 0000000000..bf3f4ce881 --- /dev/null +++ b/lib/unistr/u16-strrchr.c @@ -0,0 +1,68 @@ +/* Search character 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" + +#include "ucs4-utf16.h" + +uint16_t * +u16_strrchr (const uint16_t *s, ucs4_t uc) +{ + /* Calling u16_strlen and then searching from the other end would cause more + memory accesses. Avoid that, at the cost of a few more comparisons. */ + uint16_t *result = NULL; + uint16_t c[2]; + + if (uc < 0x10000) + { + uint16_t c0 = uc; + + for (;; s++) + { + if (*s == c0) + result = (uint16_t *) s; + if (*s == 0) + break; + } + } + else + switch (u16_uctomb_aux (c, uc, 2)) + { + case 2: + if (*s) + { + uint16_t c0 = c[0]; + uint16_t c1 = c[1]; + + /* FIXME: Maybe walking the string via u16_mblen is a win? */ + for (;; s++) + { + if (s[1] == 0) + break; + if (*s == c0 && s[1] == c1) + result = (uint16_t *) s; + } + } + break; + } + return result; +} diff --git a/lib/unistr/u32-strrchr.c b/lib/unistr/u32-strrchr.c new file mode 100644 index 0000000000..2f016489be --- /dev/null +++ b/lib/unistr/u32-strrchr.c @@ -0,0 +1,40 @@ +/* Search character 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" + +uint32_t * +u32_strrchr (const uint32_t *s, ucs4_t uc) +{ + /* Calling u32_strlen and then searching from the other end would cause more + memory accesses. Avoid that, at the cost of a few more comparisons. */ + uint32_t *result = NULL; + + for (;; s++) + { + if (*s == uc) + result = (uint32_t *) s; + if (*s == 0) + break; + } + return result; +} diff --git a/lib/unistr/u8-strrchr.c b/lib/unistr/u8-strrchr.c new file mode 100644 index 0000000000..95f7d9f0f3 --- /dev/null +++ b/lib/unistr/u8-strrchr.c @@ -0,0 +1,105 @@ +/* Search character 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" + +#include "ucs4-utf8.h" + +uint8_t * +u8_strrchr (const uint8_t *s, ucs4_t uc) +{ + /* Calling u8_strlen and then searching from the other end would cause more + memory accesses. Avoid that, at the cost of a few more comparisons. */ + uint8_t *result = NULL; + uint8_t c[6]; + + if (uc < 0x80) + { + uint8_t c0 = uc; + + for (;; s++) + { + if (*s == c0) + result = (uint8_t *) s; + if (*s == 0) + break; + } + } + else + switch (u8_uctomb_aux (c, uc, 6)) + { + case 2: + if (*s) + { + uint8_t c0 = c[0]; + uint8_t c1 = c[1]; + + /* FIXME: Maybe walking the string via u8_mblen is a win? */ + for (;; s++) + { + if (s[1] == 0) + break; + if (*s == c0 && s[1] == c1) + result = (uint8_t *) s; + } + } + break; + + case 3: + if (*s && s[1]) + { + uint8_t c0 = c[0]; + uint8_t c1 = c[1]; + uint8_t c2 = c[2]; + + /* FIXME: Maybe walking the string via u8_mblen is a win? */ + for (;; s++) + { + if (s[2] == 0) + break; + if (*s == c0 && s[1] == c1 && s[2] == c2) + result = (uint8_t *) s; + } + } + break; + + case 4: + if (*s && s[1] && s[2]) + { + uint8_t c0 = c[0]; + uint8_t c1 = c[1]; + uint8_t c2 = c[2]; + uint8_t c3 = c[3]; + + /* FIXME: Maybe walking the string via u8_mblen is a win? */ + for (;; s++) + { + if (s[3] == 0) + break; + if (*s == c0 && s[1] == c1 && s[2] == c2 && s[3] == c3) + result = (uint8_t *) s; + } + } + break; + } + return result; +} diff --git a/modules/unistr/u16-strrchr b/modules/unistr/u16-strrchr new file mode 100644 index 0000000000..83deea97d1 --- /dev/null +++ b/modules/unistr/u16-strrchr @@ -0,0 +1,24 @@ +Description: +Search character in UTF-16 string. + +Files: +lib/unistr/u16-strrchr.c + +Depends-on: +unistr/base +ucs4-utf16 + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u16-strrchr.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + diff --git a/modules/unistr/u32-strrchr b/modules/unistr/u32-strrchr new file mode 100644 index 0000000000..4935f03f94 --- /dev/null +++ b/modules/unistr/u32-strrchr @@ -0,0 +1,23 @@ +Description: +Search character in UTF-32 string. + +Files: +lib/unistr/u32-strrchr.c + +Depends-on: +unistr/base + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u32-strrchr.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + diff --git a/modules/unistr/u8-strrchr b/modules/unistr/u8-strrchr new file mode 100644 index 0000000000..85e0f67fa8 --- /dev/null +++ b/modules/unistr/u8-strrchr @@ -0,0 +1,24 @@ +Description: +Search character in UTF-8 string. + +Files: +lib/unistr/u8-strrchr.c + +Depends-on: +unistr/base +ucs4-utf8 + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u8-strrchr.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + -- 2.30.2