Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 28b523e

Browse files
chakrabotchakrabot
committed
meta: merge node/master into node-chakracore/master
Merge d54f651 as of 2018-04-03 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Kyle Farnung <[email protected]>
2 parents f92080c + d54f651 commit 28b523e

205 files changed

Lines changed: 9660 additions & 2629 deletions

File tree

Some content is hidden

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

‎COLLABORATOR_GUIDE.md‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -408,10 +408,8 @@ recommended but not required.
408408

409409
### Deprecations
410410

411-
_Deprecation_ refers to the identification of Public APIs that should no longer
412-
be used and that may be removed or modified in backward-incompatible ways in
413-
a future major release of Node.js. Deprecation may be used with internal APIs if
414-
there is expected impact on the user community.
411+
**Deprecation** refers to the identification of Public APIs that should no
412+
longer be used.
415413

416414
Node.js uses three Deprecation levels:
417415

@@ -420,9 +418,9 @@ Node.js uses three Deprecation levels:
420418
notice indicating the deprecated status is added to the API documentation
421419
but no functional changes are implemented in the code. There will be no
422420
runtime deprecation warnings emitted for such deprecations by default.
423-
Documentation-only deprecations may trigger a runtime warning when launched
424-
with [`--pending-deprecation`][] flag (or its alternative,
425-
`NODE_PENDING_DEPRECATION=1` environment variable).
421+
Documentation-only deprecations may trigger a runtime warning when Node.js
422+
is started with the [`--pending-deprecation`][] flag or the
423+
`NODE_PENDING_DEPRECATION=1` environment variable is set.
426424

427425
* *Runtime Deprecation* refers to the use of process warnings emitted at
428426
runtime the first time that a deprecated API is used. A command-line
@@ -432,7 +430,9 @@ Node.js uses three Deprecation levels:
432430
deprecated status.
433431

434432
* *End-of-life* refers to APIs that have gone through Runtime Deprecation and
435-
are ready to be removed from Node.js entirely.
433+
are no longer subject to the semantic versioning rules used by the project.
434+
Backward-incompatible changes including complete removal of such APIs may
435+
occur at any time.
436436

437437
Documentation-Only Deprecations may be handled as semver-minor or semver-major
438438
changes. Such deprecations have no impact on the successful operation of running
@@ -457,7 +457,9 @@ Deprecations may land in a Node.js minor release but must not be upgraded to
457457
a Runtime Deprecation until the next major release.)
458458

459459
No API can be moved to End-of-life without first having gone through a
460-
Runtime Deprecation cycle.
460+
Runtime Deprecation cycle. However, there is no requirement that deprecated
461+
code must progress ultimately to *End-of-Life*. Documentation-only and runtime
462+
deprecations may remain indefinitely.
461463

462464
A best effort will be made to communicate pending deprecations and associated
463465
mitigations with the ecosystem as soon as possible (preferably before the pull

‎LICENSE‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ The externally maintained libraries used by Node.js are:
122122
"""
123123
COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
124124

125-
Copyright © 1991-2017 Unicode, Inc. All rights reserved.
126-
Distributed under the Terms of Use in http://www.unicode.org/copyright.html
125+
Copyright © 1991-2018 Unicode, Inc. All rights reserved.
126+
Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
127127

128128
Permission is hereby granted, free of charge, to any person obtaining
129129
a copy of the Unicode data files and any associated documentation
@@ -505,6 +505,35 @@ The externally maintained libraries used by Node.js are:
505505
# by ICANN or the IETF Trust on the database or the code. Any person
506506
# making a contribution to the database or code waives all rights to
507507
# future claims in that contribution or in the TZ Database.
508+
509+
6. Google double-conversion
510+
511+
Copyright 2006-2011, the V8 project authors. All rights reserved.
512+
Redistribution and use in source and binary forms, with or without
513+
modification, are permitted provided that the following conditions are
514+
met:
515+
516+
* Redistributions of source code must retain the above copyright
517+
notice, this list of conditions and the following disclaimer.
518+
* Redistributions in binary form must reproduce the above
519+
copyright notice, this list of conditions and the following
520+
disclaimer in the documentation and/or other materials provided
521+
with the distribution.
522+
* Neither the name of Google Inc. nor the names of its
523+
contributors may be used to endorse or promote products derived
524+
from this software without specific prior written permission.
525+
526+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
527+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
528+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
529+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
530+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
531+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
532+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
533+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
534+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
535+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
536+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
508537
"""
509538

510539
- libuv, located at deps/uv, is licensed as follows:

‎Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,8 @@ lint-js-ci:
11331133
jslint-ci: lint-js-ci
11341134
@echo "Please use lint-js-ci instead of jslint-ci"
11351135

1136-
LINT_CPP_ADDON_DOC_FILES = $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h)
1136+
LINT_CPP_ADDON_DOC_FILES_GLOB = test/addons/??_*/*.cc test/addons/??_*/*.h
1137+
LINT_CPP_ADDON_DOC_FILES = $(wildcard $(LINT_CPP_ADDON_DOC_FILES_GLOB))
11371138
LINT_CPP_EXCLUDE ?=
11381139
LINT_CPP_EXCLUDE += src/node_root_certs.h
11391140
LINT_CPP_EXCLUDE += $(LINT_CPP_ADDON_DOC_FILES)
@@ -1176,7 +1177,7 @@ tools/.cpplintstamp: $(LINT_CPP_FILES)
11761177

