1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

punycode: update to v1.1.1

Browse Source
This commit is contained in:
Mathias Bynens 2012-06-27 17:47:07 +02:00 committed by Ben Noordhuis
parent 41b129fbde
commit 2ba96451a9
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/punycode.js
View File

@ -35,8 +35,6 @@
/** Error messages */ /** Error messages */
errors = { errors = {
'overflow': 'Overflow: input needs wider integers to process.', 'overflow': 'Overflow: input needs wider integers to process.',
'ucs2decode': 'UCS-2(decode): illegal sequence',
'ucs2encode': 'UCS-2(encode): illegal value',
'not-basic': 'Illegal input >= 0x80 (not a basic code point)', 'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
'invalid-input': 'Invalid input' 'invalid-input': 'Invalid input'
}, },
@ -112,14 +110,17 @@
extra; extra;
while (counter < length) { while (counter < length) {
value = string.charCodeAt(counter++); value = string.charCodeAt(counter++);
if ((value & 0xF800) == 0xD800) { if ((value & 0xF800) == 0xD800 && counter < length) {
// high surrogate, and there is a next character
extra = string.charCodeAt(counter++); extra = string.charCodeAt(counter++);
if ((value & 0xFC00) != 0xD800 || (extra & 0xFC00) != 0xDC00) { if ((extra & 0xFC00) == 0xDC00) { // low surrogate
error('ucs2decode'); output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
} else {
output.push(value, extra);
} }
value = ((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000; } else {
output.push(value);
} }
output.push(value);
} }
return output; return output;
} }
@ -135,9 +136,6 @@
function ucs2encode(array) { function ucs2encode(array) {
return map(array, function(value) { return map(array, function(value) {
var output = ''; var output = '';
if ((value & 0xF800) == 0xD800) {
error('ucs2encode');
}
if (value > 0xFFFF) { if (value > 0xFFFF) {
value -= 0x10000; value -= 0x10000;
output += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800); output += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800);
@ -472,7 +470,7 @@
* @memberOf punycode * @memberOf punycode
* @type String * @type String
*/ */
'version': '1.0.0', 'version': '1.1.1',
/** /**
* An object of methods to convert from JavaScript's internal character * An object of methods to convert from JavaScript's internal character
* representation (UCS-2) to decimal Unicode code points, and back. * representation (UCS-2) to decimal Unicode code points, and back.

13
test/simple/test-punycode.js
View File

@ -179,4 +179,17 @@ for (var encoded in tests) {
} }
} }
// BMP code point
assert.equal(punycode.ucs2.encode([0x61]), 'a');
// supplementary code point (surrogate pair)
assert.equal(punycode.ucs2.encode([0x1D306]), '\uD834\uDF06');
// high surrogate
assert.equal(punycode.ucs2.encode([0xD800]), '\uD800');
// high surrogate followed by non-surrogates
assert.equal(punycode.ucs2.encode([0xD800, 0x61, 0x62]), '\uD800ab');
// low surrogate
assert.equal(punycode.ucs2.encode([0xDC00]), '\uDC00');
// low surrogate followed by non-surrogates
assert.equal(punycode.ucs2.encode([0xDC00, 0x61, 0x62]), '\uDC00ab');
assert.equal(errors, 0); assert.equal(errors, 0);