Skip to content

Commit 3d1766f

Browse files
srl295evanlucas
authored andcommitted
deps: Intl: ICU 58 bump - small icu (BIG COMMIT)
This commit contains the ICU 58.1 delta. It is especially large because of the ICU license change, and, because the line endings were off previously. * bump to ICU 58.1 - check in small ICU source * from 58.1 final http://site.icu-project.org/download/58 Fixes: #7844 PR-URL: #9234 Reviewed-By: James M Snell <[email protected]>
1 parent 827000e commit 3d1766f

File tree

897 files changed

+17113
-12491
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

897 files changed

+17113
-12491
lines changed

deps/icu-small/LICENSE

+43-51
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,50 @@
1-
ICU License - ICU 1.8.1 and later
1+
COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
2+
3+
Copyright © 1991-2016 Unicode, Inc. All rights reserved.
4+
Distributed under the Terms of Use in http://www.unicode.org/copyright.html
5+
6+
Permission is hereby granted, free of charge, to any person obtaining
7+
a copy of the Unicode data files and any associated documentation
8+
(the "Data Files") or Unicode software and any associated documentation
9+
(the "Software") to deal in the Data Files or Software
10+
without restriction, including without limitation the rights to use,
11+
copy, modify, merge, publish, distribute, and/or sell copies of
12+
the Data Files or Software, and to permit persons to whom the Data Files
13+
or Software are furnished to do so, provided that either
14+
(a) this copyright and permission notice appear with all copies
15+
of the Data Files or Software, or
16+
(b) this copyright and permission notice appear in associated
17+
Documentation.
18+
19+
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
20+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
21+
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
22+
NONINFRINGEMENT OF THIRD PARTY RIGHTS.
23+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
24+
NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
25+
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
26+
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
27+
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
28+
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
29+
30+
Except as contained in this notice, the name of a copyright holder
31+
shall not be used in advertising or otherwise to promote the sale,
32+
use or other dealings in these Data Files or Software without prior
33+
written authorization of the copyright holder.
34+
35+
---------------------
36+
37+
Third-Party Software Licenses
38+
39+
This section contains third-party software notices and/or additional
40+
terms for licensed third-party software components included within ICU
41+
libraries.
42+
43+
1. ICU License - ICU 1.8.1 to ICU 57.1
244

345
COPYRIGHT AND PERMISSION NOTICE
446

547
Copyright (c) 1995-2016 International Business Machines Corporation and others
6-
748
All rights reserved.
849

950
Permission is hereby granted, free of charge, to any person obtaining
@@ -31,58 +72,9 @@ shall not be used in advertising or otherwise to promote the sale, use
3172
or other dealings in this Software without prior written authorization
3273
of the copyright holder.
3374

34-
3575
All trademarks and registered trademarks mentioned herein are the
3676
property of their respective owners.
3777

38-
---------------------
39-
40-
Third-Party Software Licenses
41-
42-
This section contains third-party software notices and/or additional
43-
terms for licensed third-party software components included within ICU
44-
libraries.
45-
46-
1. Unicode Data Files and Software
47-
48-
COPYRIGHT AND PERMISSION NOTICE
49-
50-
Copyright © 1991-2016 Unicode, Inc. All rights reserved.
51-
Distributed under the Terms of Use in
52-
http://www.unicode.org/copyright.html.
53-
54-
Permission is hereby granted, free of charge, to any person obtaining
55-
a copy of the Unicode data files and any associated documentation
56-
(the "Data Files") or Unicode software and any associated documentation
57-
(the "Software") to deal in the Data Files or Software
58-
without restriction, including without limitation the rights to use,
59-
copy, modify, merge, publish, distribute, and/or sell copies of
60-
the Data Files or Software, and to permit persons to whom the Data Files
61-
or Software are furnished to do so, provided that
62-
(a) this copyright and permission notice appear with all copies
63-
of the Data Files or Software,
64-
(b) this copyright and permission notice appear in associated
65-
documentation, and
66-
(c) there is clear notice in each modified Data File or in the Software
67-
as well as in the documentation associated with the Data File(s) or
68-
Software that the data or software has been modified.
69-
70-
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
71-
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
72-
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
73-
NONINFRINGEMENT OF THIRD PARTY RIGHTS.
74-
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
75-
NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
76-
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
77-
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
78-
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
79-
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
80-
81-
Except as contained in this notice, the name of a copyright holder
82-
shall not be used in advertising or otherwise to promote the sale,
83-
use or other dealings in these Data Files or Software without prior
84-
written authorization of the copyright holder.
85-
8678
2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
8779

