New upstream version 0.9.10upstream/0.9.10

8 files changed, 449 insertions, 0 deletions

diff --git a/lib/unicase/u-prefix-context.h b/lib/unicase/u-prefix-context.h
new file mode 100644
index 00000000..b30ed6b1
--- /dev/null
+++ b/lib/unicase/u-prefix-context.h
@@ -0,0 +1,101 @@
+/* Case-mapping context of prefix UTF-8/UTF-16/UTF-32 string.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+   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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+casing_prefix_context_t
+FUNC1 (const UNIT *s, size_t n)
+{
+  return FUNC2 (s, n, unicase_empty_prefix_context);
+}
+
+casing_prefix_context_t
+FUNC2 (const UNIT *s, size_t n, casing_prefix_context_t a_context)
+{
+#if 0
+  /* Forward iteration.  Slow for long strings.  */
+  casing_prefix_context_t context = a_context;
+  const UNIT *s_end = s + n;
+
+  while (s < s_end)
+    {
+      ucs4_t uc;
+      int count = U_MBTOUC_UNSAFE (&uc, s, s_end - s);
+
+      if (!uc_is_case_ignorable (uc))
+        context.last_char_except_ignorable = uc;
+
+      {
+        int ccc = uc_combining_class (uc);
+        if (ccc == UC_CCC_A || ccc == UC_CCC_NR)
+          context.last_char_normal_or_above = uc;
+      }
+
+      s += count;
+    }
+
+  return context;
+#else
+  /* Iterate backwards, only as far as needed.  */
+  casing_prefix_context_t context;
+  ucs4_t last_char_except_ignorable = (ucs4_t)(-1);
+  ucs4_t last_char_normal_or_above = (ucs4_t)(-1);
+  const UNIT *p = s + n;
+
+  for (;;)
+    {
+      ucs4_t uc;
+      p = U_PREV (&uc, p, s);
+      if (p == NULL)
+        break;
+
+      if (last_char_except_ignorable == (ucs4_t)(-1))
+        {
+          if (!uc_is_case_ignorable (uc))
+            last_char_except_ignorable = uc;
+        }
+
+      if (last_char_normal_or_above == (ucs4_t)(-1))
+        {
+          int ccc = uc_combining_class (uc);
+          if (ccc == UC_CCC_A || ccc == UC_CCC_NR)
+            last_char_normal_or_above = uc;
+        }
+
+      if (last_char_except_ignorable != (ucs4_t)(-1)
+          && last_char_normal_or_above != (ucs4_t)(-1))
+        break;
+    }
+  context.last_char_except_ignorable =
+    (last_char_except_ignorable != (ucs4_t)(-1)
+     ? last_char_except_ignorable
+     : a_context.last_char_except_ignorable);
+  context.last_char_normal_or_above =
+    (last_char_normal_or_above != (ucs4_t)(-1)
+     ? last_char_normal_or_above
+     : a_context.last_char_normal_or_above);
+
+  return context;
+#endif
+}
diff --git a/lib/unicase/u-suffix-context.h b/lib/unicase/u-suffix-context.h
new file mode 100644
index 00000000..01ee18ef
--- /dev/null
+++ b/lib/unicase/u-suffix-context.h
@@ -0,0 +1,99 @@
+/* Case-mapping context of suffix UTF-8/UTF-16/UTF-32 string.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+   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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+casing_suffix_context_t
+FUNC1 (const UNIT *s, size_t n)
+{
+  return FUNC2 (s, n, unicase_empty_suffix_context);
+}
+
+casing_suffix_context_t
+FUNC2 (const UNIT *s, size_t n, casing_suffix_context_t a_context)
+{
+  casing_suffix_context_t context;
+  /* Evaluate all three conditions in a single pass through the string S.
+     The three variables are -1 as long as the value of the condition has
+     not been determined.  */
+  ucs4_t first_char_except_ignorable = (ucs4_t)(-1);
+  int scc_MORE_ABOVE = -1;
+  int scc_BEFORE_DOT = -1;
+  const UNIT *s_end = s + n;
+
+  while (s < s_end)
+    {
+      ucs4_t uc;
+      int count = U_MBTOUC_UNSAFE (&uc, s, s_end - s);
+
+      if (first_char_except_ignorable == (ucs4_t)(-1))
+        {
+          if (!uc_is_case_ignorable (uc))
+            first_char_except_ignorable = uc;
+        }
+
+      if (scc_MORE_ABOVE < 0)
+        {
+          int ccc = uc_combining_class (uc);
+          if (ccc == UC_CCC_A)
+            scc_MORE_ABOVE = SCC_MORE_ABOVE_MASK;
+          else if (ccc == UC_CCC_NR)
+            scc_MORE_ABOVE = 0;
+        }
+
+      if (scc_BEFORE_DOT < 0)
+        {
+          if (uc == 0x0307) /* COMBINING DOT ABOVE */
+            scc_BEFORE_DOT = SCC_BEFORE_DOT_MASK;
+          else
+            {
+              int ccc = uc_combining_class (uc);
+              if (ccc == UC_CCC_A || ccc == UC_CCC_NR)
+                scc_BEFORE_DOT = 0;
+            }
+        }
+
+      if (first_char_except_ignorable != (ucs4_t)(-1)
+          && (scc_MORE_ABOVE | scc_BEFORE_DOT) >= 0)
+        /* All conditions have been determined.  */
+        break;
+
+      s += count;
+    }
+
+  /* For those conditions that have not been determined so far, use the
+     value from the argument context.  */
+  context.first_char_except_ignorable =
+    (first_char_except_ignorable != (ucs4_t)(-1)
+     ? first_char_except_ignorable
+     : a_context.first_char_except_ignorable);
+  context.bits =
+    (scc_MORE_ABOVE >= 0
+     ? scc_MORE_ABOVE
+     : a_context.bits & SCC_MORE_ABOVE_MASK)
+    | (scc_BEFORE_DOT >= 0
+       ? scc_BEFORE_DOT
+       : a_context.bits & SCC_BEFORE_DOT_MASK);
+  return context;
+}
diff --git a/lib/unicase/u16-prefix-context.c b/lib/unicase/u16-prefix-context.c
new file mode 100644
index 00000000..8fe060d0
--- /dev/null
+++ b/lib/unicase/u16-prefix-context.c
@@ -0,0 +1,42 @@
+/* Case-mapping context of prefix UTF-16 string.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+   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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unicase.h"
+
+#include "unictype.h"
+#include "unistr.h"
+#include "caseprop.h"
+#include "context.h"
+
+#define FUNC1 u16_casing_prefix_context
+#define FUNC2 u16_casing_prefixes_context
+#define UNIT uint16_t
+#define U_MBTOUC_UNSAFE u16_mbtouc_unsafe
+#define U_PREV u16_prev
+#include "u-prefix-context.h"
diff --git a/lib/unicase/u16-suffix-context.c b/lib/unicase/u16-suffix-context.c
new file mode 100644
index 00000000..53c9a945
--- /dev/null
+++ b/lib/unicase/u16-suffix-context.c
@@ -0,0 +1,41 @@
+/* Case-mapping context of suffix UTF-16 string.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+   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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unicase.h"
+
+#include "unictype.h"
+#include "unistr.h"
+#include "caseprop.h"
+#include "context.h"
+
+#define FUNC1 u16_casing_suffix_context
+#define FUNC2 u16_casing_suffixes_context
+#define UNIT uint16_t
+#define U_MBTOUC_UNSAFE u16_mbtouc_unsafe
+#include "u-suffix-context.h"
diff --git a/lib/unicase/u32-prefix-context.c b/lib/unicase/u32-prefix-context.c
new file mode 100644
index 00000000..9f34a2ab
--- /dev/null
+++ b/lib/unicase/u32-prefix-context.c
@@ -0,0 +1,42 @@
+/* Case-mapping context of prefix UTF-32 string.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+   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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unicase.h"
+
+#include "unictype.h"
+#include "unistr.h"
+#include "caseprop.h"
+#include "context.h"
+
+#define FUNC1 u32_casing_prefix_context
+#define FUNC2 u32_casing_prefixes_context
+#define UNIT uint32_t
+#define U_MBTOUC_UNSAFE u32_mbtouc_unsafe
+#define U_PREV u32_prev
+#include "u-prefix-context.h"
diff --git a/lib/unicase/u32-suffix-context.c b/lib/unicase/u32-suffix-context.c
new file mode 100644
index 00000000..af6fc109
--- /dev/null
+++ b/lib/unicase/u32-suffix-context.c
@@ -0,0 +1,41 @@
+/* Case-mapping context of suffix UTF-32 string.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+   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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unicase.h"
+
+#include "unictype.h"
+#include "unistr.h"
+#include "caseprop.h"
+#include "context.h"
+
+#define FUNC1 u32_casing_suffix_context
+#define FUNC2 u32_casing_suffixes_context
+#define UNIT uint32_t
+#define U_MBTOUC_UNSAFE u32_mbtouc_unsafe
+#include "u-suffix-context.h"
diff --git a/lib/unicase/u8-prefix-context.c b/lib/unicase/u8-prefix-context.c
new file mode 100644
index 00000000..abe70eb3
--- /dev/null
+++ b/lib/unicase/u8-prefix-context.c
@@ -0,0 +1,42 @@
+/* Case-mapping context of prefix UTF-8 string.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+   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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unicase.h"
+
+#include "unictype.h"
+#include "unistr.h"
+#include "caseprop.h"
+#include "context.h"
+
+#define FUNC1 u8_casing_prefix_context
+#define FUNC2 u8_casing_prefixes_context
+#define UNIT uint8_t
+#define U_MBTOUC_UNSAFE u8_mbtouc_unsafe
+#define U_PREV u8_prev
+#include "u-prefix-context.h"
diff --git a/lib/unicase/u8-suffix-context.c b/lib/unicase/u8-suffix-context.c
new file mode 100644
index 00000000..5fec1651
--- /dev/null
+++ b/lib/unicase/u8-suffix-context.c
@@ -0,0 +1,41 @@
+/* Case-mapping context of suffix UTF-8 string.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
+   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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unicase.h"
+
+#include "unictype.h"
+#include "unistr.h"
+#include "caseprop.h"
+#include "context.h"
+
+#define FUNC1 u8_casing_suffix_context
+#define FUNC2 u8_casing_suffixes_context
+#define UNIT uint8_t
+#define U_MBTOUC_UNSAFE u8_mbtouc_unsafe
+#include "u-suffix-context.h"