11771178
lint-addon-docs: test/addons/.docbuildstamp
11781179
@echo "Running C++ linter on addon docs..."
1179-
@$(PYTHON) tools/cpplint.py --filter=$(ADDON_DOC_LINT_FLAGS) $(LINT_CPP_ADDON_DOC_FILES)
1180+
@$(PYTHON) tools/cpplint.py --filter=$(ADDON_DOC_LINT_FLAGS) $(LINT_CPP_ADDON_DOC_FILES_GLOB)
11801181

11811182
cpplint: lint-cpp
11821183
@echo "Please use lint-cpp instead of cpplint"

‎configure‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,8 +1155,8 @@ def glob_to_var(dir_base, dir_sub, patch_dir):
11551155
def configure_intl(o):
11561156
icus = [
11571157
{
1158-
'url': 'https://ssl.icu-project.org/files/icu4c/60.2/icu4c-60_2-src.zip',
1159-
'md5': '115908818fd0324530b2acb1b029738d',
1158+
'url': 'https://ssl.icu-project.org/files/icu4c/61.1/icu4c-61_1-src.zip',
1159+
'md5': '780d8524c8a860ed8d8f6fe75cb7ce3f',
11601160
},
11611161
]
11621162
def icu_download(path):

‎deps/icu-small/LICENSE‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
22

3-
Copyright © 1991-2017 Unicode, Inc. All rights reserved.
4-
Distributed under the Terms of Use in http://www.unicode.org/copyright.html
3+
Copyright © 1991-2018 Unicode, Inc. All rights reserved.
4+
Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
55

66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of the Unicode data files and any associated documentation
@@ -383,3 +383,32 @@ Database section 7.
383383
# by ICANN or the IETF Trust on the database or the code. Any person
384384
# making a contribution to the database or code waives all rights to
385385
# future claims in that contribution or in the TZ Database.
386+
387+
6. Google double-conversion
388+
389+
Copyright 2006-2011, the V8 project authors. All rights reserved.
390+
Redistribution and use in source and binary forms, with or without
391+
modification, are permitted provided that the following conditions are
392+
met:
393+
394+
* Redistributions of source code must retain the above copyright
395+
notice, this list of conditions and the following disclaimer.
396+
* Redistributions in binary form must reproduce the above
397+
copyright notice, this list of conditions and the following
398+
disclaimer in the documentation and/or other materials provided
399+
with the distribution.
400+
* Neither the name of Google Inc. nor the names of its
401+
contributors may be used to endorse or promote products derived
402+
from this software without specific prior written permission.
403+
404+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
405+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
406+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
407+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
408+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
409+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
410+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
411+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
412+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
413+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
414+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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

Lines changed: 2 additions & 2 deletions
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 60 source files with the following exception(s):
5-
* deps/icu-small/source/data/in/icudt60l.dat : Reduced-size data file
4+
It is a strict subset of ICU 61 source files with the following exception(s):
5+
* deps/icu-small/source/data/in/icudt61l.dat : Reduced-size data file
66

