You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/13 19:12:40 UTC
[42/57] [abbrv] couchdb commit: updated
refs/heads/1994-merge-rcouch-multi-repo to b19d055
remove couch_collate
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/81332b78
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/81332b78
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/81332b78
Branch: refs/heads/1994-merge-rcouch-multi-repo
Commit: 81332b78ab2152af555c7d7d78ec8e878c07fc3a
Parents: d95b902
Author: Benoit Chesneau <bc...@gmail.com>
Authored: Thu Feb 13 16:33:36 2014 +0100
Committer: Benoit Chesneau <bc...@gmail.com>
Committed: Thu Feb 13 16:33:36 2014 +0100
----------------------------------------------------------------------
apps/couch_collate/build_icu.sh | 191 -
apps/couch_collate/c_src/couch_collate.c | 281 --
.../patches/icu/common-uloc_c.patch | 26 -
.../icu/layout_LookupProcessor_cpp.patch | 13 -
.../icu/source_config_Makefile_inc_in.patch | 12 -
.../patches/icu/source_icudefs_mk_in.patch | 19 -
.../platform/osx/icu/unicode/basictz.h | 210 -
.../platform/osx/icu/unicode/brkiter.h | 557 ---
.../platform/osx/icu/unicode/calendar.h | 2170 ---------
.../platform/osx/icu/unicode/caniter.h | 201 -
.../platform/osx/icu/unicode/chariter.h | 716 ---
.../platform/osx/icu/unicode/choicfmt.h | 746 ---
.../platform/osx/icu/unicode/coleitr.h | 400 --
.../platform/osx/icu/unicode/coll.h | 1035 -----
.../platform/osx/icu/unicode/curramt.h | 130 -
.../platform/osx/icu/unicode/currunit.h | 117 -
.../platform/osx/icu/unicode/datefmt.h | 700 ---
.../platform/osx/icu/unicode/dbbi.h | 41 -
.../platform/osx/icu/unicode/dcfmtsym.h | 370 --
.../platform/osx/icu/unicode/decimfmt.h | 1901 --------
.../platform/osx/icu/unicode/docmain.h | 202 -
.../platform/osx/icu/unicode/dtfmtsym.h | 721 ---
.../platform/osx/icu/unicode/dtintrv.h | 159 -
.../platform/osx/icu/unicode/dtitvfmt.h | 949 ----
.../platform/osx/icu/unicode/dtitvinf.h | 528 ---
.../platform/osx/icu/unicode/dtptngen.h | 423 --
.../platform/osx/icu/unicode/dtrule.h | 250 --
.../platform/osx/icu/unicode/fieldpos.h | 291 --
.../platform/osx/icu/unicode/fmtable.h | 591 ---
.../platform/osx/icu/unicode/format.h | 296 --
.../platform/osx/icu/unicode/gregocal.h | 823 ----
.../platform/osx/icu/unicode/locid.h | 765 ----
.../platform/osx/icu/unicode/measfmt.h | 77 -
.../platform/osx/icu/unicode/measunit.h | 71 -
.../platform/osx/icu/unicode/measure.h | 137 -
.../platform/osx/icu/unicode/msgfmt.h | 940 ----
.../platform/osx/icu/unicode/normlzr.h | 823 ----
.../platform/osx/icu/unicode/numfmt.h | 886 ----
.../platform/osx/icu/unicode/parseerr.h | 92 -
.../platform/osx/icu/unicode/parsepos.h | 230 -
.../platform/osx/icu/unicode/platform.h | 316 --
.../platform/osx/icu/unicode/plurfmt.h | 541 ---
.../platform/osx/icu/unicode/plurrule.h | 291 --
.../platform/osx/icu/unicode/ppalmos.h | 273 --
.../platform/osx/icu/unicode/putil.h | 184 -
.../platform/osx/icu/unicode/pwin32.h | 311 --
.../platform/osx/icu/unicode/rbbi.h | 722 ---
.../platform/osx/icu/unicode/rbnf.h | 1049 -----
.../platform/osx/icu/unicode/rbtz.h | 361 --
.../platform/osx/icu/unicode/regex.h | 1232 -----
.../platform/osx/icu/unicode/rep.h | 259 --
.../platform/osx/icu/unicode/resbund.h | 485 --
.../platform/osx/icu/unicode/schriter.h | 187 -
.../platform/osx/icu/unicode/search.h | 569 ---
.../platform/osx/icu/unicode/simpletz.h | 927 ----
.../platform/osx/icu/unicode/smpdtfmt.h | 975 ----
.../platform/osx/icu/unicode/sortkey.h | 324 --
.../platform/osx/icu/unicode/strenum.h | 271 --
.../platform/osx/icu/unicode/stsearch.h | 518 ---
.../platform/osx/icu/unicode/symtable.h | 112 -
.../platform/osx/icu/unicode/tblcoll.h | 926 ----
.../platform/osx/icu/unicode/timezone.h | 803 ----
.../platform/osx/icu/unicode/translit.h | 1323 ------
.../platform/osx/icu/unicode/tzrule.h | 828 ----
.../platform/osx/icu/unicode/tztrans.h | 195 -
.../platform/osx/icu/unicode/ubidi.h | 2013 ---------
.../platform/osx/icu/unicode/ubrk.h | 482 --
.../platform/osx/icu/unicode/ucal.h | 1161 -----
.../platform/osx/icu/unicode/ucasemap.h | 391 --
.../platform/osx/icu/unicode/ucat.h | 158 -
.../platform/osx/icu/unicode/uchar.h | 3062 -------------
.../platform/osx/icu/unicode/uchriter.h | 381 --
.../platform/osx/icu/unicode/uclean.h | 267 --
.../platform/osx/icu/unicode/ucnv.h | 1967 --------
.../platform/osx/icu/unicode/ucnv_cb.h | 162 -
.../platform/osx/icu/unicode/ucnv_err.h | 463 --
.../platform/osx/icu/unicode/ucol.h | 1132 -----
.../platform/osx/icu/unicode/ucoleitr.h | 315 --
.../platform/osx/icu/unicode/uconfig.h | 228 -
.../platform/osx/icu/unicode/ucsdet.h | 349 --
.../platform/osx/icu/unicode/ucurr.h | 270 --
.../platform/osx/icu/unicode/udat.h | 962 ----
.../platform/osx/icu/unicode/udata.h | 389 --
.../platform/osx/icu/unicode/udatpg.h | 471 --
.../platform/osx/icu/unicode/udeprctd.h | 50 -
.../platform/osx/icu/unicode/udraft.h | 166 -
.../platform/osx/icu/unicode/uenum.h | 134 -
.../platform/osx/icu/unicode/uidna.h | 312 --
.../platform/osx/icu/unicode/uintrnal.h | 180 -
.../platform/osx/icu/unicode/uiter.h | 707 ---
.../platform/osx/icu/unicode/uloc.h | 1046 -----
.../platform/osx/icu/unicode/ulocdata.h | 192 -
.../platform/osx/icu/unicode/umachine.h | 338 --
.../platform/osx/icu/unicode/umisc.h | 60 -
.../platform/osx/icu/unicode/umsg.h | 647 ---
.../platform/osx/icu/unicode/unifilt.h | 127 -
.../platform/osx/icu/unicode/unifunct.h | 125 -
.../platform/osx/icu/unicode/unimatch.h | 163 -
.../platform/osx/icu/unicode/unirepl.h | 97 -
.../platform/osx/icu/unicode/uniset.h | 1566 -------
.../platform/osx/icu/unicode/unistr.h | 4230 ------------------
.../platform/osx/icu/unicode/unorm.h | 576 ---
.../platform/osx/icu/unicode/unum.h | 869 ----
.../platform/osx/icu/unicode/uobject.h | 308 --
.../platform/osx/icu/unicode/uobslete.h | 32 -
.../platform/osx/icu/unicode/urbtok.h | 126 -
.../platform/osx/icu/unicode/uregex.h | 989 ----
.../platform/osx/icu/unicode/urename.h | 1775 --------
.../platform/osx/icu/unicode/urep.h | 155 -
.../platform/osx/icu/unicode/ures.h | 871 ----
.../platform/osx/icu/unicode/uscript.h | 254 --
.../platform/osx/icu/unicode/usearch.h | 766 ----
.../platform/osx/icu/unicode/uset.h | 1052 -----
.../platform/osx/icu/unicode/usetiter.h | 318 --
.../platform/osx/icu/unicode/ushape.h | 263 --
.../platform/osx/icu/unicode/usprep.h | 156 -
.../platform/osx/icu/unicode/ustring.h | 1479 ------
.../platform/osx/icu/unicode/usystem.h | 46 -
.../platform/osx/icu/unicode/utext.h | 1562 -------
.../platform/osx/icu/unicode/utf.h | 227 -
.../platform/osx/icu/unicode/utf16.h | 605 ---
.../platform/osx/icu/unicode/utf32.h | 23 -
.../platform/osx/icu/unicode/utf8.h | 652 ---
.../platform/osx/icu/unicode/utf_old.h | 1171 -----
.../platform/osx/icu/unicode/utmscale.h | 481 --
.../platform/osx/icu/unicode/utrace.h | 358 --
.../platform/osx/icu/unicode/utrans.h | 583 ---
.../platform/osx/icu/unicode/utypes.h | 801 ----
.../platform/osx/icu/unicode/uversion.h | 275 --
.../platform/osx/icu/unicode/vtzone.h | 443 --
apps/couch_collate/rebar.config | 9 -
apps/couch_collate/rebar.config.script | 90 -
apps/couch_collate/src/couch_collate.app.src | 13 -
apps/couch_collate/src/couch_collate.erl | 62 -
134 files changed, 75225 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/81332b78/apps/couch_collate/build_icu.sh
----------------------------------------------------------------------
diff --git a/apps/couch_collate/build_icu.sh b/apps/couch_collate/build_icu.sh
deleted file mode 100755
index 167e73d..0000000
--- a/apps/couch_collate/build_icu.sh
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/bin/sh
-
-CORE_TOP=`pwd`
-export CORE_TOP
-
-CURLBIN=`which curl`
-if ! test -n "CURLBIN"; then
- display_error "Error: curl is required. Add it to 'PATH'"
- exit 1
-fi
-
-GUNZIP=`which gunzip`
-UNZIP=`which unzip`
-TAR=`which tar`
-GNUMAKE=`which gmake 2>/dev/null || which make`
-PATCHES=$CORE_TOP/patches
-STATICLIBS=$CORE_TOP/.libs
-DISTDIR=$CORE_TOP/.dists
-
-# icu sources
-ICU_VER=4.4.2
-ICU_DISTNAME=icu4c-4_4_2-src.tgz
-ICU_SITE=http://dl.refuge.io
-ICUDIR=$STATICLIBS/icu
-
-
-[ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
-[ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
-[ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown"
-[ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
-
-
-CFLAGS="-g -O2 -Wall"
-LDFLAGS="-lstdc++"
-ARCH=
-ISA64=
-GNUMAKE=make
-CC=gcc
-CXX=g++
-PATCH=patch
-case "$SYSTEM" in
- Linux)
- ARCH=`arch 2>/dev/null`
- ;;
- FreeBSD|OpenBSD|NetBSD)
- ARCH=`(uname -p) 2>/dev/null`
- GNUMAKE=gmake
- ;;
- Darwin)
- ARCH=`(uname -p) 2>/dev/null`
- ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
- ;;
- Solaris)
- ARCH=`(uname -p) 2>/dev/null`
- GNUMAKE=gmake
- PATCH=gpatch
- ;;
- *)
- ARCH="unknown"
- ;;
-esac
-
-
-# TODO: add mirror & signature validation support
-fetch()
-{
- TARGET=$DISTDIR/$1
- if ! test -f $TARGET; then
- echo "==> Fetch $1 to $TARGET"
- $CURLBIN --progress-bar -L $2/$1 -o $TARGET
- fi
-}
-
-build_icu()
-{
- fetch $ICU_DISTNAME $ICU_SITE
-
- mkdir -p $ICUDIR
-
- echo "==> icu (compile)"
-
- rm -rf $STATICLIBS/icu*
-
- cd $STATICLIBS
- $GUNZIP -c $DISTDIR/$ICU_DISTNAME | $TAR xf -
-
- # apply patches
- cd $STATICLIBS/icu
- for P in $PATCHES/icu/*.patch; do \
- (patch -p0 -i $P || echo "skipping patch"); \
- done
-
- cd $ICUDIR/source
-
- CFLAGS="-g -Wall -fPIC -Os"
-
- env CC="gcc" CXX="g++" CPPFLAGS="" LDFLAGS="-fPIC" \
- CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" \
- ./configure --disable-debug \
- --enable-static \
- --disable-shared \
- --disable-icuio \
- --disable-layout \
- --disable-extras \
- --disable-tests \
- --disable-samples \
- --prefix=$STATICLIBS/icu && \
- $GNUMAKE && $GNUMAKE install
-}
-
-do_setup()
-{
- echo "==> build icu"
- mkdir -p $DISTDIR
- mkdir -p $STATICLIBS
-}
-
-do_builddeps()
-{
- if [ ! -f $STATICLIBS/icu/lib/libicui18n.a ]; then
- build_icu
- fi
-}
-
-
-clean()
-{
- rm -rf $STATICLIBS
- rm -rf $DISTDIR
-}
-
-
-
-usage()
-{
- cat << EOF
-Usage: $basename [command] [OPTIONS]
-
-The $basename command compile Mozilla Spidermonkey and ICU statically
-for couch_core.
-
-Commands:
-
- all: build couch_core static libs
- clean: clean static libs
- -?: display usage
-
-Report bugs at <https://github.com/refuge/couch_core>.
-EOF
-}
-
-
-if [ ! "x$COUCHDB_STATIC" = "x1" ]; then
- exit 0
-fi
-
-if [ ! "x$USE_STATIC_ICU" = "x1" ]; then
- exit 0
-fi
-
-if [ "x$1" = "x" ]; then
- do_setup
- do_builddeps
- exit 0
-fi
-
-case "$1" in
- all)
- shift 1
- do_setup
- do_builddeps
- ;;
- clean)
- shift 1
- clean
- ;;
- help|--help|-h|-?)
- usage
- exit 0
- ;;
- *)
- echo $basename: ERROR Unknown command $arg 1>&2
- echo 1>&2
- usage 1>&2
- echo "### $basename: Exitting." 1>&2
- exit 1;
- ;;
-esac
-
-
-exit 0
http://git-wip-us.apache.org/repos/asf/couchdb/blob/81332b78/apps/couch_collate/c_src/couch_collate.c
----------------------------------------------------------------------
diff --git a/apps/couch_collate/c_src/couch_collate.c b/apps/couch_collate/c_src/couch_collate.c
deleted file mode 100644
index c5453d2..0000000
--- a/apps/couch_collate/c_src/couch_collate.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
-
-*/
-
-#ifdef DARWIN
-#define U_HIDE_DRAFT_API 1
-#define U_DISABLE_RENAMING 1
-#endif
-
-#include "erl_nif.h"
-#include "unicode/ucol.h"
-#include "unicode/ucasemap.h"
-#include <stdio.h>
-#include <assert.h>
-
-static ERL_NIF_TERM ATOM_TRUE;
-static ERL_NIF_TERM ATOM_FALSE;
-static ERL_NIF_TERM ATOM_NULL;
-
-typedef struct {
- ErlNifEnv* env;
- int error;
- UCollator* coll;
-} ctx_t;
-
-typedef struct {
- UCollator** collators;
- int collStackTop;
- int numCollators;
- ErlNifMutex* collMutex;
-} priv_data_t;
-
-static ERL_NIF_TERM collate_nif(ErlNifEnv*, int, const ERL_NIF_TERM []);
-static int collate_binary(priv_data_t*, ctx_t*, ERL_NIF_TERM, ERL_NIF_TERM, ERL_NIF_TERM);
-static int on_load(ErlNifEnv*, void**, ERL_NIF_TERM);
-static void on_unload(ErlNifEnv*, void*);
-static __inline void reserve_coll(priv_data_t*, ctx_t*);
-static __inline void release_coll(priv_data_t*, ctx_t*);
-int on_reload(ErlNifEnv*, void**, ERL_NIF_TERM);
-int on_upgrade(ErlNifEnv*, void**, void**, ERL_NIF_TERM);
-
-void
-reserve_coll(priv_data_t* pData, ctx_t *ctx)
-{
- if (ctx->coll == NULL) {
- enif_mutex_lock(pData->collMutex);
- assert(pData->collStackTop < pData->numCollators);
- ctx->coll = pData->collators[pData->collStackTop];
- pData->collStackTop += 1;
- enif_mutex_unlock(pData->collMutex);
- }
-}
-
-
-void
-release_coll(priv_data_t* pData, ctx_t *ctx)
-{
- if (ctx->coll != NULL) {
- enif_mutex_lock(pData->collMutex);
- pData->collStackTop -= 1;
- assert(pData->collStackTop >= 0);
- enif_mutex_unlock(pData->collMutex);
- }
-}
-
-/* ------------------------------------------------------------------------- */
-
-static ERL_NIF_TERM
-collate_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) {
- ERL_NIF_TERM term_a = argv[0];
- ERL_NIF_TERM term_b = argv[1];
- ERL_NIF_TERM term_has_nocase = argv[2];
-
- ctx_t ctx;
- int result;
- priv_data_t* pData;
-
- ctx.env = env;
- ctx.error = 0;
- ctx.coll = NULL;
-
- pData = (priv_data_t*) enif_priv_data(env);
-
- result = collate_binary(pData, &ctx, term_a, term_b, term_has_nocase);
- release_coll(pData, &ctx);
-
- return enif_make_int(env, result);
-}
-
-int
-collate_binary(priv_data_t* pData, ctx_t* ctx, ERL_NIF_TERM term_a, ERL_NIF_TERM term_b, ERL_NIF_TERM term_has_nocase)
-{
- ErlNifBinary binA, binB;
- int has_nocase, response;
-
- if(!enif_get_int(ctx->env, term_has_nocase, &has_nocase)) {
- ctx->error = 1;
- return 0;
- }
- if(!enif_inspect_binary(ctx->env, term_a, &binA)) {
- ctx->error = 1;
- return 0;
- }
- if(!enif_inspect_binary(ctx->env, term_b, &binB)) {
- ctx->error = 1;
- return 0;
- }
-
- switch(has_nocase) {
- case 0: /* COLLATE */
- case 1: /* COLLATE_NO_CASE: */
- {
- UErrorCode status = U_ZERO_ERROR;
- UCharIterator iterA;
- UCharIterator iterB;
-
- uiter_setUTF8(&iterA, (const char *) binA.data, (uint32_t) binA.size);
- uiter_setUTF8(&iterB, (const char *) binB.data, (uint32_t) binB.size);
-
- /* grab a collator */
- reserve_coll(pData, ctx);
-
- if (has_nocase == 1) /* switching this collator to case insensitive */
- ucol_setAttribute(ctx->coll, UCOL_STRENGTH, UCOL_PRIMARY, &status);
-
- /* by default, it will collate case sensitive */
- response = ucol_strcollIter(ctx->coll, &iterA, &iterB, &status);
-
- if (has_nocase == 1) /* puting back this collator to case sensitive */
- ucol_setAttribute(ctx->coll, UCOL_STRENGTH, UCOL_DEFAULT, &status);
-
- break;
- }
-
- default:
- response = -1;
- }
-
- return response;
-}
-
-/* ------------------------------------------------------------------------- */
-
-int
-on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM info)
-{
- UErrorCode status = U_ZERO_ERROR;
- priv_data_t* pData = (priv_data_t*)enif_alloc(sizeof(priv_data_t));
- int i, j;
-
- /* Initialize the structure */
- pData->collators = NULL;
- pData->collStackTop = 0;
- pData->numCollators = 0;
- pData->collMutex = NULL;
-
- if (!enif_get_int(env, info, &(pData->numCollators) )) {
- enif_free((char*)pData);
- return 1;
- }
-
- if (pData->numCollators < 1) {
- enif_free((char*)pData);
- return 2;
- }
-
- pData->collMutex = enif_mutex_create((char *)"coll_mutex");
-
- if (pData->collMutex == NULL) {
- enif_free((char*)pData);
- return 3;
- }
-
- pData->collators = enif_alloc(sizeof(UCollator*) * pData->numCollators);
-
- if (pData->collators == NULL) {
- enif_mutex_destroy(pData->collMutex);
- enif_free((char*)pData);
- return 4;
- }
-
- for (i = 0; i < pData->numCollators; i++) {
- pData->collators[i] = ucol_open("", &status);
-
- if (U_FAILURE(status)) {
- for (j = 0; j < i; j++) {
- ucol_close(pData->collators[j]);
- }
-
- enif_free(pData->collators);
- enif_mutex_destroy(pData->collMutex);
-
- enif_free((char*)pData);
-
- return 5;
- }
- }
-
- ATOM_TRUE = enif_make_atom(env, "true");
- ATOM_FALSE = enif_make_atom(env, "false");
- ATOM_NULL = enif_make_atom(env, "null");
-
- *priv_data = pData;
-
- return 0;
-}
-
-
-void
-on_unload(ErlNifEnv* env, void* priv_data)
-{
- priv_data_t* pData = (priv_data_t*)priv_data;
- if (pData->collators != NULL) {
- int i;
-
- for (i = 0; i < pData->numCollators; i++) {
- ucol_close(pData->collators[i]);
- }
-
- enif_free(pData->collators);
- }
-
- if (pData->collMutex != NULL) {
- enif_mutex_destroy(pData->collMutex);
- }
-
- enif_free((char*)pData);
-}
-
-int
-on_reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM info)
-{
- return 0;
-}
-
-int
-on_upgrade(ErlNifEnv* env, void** priv_data, void** old_data, ERL_NIF_TERM info)
-{
- if (*old_data != NULL) {
- priv_data_t* pData = (priv_data_t*)old_data;
-
- if (pData->collators != NULL) {
- int i;
-
- for (i = 0; i < pData->numCollators; i++) {
- ucol_close(pData->collators[i]);
- }
-
- enif_free(pData->collators);
- }
-
- if (pData->collMutex != NULL) {
- enif_mutex_destroy(pData->collMutex);
- }
-
- enif_free((char*)pData);
- }
-
- return on_load(env, priv_data, info);
-}
-
-/* ------------------------------------------------------------------------- */
-
-static ErlNifFunc
-nif_funcs[] =
-{
- {"collate_nif", 3, collate_nif}
-};
-
-ERL_NIF_INIT(couch_collate, nif_funcs, &on_load, &on_reload, &on_upgrade, &on_unload)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/81332b78/apps/couch_collate/patches/icu/common-uloc_c.patch
----------------------------------------------------------------------
diff --git a/apps/couch_collate/patches/icu/common-uloc_c.patch b/apps/couch_collate/patches/icu/common-uloc_c.patch
deleted file mode 100644
index fe60732..0000000
--- a/apps/couch_collate/patches/icu/common-uloc_c.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-$FreeBSD: ports/devel/icu/files/patch-common-uloc.c,v 1.1 2011/12/23 14:54:18 crees Exp $
-
-From http://bugs.icu-project.org/trac/ticket/8984
-
-Submitted by: Andrei Lavreniyuk <an...@gmail.com> (thanks!)
-
---- icu/source/common/uloc.c
-+++ icu/source/common/uloc.c
-@@ -1797,7 +1797,7 @@
- int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
- len -= variantLen;
- if (variantLen > 0) {
-- if (name[len-1] == '_') { /* delete trailing '_' */
-+ if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
- --len;
- }
- addKeyword = VARIANT_MAP[j].keyword;
-@@ -1805,7 +1805,7 @@
- break;
- }
- }
-- if (name[len-1] == '_') { /* delete trailing '_' */
-+ if (len > 0 && len <= nameCapacity && name[len-1] == '_') { /* delete trailing '_' */
- --len;
- }
- }
http://git-wip-us.apache.org/repos/asf/couchdb/blob/81332b78/apps/couch_collate/patches/icu/layout_LookupProcessor_cpp.patch
----------------------------------------------------------------------
diff --git a/apps/couch_collate/patches/icu/layout_LookupProcessor_cpp.patch b/apps/couch_collate/patches/icu/layout_LookupProcessor_cpp.patch
deleted file mode 100644
index 304d266..0000000
--- a/apps/couch_collate/patches/icu/layout_LookupProcessor_cpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- icu/source/layout/LookupProcessor.cpp
-+++ icu/source/layout/LookupProcessor.cpp
-@@ -201,7 +201,9 @@
-
- if (requiredFeatureIndex != 0xFFFF) {
- requiredFeatureTable = featureListTable->getFeatureTable(requiredFeatureIndex, &requiredFeatureTag);
-- featureReferences += SWAPW(featureTable->lookupCount);
-+ if (requiredFeatureTable) {
-+ featureReferences += SWAPW(requiredFeatureTable->lookupCount);
-+ }
- }
-
- lookupOrderArray = LE_NEW_ARRAY(le_uint16, featureReferences);
http://git-wip-us.apache.org/repos/asf/couchdb/blob/81332b78/apps/couch_collate/patches/icu/source_config_Makefile_inc_in.patch
----------------------------------------------------------------------
diff --git a/apps/couch_collate/patches/icu/source_config_Makefile_inc_in.patch b/apps/couch_collate/patches/icu/source_config_Makefile_inc_in.patch
deleted file mode 100644
index 89d428e..0000000
--- a/apps/couch_collate/patches/icu/source_config_Makefile_inc_in.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- icu/source/config/Makefile.inc.in.orig 2011-04-07 17:41:15.000000000 +0200
-+++ icu/source/config/Makefile.inc.in 2011-04-07 17:41:40.000000000 +0200
-@@ -44,8 +44,7 @@
- LIBICU = lib$(ICUPREFIX)
-
- # Static library prefix and file extension
--STATIC_PREFIX = s
--LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
-+LIBSICU = lib$(ICUPREFIX)
- A = a
-
- # Suffix at the end of libraries. Usually empty.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/81332b78/apps/couch_collate/patches/icu/source_icudefs_mk_in.patch
----------------------------------------------------------------------
diff --git a/apps/couch_collate/patches/icu/source_icudefs_mk_in.patch b/apps/couch_collate/patches/icu/source_icudefs_mk_in.patch
deleted file mode 100644
index a1add5e..0000000
--- a/apps/couch_collate/patches/icu/source_icudefs_mk_in.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- icu/source/icudefs.mk.in.orig 2011-04-07 17:15:44.000000000 +0200
-+++ icu/source/icudefs.mk.in 2011-04-07 17:15:56.000000000 +0200
-@@ -189,14 +189,13 @@
-
- ## If we can't use the shared libraries, use the static libraries
- ifneq ($(ENABLE_SHARED),YES)
--STATIC_PREFIX_WHEN_USED = s
-+STATIC_PREFIX_WHEN_USED =
- else
- STATIC_PREFIX_WHEN_USED =
- endif
-
- # Static library prefix and file extension
--STATIC_PREFIX = s
--LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
-+LIBSICU = $(LIBPREFIX)$(ICUPREFIX)
- A = a
- SOBJ = $(SO)
-
http://git-wip-us.apache.org/repos/asf/couchdb/blob/81332b78/apps/couch_collate/platform/osx/icu/unicode/basictz.h
----------------------------------------------------------------------
diff --git a/apps/couch_collate/platform/osx/icu/unicode/basictz.h b/apps/couch_collate/platform/osx/icu/unicode/basictz.h
deleted file mode 100644
index c616a3e..0000000
--- a/apps/couch_collate/platform/osx/icu/unicode/basictz.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-*******************************************************************************
-* Copyright (C) 2007-2008, International Business Machines Corporation and *
-* others. All Rights Reserved. *
-*******************************************************************************
-*/
-#ifndef BASICTZ_H
-#define BASICTZ_H
-
-/**
- * \file
- * \brief C++ API: ICU TimeZone base class
- */
-
-#include "unicode/utypes.h"
-
-#if !UCONFIG_NO_FORMATTING
-
-#include "unicode/timezone.h"
-#include "unicode/tzrule.h"
-#include "unicode/tztrans.h"
-
-U_NAMESPACE_BEGIN
-
-// forward declarations
-class UVector;
-
-/**
- * <code>BasicTimeZone</code> is an abstract class extending <code>TimeZone</code>.
- * This class provides some additional methods to access time zone transitions and rules.
- * All ICU <code>TimeZone</code> concrete subclasses extend this class.
- * @stable ICU 4.0
- */
-class U_I18N_API BasicTimeZone: public TimeZone {
-public:
- /**
- * Destructor.
- * @stable ICU 4.0
- */
- virtual ~BasicTimeZone();
-
- /**
- * Gets the first time zone transition after the base time.
- * @param base The base time.
- * @param inclusive Whether the base time is inclusive or not.
- * @param result Receives the first transition after the base time.
- * @return TRUE if the transition is found.
- * @stable ICU 4.0
- */
- virtual UBool getNextTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ = 0;
-
- /**
- * Gets the most recent time zone transition before the base time.
- * @param base The base time.
- * @param inclusive Whether the base time is inclusive or not.
- * @param result Receives the most recent transition before the base time.
- * @return TRUE if the transition is found.
- * @stable ICU 4.0
- */
- virtual UBool getPreviousTransition(UDate base, UBool inclusive, TimeZoneTransition& result) /*const*/ = 0;
-
- /**
- * Checks if the time zone has equivalent transitions in the time range.
- * This method returns true when all of transition times, from/to standard
- * offsets and DST savings used by this time zone match the other in the
- * time range.
- * @param tz The <code>BasicTimeZone</code> object to be compared with.
- * @param start The start time of the evaluated time range (inclusive)
- * @param end The end time of the evaluated time range (inclusive)
- * @param ignoreDstAmount
- * When true, any transitions with only daylight saving amount
- * changes will be ignored, except either of them is zero.
- * For example, a transition from rawoffset 3:00/dstsavings 1:00
- * to rawoffset 2:00/dstsavings 2:00 is excluded from the comparison,
- * but a transtion from rawoffset 2:00/dstsavings 1:00 to
- * rawoffset 3:00/dstsavings 0:00 is included.
- * @param ec Output param to filled in with a success or an error.
- * @return true if the other time zone has the equivalent transitions in the
- * time range.
- * @stable ICU 4.0
- */
- virtual UBool hasEquivalentTransitions(/*const*/ BasicTimeZone& tz, UDate start, UDate end,
- UBool ignoreDstAmount, UErrorCode& ec) /*const*/;
-
- /**
- * Returns the number of <code>TimeZoneRule</code>s which represents time transitions,
- * for this time zone, that is, all <code>TimeZoneRule</code>s for this time zone except
- * <code>InitialTimeZoneRule</code>. The return value range is 0 or any positive value.
- * @param status Receives error status code.
- * @return The number of <code>TimeZoneRule</code>s representing time transitions.
- * @stable ICU 4.0
- */
- virtual int32_t countTransitionRules(UErrorCode& status) /*const*/ = 0;
-
- /**
- * Gets the <code>InitialTimeZoneRule</code> and the set of <code>TimeZoneRule</code>
- * which represent time transitions for this time zone. On successful return,
- * the argument initial points to non-NULL <code>InitialTimeZoneRule</code> and
- * the array trsrules is filled with 0 or multiple <code>TimeZoneRule</code>
- * instances up to the size specified by trscount. The results are referencing the
- * rule instance held by this time zone instance. Therefore, after this time zone
- * is destructed, they are no longer available.
- * @param initial Receives the initial timezone rule
- * @param trsrules Receives the timezone transition rules
- * @param trscount On input, specify the size of the array 'transitions' receiving
- * the timezone transition rules. On output, actual number of
- * rules filled in the array will be set.
- * @param status Receives error status code.
- * @stable ICU 4.0
- */
- virtual void getTimeZoneRules(const InitialTimeZoneRule*& initial,
- const TimeZoneRule* trsrules[], int32_t& trscount, UErrorCode& status) /*const*/ = 0;
-
- /**
- * Gets the set of time zone rules valid at the specified time. Some known external time zone
- * implementations are not capable to handle historic time zone rule changes. Also some
- * implementations can only handle certain type of rule definitions.
- * If this time zone does not use any daylight saving time within about 1 year from the specified
- * time, only the <code>InitialTimeZone</code> is returned. Otherwise, the rule for standard
- * time and daylight saving time transitions are returned in addition to the
- * <code>InitialTimeZoneRule</code>. The standard and daylight saving time transition rules are
- * represented by <code>AnnualTimeZoneRule</code> with <code>DateTimeRule::DOW</code> for its date
- * rule and <code>DateTimeRule::WALL_TIME</code> for its time rule. Because daylight saving time
- * rule is changing time to time in many time zones and also mapping a transition time rule to
- * different type is lossy transformation, the set of rules returned by this method may be valid
- * for short period of time.
- * The time zone rule objects returned by this method is owned by the caller, so the caller is
- * responsible for deleting them after use.
- * @param date The date used for extracting time zone rules.
- * @param initial Receives the <code>InitialTimeZone</code>, always not NULL.
- * @param std Receives the <code>AnnualTimeZoneRule</code> for standard time transitions.
- * When this time time zone does not observe daylight saving times around the
- * specified date, NULL is set.
- * @param dst Receives the <code>AnnualTimeZoneRule</code> for daylight saving time
- * transitions. When this time zone does not observer daylight saving times
- * around the specified date, NULL is set.
- * @param status Receives error status code.
- * @stable ICU 4.0
- */
- virtual void getSimpleRulesNear(UDate date, InitialTimeZoneRule*& initial,
- AnnualTimeZoneRule*& std, AnnualTimeZoneRule*& dst, UErrorCode& status) /*const*/;
-
-
- /**
- * The time type option bit flags used by getOffsetFromLocal
- * @internal
- */
- enum {
- kStandard = 0x01,
- kDaylight = 0x03,
- kFormer = 0x04,
- kLatter = 0x0C
- };
-
- /**
- * Get time zone offsets from local wall time.
- * @internal
- */
- virtual void getOffsetFromLocal(UDate date, int32_t nonExistingTimeOpt, int32_t duplicatedTimeOpt,
- int32_t& rawOffset, int32_t& dstOffset, UErrorCode& status) /*const*/;
-
-protected:
-
- /**
- * The time type option bit masks used by getOffsetFromLocal
- * @internal
- */
- enum {
- kStdDstMask = kDaylight,
- kFormerLatterMask = kLatter
- };
-
- /**
- * Default constructor.
- * @stable ICU 4.0
- */
- BasicTimeZone();
-
- /**
- * Construct a timezone with a given ID.
- * @param id a system time zone ID
- * @stable ICU 4.0
- */
- BasicTimeZone(const UnicodeString &id);
-
- /**
- * Copy constructor.
- * @param source the object to be copied.
- * @stable ICU 4.0
- */
- BasicTimeZone(const BasicTimeZone& source);
-
- /**
- * Gets the set of TimeZoneRule instances applicable to the specified time and after.
- * @param start The start date used for extracting time zone rules
- * @param initial Receives the InitialTimeZone, always not NULL
- * @param transitionRules Receives the transition rules, could be NULL
- * @param status Receives error status code
- */
- void getTimeZoneRulesAfter(UDate start, InitialTimeZoneRule*& initial, UVector*& transitionRules,
- UErrorCode& status) /*const*/;
-};
-
-U_NAMESPACE_END
-
-#endif /* #if !UCONFIG_NO_FORMATTING */
-
-#endif // BASICTZ_H
-
-//eof
http://git-wip-us.apache.org/repos/asf/couchdb/blob/81332b78/apps/couch_collate/platform/osx/icu/unicode/brkiter.h
----------------------------------------------------------------------
diff --git a/apps/couch_collate/platform/osx/icu/unicode/brkiter.h b/apps/couch_collate/platform/osx/icu/unicode/brkiter.h
deleted file mode 100644
index 7df5f14..0000000
--- a/apps/couch_collate/platform/osx/icu/unicode/brkiter.h
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
-********************************************************************************
-* Copyright (C) 1997-2007, International Business Machines
-* Corporation and others. All Rights Reserved.
-********************************************************************************
-*
-* File brkiter.h
-*
-* Modification History:
-*
-* Date Name Description
-* 02/18/97 aliu Added typedef for TextCount. Made DONE const.
-* 05/07/97 aliu Fixed DLL declaration.
-* 07/09/97 jfitz Renamed BreakIterator and interface synced with JDK
-* 08/11/98 helena Sync-up JDK1.2.
-* 01/13/2000 helena Added UErrorCode parameter to createXXXInstance methods.
-********************************************************************************
-*/
-
-#ifndef BRKITER_H
-#define BRKITER_H
-
-#include "unicode/utypes.h"
-
-/**
- * \file
- * \brief C++ API: Break Iterator.
- */
-
-#if UCONFIG_NO_BREAK_ITERATION
-
-U_NAMESPACE_BEGIN
-
-/*
- * Allow the declaration of APIs with pointers to BreakIterator
- * even when break iteration is removed from the build.
- */
-class BreakIterator;
-
-U_NAMESPACE_END
-
-#else
-
-#include "unicode/uobject.h"
-#include "unicode/unistr.h"
-#include "unicode/chariter.h"
-#include "unicode/locid.h"
-#include "unicode/ubrk.h"
-#include "unicode/strenum.h"
-#include "unicode/utext.h"
-#include "unicode/umisc.h"
-
-U_NAMESPACE_BEGIN
-
-/**
- * The BreakIterator class implements methods for finding the location
- * of boundaries in text. BreakIterator is an abstract base class.
- * Instances of BreakIterator maintain a current position and scan over
- * text returning the index of characters where boundaries occur.
- * <p>
- * Line boundary analysis determines where a text string can be broken
- * when line-wrapping. The mechanism correctly handles punctuation and
- * hyphenated words.
- * <p>
- * Sentence boundary analysis allows selection with correct
- * interpretation of periods within numbers and abbreviations, and
- * trailing punctuation marks such as quotation marks and parentheses.
- * <p>
- * Word boundary analysis is used by search and replace functions, as
- * well as within text editing applications that allow the user to
- * select words with a double click. Word selection provides correct
- * interpretation of punctuation marks within and following
- * words. Characters that are not part of a word, such as symbols or
- * punctuation marks, have word-breaks on both sides.
- * <p>
- * Character boundary analysis allows users to interact with
- * characters as they expect to, for example, when moving the cursor
- * through a text string. Character boundary analysis provides correct
- * navigation of through character strings, regardless of how the
- * character is stored. For example, an accented character might be
- * stored as a base character and a diacritical mark. What users
- * consider to be a character can differ between languages.
- * <p>
- * The text boundary positions are found according to the rules
- * described in Unicode Standard Annex #29, Text Boundaries, and
- * Unicode Standard Annex #14, Line Breaking Properties. These
- * are available at http://www.unicode.org/reports/tr14/ and
- * http://www.unicode.org/reports/tr29/.
- * <p>
- * In addition to the C++ API defined in this header file, a
- * plain C API with equivalent functionality is defined in the
- * file ubrk.h
- * <p>
- * Code snippits illustrating the use of the Break Iterator APIs
- * are available in the ICU User Guide,
- * http://icu-project.org/userguide/boundaryAnalysis.html
- * and in the sample program icu/source/samples/break/break.cpp"
- *
- */
-class U_COMMON_API BreakIterator : public UObject {
-public:
- /**
- * destructor
- * @stable ICU 2.0
- */
- virtual ~BreakIterator();
-
- /**
- * Return true if another object is semantically equal to this
- * one. The other object should be an instance of the same subclass of
- * BreakIterator. Objects of different subclasses are considered
- * unequal.
- * <P>
- * Return true if this BreakIterator is at the same position in the
- * same text, and is the same class and type (word, line, etc.) of
- * BreakIterator, as the argument. Text is considered the same if
- * it contains the same characters, it need not be the same
- * object, and styles are not considered.
- * @stable ICU 2.0
- */
- virtual UBool operator==(const BreakIterator&) const = 0;
-
- /**
- * Returns the complement of the result of operator==
- * @param rhs The BreakIterator to be compared for inequality
- * @return the complement of the result of operator==
- * @stable ICU 2.0
- */
- UBool operator!=(const BreakIterator& rhs) const { return !operator==(rhs); }
-
- /**
- * Return a polymorphic copy of this object. This is an abstract
- * method which subclasses implement.
- * @stable ICU 2.0
- */
- virtual BreakIterator* clone(void) const = 0;
-
- /**
- * Return a polymorphic class ID for this object. Different subclasses
- * will return distinct unequal values.
- * @stable ICU 2.0
- */
- virtual UClassID getDynamicClassID(void) const = 0;
-
- /**
- * Return a CharacterIterator over the text being analyzed.
- * @stable ICU 2.0
- */
- virtual CharacterIterator& getText(void) const = 0;
-
-
- /**
- * Get a UText for the text being analyzed.
- * The returned UText is a shallow clone of the UText used internally
- * by the break iterator implementation. It can safely be used to
- * access the text without impacting any break iterator operations,
- * but the underlying text itself must not be altered.
- *
- * @param fillIn A UText to be filled in. If NULL, a new UText will be
- * allocated to hold the result.
- * @param status receives any error codes.
- * @return The current UText for this break iterator. If an input
- * UText was provided, it will always be returned.
- * @stable ICU 3.4
- */
- virtual UText *getUText(UText *fillIn, UErrorCode &status) const = 0;
-
- /**
- * Change the text over which this operates. The text boundary is
- * reset to the start.
- * @param text The UnicodeString used to change the text.
- * @stable ICU 2.0
- */
- virtual void setText(const UnicodeString &text) = 0;
-
- /**
- * Reset the break iterator to operate over the text represented by
- * the UText. The iterator position is reset to the start.
- *
- * This function makes a shallow clone of the supplied UText. This means
- * that the caller is free to immediately close or otherwise reuse the
- * Utext that was passed as a parameter, but that the underlying text itself
- * must not be altered while being referenced by the break iterator.
- *
- * @param text The UText used to change the text.
- * @param status receives any error codes.
- * @stable ICU 3.4
- */
- virtual void setText(UText *text, UErrorCode &status) = 0;
-
- /**
- * Change the text over which this operates. The text boundary is
- * reset to the start.
- * Note that setText(UText *) provides similar functionality to this function,
- * and is more efficient.
- * @param it The CharacterIterator used to change the text.
- * @stable ICU 2.0
- */
- virtual void adoptText(CharacterIterator* it) = 0;
-
- enum {
- /**
- * DONE is returned by previous() and next() after all valid
- * boundaries have been returned.
- * @stable ICU 2.0
- */
- DONE = (int32_t)-1
- };
-
- /**
- * Return the index of the first character in the text being scanned.
- * @stable ICU 2.0
- */
- virtual int32_t first(void) = 0;
-
- /**
- * Return the index immediately BEYOND the last character in the text being scanned.
- * @stable ICU 2.0
- */
- virtual int32_t last(void) = 0;
-
- /**
- * Return the boundary preceding the current boundary.
- * @return The character index of the previous text boundary or DONE if all
- * boundaries have been returned.
- * @stable ICU 2.0
- */
- virtual int32_t previous(void) = 0;
-
- /**
- * Return the boundary following the current boundary.
- * @return The character index of the next text boundary or DONE if all
- * boundaries have been returned.
- * @stable ICU 2.0
- */
- virtual int32_t next(void) = 0;
-
- /**
- * Return character index of the current interator position within the text.
- * @return The boundary most recently returned.
- * @stable ICU 2.0
- */
- virtual int32_t current(void) const = 0;
-
- /**
- * Return the first boundary following the specified offset.
- * The value returned is always greater than the offset or
- * the value BreakIterator.DONE
- * @param offset the offset to begin scanning.
- * @return The first boundary after the specified offset.
- * @stable ICU 2.0
- */
- virtual int32_t following(int32_t offset) = 0;
-
- /**
- * Return the first boundary preceding the specified offset.
- * The value returned is always smaller than the offset or
- * the value BreakIterator.DONE
- * @param offset the offset to begin scanning.
- * @return The first boundary before the specified offset.
- * @stable ICU 2.0
- */
- virtual int32_t preceding(int32_t offset) = 0;
-
- /**
- * Return true if the specfied position is a boundary position.
- * As a side effect, the current position of the iterator is set
- * to the first boundary position at or following the specified offset.
- * @param offset the offset to check.
- * @return True if "offset" is a boundary position.
- * @stable ICU 2.0
- */
- virtual UBool isBoundary(int32_t offset) = 0;
-
- /**
- * Return the nth boundary from the current boundary
- * @param n which boundary to return. A value of 0
- * does nothing. Negative values move to previous boundaries
- * and positive values move to later boundaries.
- * @return The index of the nth boundary from the current position, or
- * DONE if there are fewer than |n| boundaries in the specfied direction.
- * @stable ICU 2.0
- */
- virtual int32_t next(int32_t n) = 0;
-
- /**
- * Create BreakIterator for word-breaks using the given locale.
- * Returns an instance of a BreakIterator implementing word breaks.
- * WordBreak is useful for word selection (ex. double click)
- * @param where the locale.
- * @param status the error code
- * @return A BreakIterator for word-breaks. The UErrorCode& status
- * parameter is used to return status information to the user.
- * To check whether the construction succeeded or not, you should check
- * the value of U_SUCCESS(err). If you wish more detailed information, you
- * can check for informational error results which still indicate success.
- * U_USING_FALLBACK_WARNING indicates that a fall back locale was used. For
- * example, 'de_CH' was requested, but nothing was found there, so 'de' was
- * used. U_USING_DEFAULT_WARNING indicates that the default locale data was
- * used; neither the requested locale nor any of its fall back locales
- * could be found.
- * The caller owns the returned object and is responsible for deleting it.
- * @stable ICU 2.0
- */
- static BreakIterator* U_EXPORT2
- createWordInstance(const Locale& where, UErrorCode& status);
-
- /**
- * Create BreakIterator for line-breaks using specified locale.
- * Returns an instance of a BreakIterator implementing line breaks. Line
- * breaks are logically possible line breaks, actual line breaks are
- * usually determined based on display width.
- * LineBreak is useful for word wrapping text.
- * @param where the locale.
- * @param status The error code.
- * @return A BreakIterator for line-breaks. The UErrorCode& status
- * parameter is used to return status information to the user.
- * To check whether the construction succeeded or not, you should check
- * the value of U_SUCCESS(err). If you wish more detailed information, you
- * can check for informational error results which still indicate success.
- * U_USING_FALLBACK_WARNING indicates that a fall back locale was used. For
- * example, 'de_CH' was requested, but nothing was found there, so 'de' was
- * used. U_USING_DEFAULT_WARNING indicates that the default locale data was
- * used; neither the requested locale nor any of its fall back locales
- * could be found.
- * The caller owns the returned object and is responsible for deleting it.
- * @stable ICU 2.0
- */
- static BreakIterator* U_EXPORT2
- createLineInstance(const Locale& where, UErrorCode& status);
-
- /**
- * Create BreakIterator for character-breaks using specified locale
- * Returns an instance of a BreakIterator implementing character breaks.
- * Character breaks are boundaries of combining character sequences.
- * @param where the locale.
- * @param status The error code.
- * @return A BreakIterator for character-breaks. The UErrorCode& status
- * parameter is used to return status information to the user.
- * To check whether the construction succeeded or not, you should check
- * the value of U_SUCCESS(err). If you wish more detailed information, you
- * can check for informational error results which still indicate success.
- * U_USING_FALLBACK_WARNING indicates that a fall back locale was used. For
- * example, 'de_CH' was requested, but nothing was found there, so 'de' was
- * used. U_USING_DEFAULT_WARNING indicates that the default locale data was
- * used; neither the requested locale nor any of its fall back locales
- * could be found.
- * The caller owns the returned object and is responsible for deleting it.
- * @stable ICU 2.0
- */
- static BreakIterator* U_EXPORT2
- createCharacterInstance(const Locale& where, UErrorCode& status);
-
- /**
- * Create BreakIterator for sentence-breaks using specified locale
- * Returns an instance of a BreakIterator implementing sentence breaks.
- * @param where the locale.
- * @param status The error code.
- * @return A BreakIterator for sentence-breaks. The UErrorCode& status
- * parameter is used to return status information to the user.
- * To check whether the construction succeeded or not, you should check
- * the value of U_SUCCESS(err). If you wish more detailed information, you
- * can check for informational error results which still indicate success.
- * U_USING_FALLBACK_WARNING indicates that a fall back locale was used. For
- * example, 'de_CH' was requested, but nothing was found there, so 'de' was
- * used. U_USING_DEFAULT_WARNING indicates that the default locale data was
- * used; neither the requested locale nor any of its fall back locales
- * could be found.
- * The caller owns the returned object and is responsible for deleting it.
- * @stable ICU 2.0
- */
- static BreakIterator* U_EXPORT2
- createSentenceInstance(const Locale& where, UErrorCode& status);
-
- /**
- * Create BreakIterator for title-casing breaks using the specified locale
- * Returns an instance of a BreakIterator implementing title breaks.
- * The iterator returned locates title boundaries as described for
- * Unicode 3.2 only. For Unicode 4.0 and above title boundary iteration,
- * please use Word Boundary iterator.{@link #createWordInstance }
- *
- * @param where the locale.
- * @param status The error code.
- * @return A BreakIterator for title-breaks. The UErrorCode& status
- * parameter is used to return status information to the user.
- * To check whether the construction succeeded or not, you should check
- * the value of U_SUCCESS(err). If you wish more detailed information, you
- * can check for informational error results which still indicate success.
- * U_USING_FALLBACK_WARNING indicates that a fall back locale was used. For
- * example, 'de_CH' was requested, but nothing was found there, so 'de' was
- * used. U_USING_DEFAULT_WARNING indicates that the default locale data was
- * used; neither the requested locale nor any of its fall back locales
- * could be found.
- * The caller owns the returned object and is responsible for deleting it.
- * @stable ICU 2.1
- */
- static BreakIterator* U_EXPORT2
- createTitleInstance(const Locale& where, UErrorCode& status);
-
- /**
- * Get the set of Locales for which TextBoundaries are installed.
- * <p><b>Note:</b> this will not return locales added through the register
- * call. To see the registered locales too, use the getAvailableLocales
- * function that returns a StringEnumeration object </p>
- * @param count the output parameter of number of elements in the locale list
- * @return available locales
- * @stable ICU 2.0
- */
- static const Locale* U_EXPORT2 getAvailableLocales(int32_t& count);
-
- /**
- * Get name of the object for the desired Locale, in the desired langauge.
- * @param objectLocale must be from getAvailableLocales.
- * @param displayLocale specifies the desired locale for output.
- * @param name the fill-in parameter of the return value
- * Uses best match.
- * @return user-displayable name
- * @stable ICU 2.0
- */
- static UnicodeString& U_EXPORT2 getDisplayName(const Locale& objectLocale,
- const Locale& displayLocale,
- UnicodeString& name);
-
- /**
- * Get name of the object for the desired Locale, in the langauge of the
- * default locale.
- * @param objectLocale must be from getMatchingLocales
- * @param name the fill-in parameter of the return value
- * @return user-displayable name
- * @stable ICU 2.0
- */
- static UnicodeString& U_EXPORT2 getDisplayName(const Locale& objectLocale,
- UnicodeString& name);
-
- /**
- * Thread safe client-buffer-based cloning operation
- * Do NOT call delete on a safeclone, since 'new' is not used to create it.
- * @param stackBuffer user allocated space for the new clone. If NULL new memory will be allocated.
- * If buffer is not large enough, new memory will be allocated.
- * @param BufferSize reference to size of allocated space.
- * If BufferSize == 0, a sufficient size for use in cloning will
- * be returned ('pre-flighting')
- * If BufferSize is not enough for a stack-based safe clone,
- * new memory will be allocated.
- * @param status to indicate whether the operation went on smoothly or there were errors
- * An informational status value, U_SAFECLONE_ALLOCATED_ERROR, is used if any allocations were
- * necessary.
- * @return pointer to the new clone
- *
- * @stable ICU 2.0
- */
- virtual BreakIterator * createBufferClone(void *stackBuffer,
- int32_t &BufferSize,
- UErrorCode &status) = 0;
-
- /**
- * Determine whether the BreakIterator was created in user memory by
- * createBufferClone(), and thus should not be deleted. Such objects
- * must be closed by an explicit call to the destructor (not delete).
- * @stable ICU 2.0
- */
- inline UBool isBufferClone(void);
-
-#if !UCONFIG_NO_SERVICE
- /**
- * Register a new break iterator of the indicated kind, to use in the given locale.
- * The break iterator will be adopted. Clones of the iterator will be returned
- * if a request for a break iterator of the given kind matches or falls back to
- * this locale.
- * @param toAdopt the BreakIterator instance to be adopted
- * @param locale the Locale for which this instance is to be registered
- * @param kind the type of iterator for which this instance is to be registered
- * @param status the in/out status code, no special meanings are assigned
- * @return a registry key that can be used to unregister this instance
- * @stable ICU 2.4
- */
- static URegistryKey U_EXPORT2 registerInstance(BreakIterator* toAdopt,
- const Locale& locale,
- UBreakIteratorType kind,
- UErrorCode& status);
-
- /**
- * Unregister a previously-registered BreakIterator using the key returned from the
- * register call. Key becomes invalid after a successful call and should not be used again.
- * The BreakIterator corresponding to the key will be deleted.
- * @param key the registry key returned by a previous call to registerInstance
- * @param status the in/out status code, no special meanings are assigned
- * @return TRUE if the iterator for the key was successfully unregistered
- * @stable ICU 2.4
- */
- static UBool U_EXPORT2 unregister(URegistryKey key, UErrorCode& status);
-
- /**
- * Return a StringEnumeration over the locales available at the time of the call,
- * including registered locales.
- * @return a StringEnumeration over the locales available at the time of the call
- * @stable ICU 2.4
- */
- static StringEnumeration* U_EXPORT2 getAvailableLocales(void);
-#endif
-
- /**
- * Returns the locale for this break iterator. Two flavors are available: valid and
- * actual locale.
- * @stable ICU 2.8
- */
- Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const;
-
- /** Get the locale for this break iterator object. You can choose between valid and actual locale.
- * @param type type of the locale we're looking for (valid or actual)
- * @param status error code for the operation
- * @return the locale
- * @internal
- */
- const char *getLocaleID(ULocDataLocaleType type, UErrorCode& status) const;
-
- private:
- static BreakIterator* buildInstance(const Locale& loc, const char *type, int32_t kind, UErrorCode& status);
- static BreakIterator* createInstance(const Locale& loc, int32_t kind, UErrorCode& status);
- static BreakIterator* makeInstance(const Locale& loc, int32_t kind, UErrorCode& status);
-
- friend class ICUBreakIteratorFactory;
- friend class ICUBreakIteratorService;
-
-protected:
- /** @internal */
- BreakIterator();
- /** @internal */
- UBool fBufferClone;
- /** @internal */
- BreakIterator (const BreakIterator &other) : UObject(other), fBufferClone(FALSE) {}
-
-private:
-
- /** @internal */
- char actualLocale[ULOC_FULLNAME_CAPACITY];
- char validLocale[ULOC_FULLNAME_CAPACITY];
-
- /**
- * The assignment operator has no real implementation.
- * It's provided to make the compiler happy. Do not call.
- */
- BreakIterator& operator=(const BreakIterator&);
-};
-
-inline UBool BreakIterator::isBufferClone()
-{
- return fBufferClone;
-}
-
-U_NAMESPACE_END
-
-#endif /* #if !UCONFIG_NO_BREAK_ITERATION */
-
-#endif // _BRKITER
-//eof
-