fixed windows-1255 \u05BA decoding

odahcam · odahcam · commit ee0acb8b6fc3 · 2020-05-13T19:04:35.000-03:00
diff --git a/src/coders/single-byte/SingleByteDecoder.ts b/src/coders/single-byte/SingleByteDecoder.ts
@@ -1,7 +1,6 @@
 import { Stream } from "../../common/Stream";
 import { decoderError } from "../../encoding/encodings";
 import { finished } from "../../encoding/finished";
-import { index } from "../../encoding/indexes";
 import { end_of_stream, isASCIIByte } from "../../encoding/terminology";
 
 /**
@@ -14,7 +13,7 @@ export class SingleByteDecoder {
 
   readonly fatal: boolean;
 
-  constructor(index: Array<number>, options: { fatal: boolean; }) {
+  constructor(private readonly index: Array<number>, options: { fatal: boolean; }) {
     this.fatal = options.fatal;
   }
 
@@ -37,10 +36,10 @@ export class SingleByteDecoder {
 
     // 3. Let code point be the index code point for byte − 0x80 in
     // index single-byte.
-    const code_point = index[bite - 0x80];
+    const code_point = this.index[bite - 0x80];
 
     // 4. If code point is null, return error.
-    if (code_point === null)
+    if (!code_point)
       return decoderError(this.fatal);
 
     // 5. Return a code point whose value is code point.
diff --git a/src/common/TextDecoder.ts b/src/common/TextDecoder.ts
@@ -178,7 +178,7 @@ export class TextDecoder {
       if (result === finished)
         break;
 
-      if (result !== null) {
+      if (result) {
         if (Array.isArray(result))
           output.push.apply(output, /**@type {!Array.<number>}*/(result));
         else
@@ -196,7 +196,7 @@ export class TextDecoder {
         result = this._decoder.handler(input_stream, input_stream.read());
         if (result === finished)
           break;
-        if (result === null)
+        if (!result)
           continue;
         if (Array.isArray(result))
           output.push.apply(output, /**@type {!Array.<number>}*/(result));
diff --git a/test/browser/test-misc.js b/test/browser/test-misc.js
@@ -386,8 +386,8 @@ test(function() {
   assert_array_equals([].slice.call(encoder.encode(0)), [48]);
 }, 'encode() called with falsy arguments (polyfill bindings)');
 
-// test(function() {
-//   // Regression test for https://github.com/inexorabletash/text-encoding/issues/59
-//   assert_array_equals(
-//     new TextEncoding.TextDecoder('windows-1255').decode(new Uint8Array([0xCA])), '\u05BA');
-// }, 'windows-1255 map 0xCA to U+05BA');
+test(function() {
+  // Regression test for https://github.com/inexorabletash/text-encoding/issues/59
+  assert_array_equals(
+    new TextEncoding.TextDecoder('windows-1255').decode(new Uint8Array([0xCA])), '\u05BA');
+}, 'windows-1255 map 0xCA to U+05BA');
diff --git a/test/node/test-misc.spec.js b/test/node/test-misc.spec.js
@@ -399,10 +399,10 @@ describe('Miscellaneous tests', () => {
     assert_array_equals([].slice.call(encoder.encode(0)), [48]);
   });
 
-  it.skip('windows-1255 map 0xCA to U+05BA', () => {
+  it('windows-1255 map 0xCA to U+05BA', () => {
     // Regression test for https://github.com/inexorabletash/text-encoding/issues/59
     assert_equals(
-      new TextDecoder('windows-1255').decode(new Uint8Array([0xCD])), 
+      new TextDecoder('windows-1255').decode(new Uint8Array([0xCA])), 
       '\u05BA'
     );
   });