8880
# The Google Chrome software developed by Google is licensed under

deps/icu-small/README-SMALL-ICU.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Small ICU sources - auto generated by shrink-icu-src.py
22

33
This directory contains the ICU subset used by --with-intl=small-icu (the default)
4-
It is a strict subset of ICU 57 source files with the following exception(s):
5-
* deps/icu-small/source/data/in/icudt57l.dat : Reduced-size data file
4+
It is a strict subset of ICU 58 source files with the following exception(s):
5+
* deps/icu-small/source/data/in/icudt58l.dat : Reduced-size data file
66

77

88
To rebuild this directory, see ../../tools/icu/README.md

deps/icu-small/license.html

-18
This file was deleted.

deps/icu-small/source/common/appendable.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
*******************************************************************************
35
* Copyright (C) 2011-2012, International Business Machines

deps/icu-small/source/common/bmpset.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
******************************************************************************
35
*

deps/icu-small/source/common/bmpset.h

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
******************************************************************************
35
*

deps/icu-small/source/common/brkeng.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
************************************************************************************
35
* Copyright (C) 2006-2016, International Business Machines Corporation

deps/icu-small/source/common/brkeng.h

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/**
24
************************************************************************************
35
* Copyright (C) 2006-2012, International Business Machines Corporation and others. *

deps/icu-small/source/common/brkiter.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
*******************************************************************************
35
* Copyright (C) 1997-2015, International Business Machines Corporation and
@@ -418,6 +420,7 @@ BreakIterator::makeInstance(const Locale& loc, int32_t kind, UErrorCode& status)
418420
break;
419421
case UBRK_SENTENCE:
420422
result = BreakIterator::buildInstance(loc, "sentence", kind, status);
423+
#if !UCONFIG_NO_FILTERED_BREAK_ITERATION
421424
{
422425
char ssKeyValue[kKeyValueLenMax] = {0};
423426
UErrorCode kvStatus = U_ZERO_ERROR;
@@ -430,6 +433,7 @@ BreakIterator::makeInstance(const Locale& loc, int32_t kind, UErrorCode& status)
430433
}
431434
}
432435
}
436+
#endif
433437
break;
434438
case UBRK_TITLE:
435439
result = BreakIterator::buildInstance(loc, "title", kind, status);

deps/icu-small/source/common/bytestream.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
// Copyright (C) 2009-2011, International Business Machines
24
// Corporation and others. All Rights Reserved.
35
//

deps/icu-small/source/common/bytestrie.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
*******************************************************************************
35
* Copyright (C) 2010-2011, International Business Machines

deps/icu-small/source/common/bytestriebuilder.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
*******************************************************************************
35
* Copyright (C) 2010-2012, International Business Machines
@@ -35,7 +37,7 @@ class BytesTrieElement : public UMemory {
3537
public:
3638
// Use compiler's default constructor, initializes nothing.
3739

38-
void setTo(const StringPiece &s, int32_t val, CharString &strings, UErrorCode &errorCode);
40+
void setTo(StringPiece s, int32_t val, CharString &strings, UErrorCode &errorCode);
3941

4042
StringPiece getString(const CharString &strings) const {
4143
int32_t offset=stringOffset;
@@ -86,7 +88,7 @@ class BytesTrieElement : public UMemory {
8688
};
8789

8890
void
89-
BytesTrieElement::setTo(const StringPiece &s, int32_t val,
91+
BytesTrieElement::setTo(StringPiece s, int32_t val,
9092
CharString &strings, UErrorCode &errorCode) {
9193
if(U_FAILURE(errorCode)) {
9294
return;
@@ -143,7 +145,7 @@ BytesTrieBuilder::~BytesTrieBuilder() {
143145
}
144146

145147
BytesTrieBuilder &
146-
BytesTrieBuilder::add(const StringPiece &s, int32_t value, UErrorCode &errorCode) {
148+
BytesTrieBuilder::add(StringPiece s, int32_t value, UErrorCode &errorCode) {
147149
if(U_FAILURE(errorCode)) {
148150
return *this;
149151
}
@@ -165,7 +167,7 @@ BytesTrieBuilder::add(const StringPiece &s, int32_t value, UErrorCode &errorCode
165167
return *this; // error instead of dereferencing null
166168
}
167169
if(elementsLength>0) {
168-
uprv_memcpy(newElements, elements, elementsLength*sizeof(BytesTrieElement));
170+
uprv_memcpy(newElements, elements, (size_t)elementsLength*sizeof(BytesTrieElement));
169171
}
170172
delete[] elements;
171173
elements=newElements;

deps/icu-small/source/common/bytestrieiterator.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
*******************************************************************************
35
* Copyright (C) 2010-2012, International Business Machines
@@ -139,7 +141,6 @@ BytesTrie::Iterator::next(UErrorCode &errorCode) {
139141
} else {
140142
pos_=skipValue(pos, node);
141143
}
142-
sp_.set(str_->data(), str_->length());
143144
return TRUE;
144145
}
145146
if(maxLength_>0 && str_->length()==maxLength_) {
@@ -167,10 +168,14 @@ BytesTrie::Iterator::next(UErrorCode &errorCode) {
167168
}
168169
}
169170

171+
StringPiece
172+
BytesTrie::Iterator::getString() const {
173+
return str_ == NULL ? StringPiece() : str_->toStringPiece();
174+
}
175+
170176
UBool
171177
BytesTrie::Iterator::truncateAndStop() {
172178
pos_=NULL;
173-
sp_.set(str_->data(), str_->length());
174179
value_=-1; // no real value for str
175180
return TRUE;
176181
}
@@ -199,7 +204,6 @@ BytesTrie::Iterator::branchNext(const uint8_t *pos, int32_t length, UErrorCode &
199204
str_->append((char)trieByte, errorCode);
200205
if(isFinal) {
201206
pos_=NULL;
202-
sp_.set(str_->data(), str_->length());
203207
value_=value;
204208
return NULL;
205209
} else {

deps/icu-small/source/common/caniter.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
*****************************************************************************
35
* Copyright (C) 1996-2015, International Business Machines Corporation and

deps/icu-small/source/common/chariter.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
**********************************************************************
35
* Copyright (C) 1999-2011, International Business Machines

deps/icu-small/source/common/charstr.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
*******************************************************************************
35
* Copyright (C) 2010-2015, International Business Machines
@@ -144,7 +146,7 @@ UBool CharString::ensureCapacity(int32_t capacity,
144146
return TRUE;
145147
}
146148

147-
CharString &CharString::appendPathPart(const StringPiece &s, UErrorCode &errorCode) {
149+
CharString &CharString::appendPathPart(StringPiece s, UErrorCode &errorCode) {
148150
if(U_FAILURE(errorCode)) {
149151
return *this;
150152
}

deps/icu-small/source/common/charstr.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
**********************************************************************
35
* Copyright (c) 2001-2015, International Business Machines
@@ -39,7 +41,7 @@ template class U_COMMON_API MaybeStackArray<char, 40>;
3941
class U_COMMON_API CharString : public UMemory {
4042
public:
4143
CharString() : len(0) { buffer[0]=0; }
42-
CharString(const StringPiece &s, UErrorCode &errorCode) : len(0) {
44+
CharString(StringPiece s, UErrorCode &errorCode) : len(0) {
4345
buffer[0]=0;
4446
append(s, errorCode);
4547
}
@@ -76,7 +78,7 @@ class U_COMMON_API CharString : public UMemory {
7678
CharString &truncate(int32_t newLength);
7779

7880
CharString &append(char c, UErrorCode &errorCode);
79-
CharString &append(const StringPiece &s, UErrorCode &errorCode) {
81+
CharString &append(StringPiece s, UErrorCode &errorCode) {
8082
return append(s.data(), s.length(), errorCode);
8183
}
8284
CharString &append(const CharString &s, UErrorCode &errorCode) {
@@ -115,7 +117,7 @@ class U_COMMON_API CharString : public UMemory {
115117
* First appends a U_FILE_SEP_CHAR if necessary.
116118
* Does nothing if s is empty.
117119
*/
118-
CharString &appendPathPart(const StringPiece &s, UErrorCode &errorCode);
120+
CharString &appendPathPart(StringPiece s, UErrorCode &errorCode);
119121

120122
/**
121123
* Appends a U_FILE_SEP_CHAR if this string is not empty

deps/icu-small/source/common/cmemory.c

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2016 and later: Unicode, Inc. and others.
2+
// License & terms of use: http://www.unicode.org/copyright.html
13
/*
24
******************************************************************************
35
*

0 commit comments

Comments
 (0)