77

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ static void set32x64Bits(uint32_t table[64], int32_t start, int32_t limit) {
100100
++lead;
101101
}
102102
if(lead<limitLead) {
103-
bits=~((1<<lead)-1);
103+
bits=~(((unsigned)1<<lead)-1);
104104
if(limitLead<0x20) {
105-
bits&=(1<<limitLead)-1;
105+
bits&=((unsigned)1<<limitLead)-1;
106106
}
107107
for(trail=0; trail<64; ++trail) {
108108
table[trail]|=bits;

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

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -59,58 +59,47 @@ LanguageBreakFactory::~LanguageBreakFactory() {
5959
******************************************************************
6060
*/
6161

62-
UnhandledEngine::UnhandledEngine(UErrorCode &/*status*/) {
63-
for (int32_t i = 0; i < UPRV_LENGTHOF(fHandled); ++i) {
64-
fHandled[i] = 0;
65-
}
62+
UnhandledEngine::UnhandledEngine(UErrorCode &status) : fHandled(nullptr) {
63+
(void)status;
6664
}
6765

6866
UnhandledEngine::~UnhandledEngine() {
69-
for (int32_t i = 0; i < UPRV_LENGTHOF(fHandled); ++i) {
70-
if (fHandled[i] != 0) {
71-
delete fHandled[i];
72-
}
73-
}
67+
delete fHandled;
68+
fHandled = nullptr;
7469
}
7570

7671
UBool
77-
UnhandledEngine::handles(UChar32 c, int32_t breakType) const {
78-
return (breakType >= 0 && breakType < UPRV_LENGTHOF(fHandled)
79-
&& fHandled[breakType] != 0 && fHandled[breakType]->contains(c));
72+
UnhandledEngine::handles(UChar32 c) const {
73+
return fHandled && fHandled->contains(c);
8074
}
8175

8276
int32_t
8377
UnhandledEngine::findBreaks( UText *text,
8478
int32_t /* startPos */,
8579
int32_t endPos,
86-
int32_t breakType,
8780
UVector32 &/*foundBreaks*/ ) const {
88-
if (breakType >= 0 && breakType < UPRV_LENGTHOF(fHandled)) {
89-
UChar32 c = utext_current32(text);
90-
while((int32_t)utext_getNativeIndex(text) < endPos && fHandled[breakType]->contains(c)) {
91-
utext_next32(text); // TODO: recast loop to work with post-increment operations.
92-
c = utext_current32(text);
93-
}
81+
UChar32 c = utext_current32(text);
82+
while((int32_t)utext_getNativeIndex(text) < endPos && fHandled->contains(c)) {
83+
utext_next32(text); // TODO: recast loop to work with post-increment operations.
84+
c = utext_current32(text);
9485
}
9586
return 0;
9687
}
9788

9889
void
99-
UnhandledEngine::handleCharacter(UChar32 c, int32_t breakType) {
100-
if (breakType >= 0 && breakType < UPRV_LENGTHOF(fHandled)) {
101-
if (fHandled[breakType] == 0) {
102-
fHandled[breakType] = new UnicodeSet();
103-
if (fHandled[breakType] == 0) {
104-
return;
105-
}
106-
}
107-
if (!fHandled[breakType]->contains(c)) {
108-
UErrorCode status = U_ZERO_ERROR;
109-
// Apply the entire script of the character.
110-
int32_t script = u_getIntPropertyValue(c, UCHAR_SCRIPT);
111-
fHandled[breakType]->applyIntPropertyValue(UCHAR_SCRIPT, script, status);
90+
UnhandledEngine::handleCharacter(UChar32 c) {
91+
if (fHandled == nullptr) {
92+
fHandled = new UnicodeSet();
93+
if (fHandled == nullptr) {
94+
return;
11295
}
11396
}
97+
if (!fHandled->contains(c)) {
98+
UErrorCode status = U_ZERO_ERROR;
99+
// Apply the entire script of the character.
100+
int32_t script = u_getIntPropertyValue(c, UCHAR_SCRIPT);
101+
fHandled->applyIntPropertyValue(UCHAR_SCRIPT, script, status);
102+
}
114103
}
115104

116105
/*
@@ -138,7 +127,7 @@ U_NAMESPACE_BEGIN
138127
static UMutex gBreakEngineMutex = U_MUTEX_INITIALIZER;
139128

140129
const LanguageBreakEngine *
141-
ICULanguageBreakFactory::getEngineFor(UChar32 c, int32_t breakType) {
130+
ICULanguageBreakFactory::getEngineFor(UChar32 c) {
142131
const LanguageBreakEngine *lbe = NULL;
143132
UErrorCode status = U_ZERO_ERROR;
144133

@@ -156,26 +145,26 @@ ICULanguageBreakFactory::getEngineFor(UChar32 c, int32_t breakType) {
156145
int32_t i = fEngines->size();
157146
while (--i >= 0) {
158147
lbe = (const LanguageBreakEngine *)(fEngines->elementAt(i));
159-
if (lbe != NULL && lbe->handles(c, breakType)) {
148+
if (lbe != NULL && lbe->handles(c)) {
160149
return lbe;
161150
}
162151
}
163152
}
164153

165154
// We didn't find an engine. Create one.
166-
lbe = loadEngineFor(c, breakType);
155+
lbe = loadEngineFor(c);
167156
if (lbe != NULL) {
168157
fEngines->push((void *)lbe, status);
169158
}
170159
return lbe;
171160
}
172161

173162
const LanguageBreakEngine *
174-
ICULanguageBreakFactory::loadEngineFor(UChar32 c, int32_t breakType) {
163+
ICULanguageBreakFactory::loadEngineFor(UChar32 c) {
175164
UErrorCode status = U_ZERO_ERROR;
176165
UScriptCode code = uscript_getScript(c, &status);
177166
if (U_SUCCESS(status)) {
178-
DictionaryMatcher *m = loadDictionaryMatcherFor(code, breakType);
167+
DictionaryMatcher *m = loadDictionaryMatcherFor(code);
179168
if (m != NULL) {
180169
const LanguageBreakEngine *engine = NULL;
181170
switch(code) {
@@ -236,7 +225,7 @@ ICULanguageBreakFactory::loadEngineFor(UChar32 c, int32_t breakType) {
236225
}
237226

238227
DictionaryMatcher *
239-
ICULanguageBreakFactory::loadDictionaryMatcherFor(UScriptCode script, int32_t /* brkType */) {
228+
ICULanguageBreakFactory::loadDictionaryMatcherFor(UScriptCode script) {
240229
UErrorCode status = U_ZERO_ERROR;
241230
// open root from brkitr tree.
242231
UResourceBundle *b = ures_open(U_ICUDATA_BRKITR, "", &status);

0 commit comments

Comments
 (0)