restructure string decoding to support iterable use and include benchmarks for UTF-8 decoding.

utils/string_encoding/utf16.dart

Index: utils/string_encoding/utf16.dart
diff --git a/utils/string_encoding/utf16.dart b/utils/string_encoding/utf16.dart
index 12fde6dec9726e509edbd6bef3d817adc1a893c5..be6df4c4342fcd93fa0c4b43179654f68f3804e9 100644
--- a/utils/string_encoding/utf16.dart
+++ b/utils/string_encoding/utf16.dart
@@ -7,83 +7,127 @@
 #import("unicode.dart");
 
 /**
- * Produce a String from a sequence of UTF-16 encoded bytes. The parameters
- * allow an offset into a list of bytes (as int), limiting the length of the
- * values be decoded and the ability of override the default Unicode
- * replacement character. Set the replacementCharacter to null to throw an
+ * Decodes the UTF-16 bytes as an iterable. Thus, the consumer can only convert
+ * as much of the input as needed. Determines the byte order from the BOM,
+ * or uses big-endian as a default. This method always strips a leading BOM.
+ * Set the replacementCharacter to null to throw an IllegalArgumentException
+ * rather than replace the bad value.
+ */
+IterableUtf16Decoder decodeUtf16AsIterable(List<int> bytes, [int offset = 0,
+    int length, int replacementCodepoint =
+    UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) {
+  return new IterableUtf16Decoder._(
+      () => new Utf16BytesToCodeUnitsDecoder(bytes, offset, length,
+      replacementCodepoint), replacementCodepoint);
+}
+
+/**
+ * Decodes the UTF-16BE bytes as an iterable. Thus, the consumer can only convert

[Søren Gjesse, 2012/02/16 15:08:18]

Long line.

This is repeated in 3 other places.

[dcarlson, 2012/02/17 17:32:33]

Done.

+ * as much of the input as needed. This method strips a leading BOM by default,
+ * but can be overridden by setting the optional parameter [stripBom] to false.
+ * Set the replacementCharacter to null to throw an IllegalArgumentException

[Søren Gjesse, 2012/02/16 15:08:18]

replacementCharacter in []s. Maybe also explain the default value for
replacementCharacter.

This is repeated in other places.

[dcarlson, 2012/02/17 17:32:33]

Done.

+ * rather than replace the bad value.
+ */
+IterableUtf16Decoder decodeUtf16beAsIterable(List<int> bytes, [int offset = 0,
+    int length, bool stripBom = true, int replacementCodepoint =
+    UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) {
+  return new IterableUtf16Decoder._(
+      () => new Utf16beBytesToCodeUnitsDecoder(bytes, offset, length, stripBom,
+      replacementCodepoint), replacementCodepoint);
+}
+
+/**
+ * Decodes the UTF-16LE bytes as an iterable. Thus, the consumer can only convert
+ * as much of the input as needed. This method strips a leading BOM by default,
+ * but can be overridden by setting the optional parameter [stripBom] to false.
+ * Set the replacementCharacter to null to throw an IllegalArgumentException
+ * rather than replace the bad value.
+ */
+IterableUtf16Decoder decodeUtf16leAsIterable(List<int> bytes, [int offset = 0,
+    int length, bool stripBom = true, int replacementCodepoint =
+    UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) {
+  return new IterableUtf16Decoder._(
+      () => new Utf16leBytesToCodeUnitsDecoder(bytes, offset, length, stripBom,
+      replacementCodepoint), replacementCodepoint);
+}
+
+/**
+ * Produce a String from a sequence of UTF-16 encoded bytes. This method always
+ * strips a leading BOM. Set the replacementCharacter to null to throw  an
  * IllegalArgumentException rather than replace the bad value.
  */
-String decodeFromUtf16(List<int> bytes, [int offset = 0, int length,
+String decodeUtf16(List<int> bytes, [int offset = 0, int length,
     int replacementCodepoint = UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) {
-  List<int> codeUnits =
-      _utf16ToUtf16CodeUnits(bytes, offset, length);
+  Utf16BytesToCodeUnitsDecoder decoder = new Utf16BytesToCodeUnitsDecoder(bytes,
+      offset, length, replacementCodepoint);
+  List<int> codeunits = decoder.decodeRest();
   // TODO is16BitCodeUnit() is used to work around a bug with frog/dartc
   // (http://code.google.com/p/dart/issues/detail?id=1357). Consider
   // removing after this issue is resolved.
   if (is16BitCodeUnit()) {
-    return new String.fromCharCodes(codeUnits);
+    return new String.fromCharCodes(codeunits);
   } else {
     return new String.fromCharCodes(
-        utf16CodeUnitsToCodepoints(codeUnits, 0, null, replacementCodepoint));
+        utf16CodeUnitsToCodepoints(codeunits, 0, null, replacementCodepoint));
   }
 }
 
 /**
- * Produce a String from a sequence of UTF-16BE encoded bytes. The parameters
- * allow an offset into a list of bytes (as int), limiting the length of the
- * values be decoded and the ability of override the default Unicode
- * replacement character. Set the replacementCharacter to null to throw an
- * IllegalArgumentException rather than replace the bad value.
+ * Produce a String from a sequence of UTF-16BE encoded bytes. This method
+ * strips a leading BOM by default, but can be overridden by setting the
+ * optional parameter [stripBom] to false. Set the replacementCharacter to null
+ * to throw an IllegalArgumentException rather than replace the bad value.
  */
-String decodeFromUtf16be(List<int> bytes, [int offset = 0, int length,
+String decodeUtf16be(List<int> bytes, [int offset = 0, int length,
     bool stripBom = true,
     int replacementCodepoint = UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) {
-  List<int> codeUnits =
-      _utf16beToUtf16CodeUnits(bytes, offset, length, stripBom);
+  List<int> codeunits = (new Utf16beBytesToCodeUnitsDecoder(bytes, offset,
+      length, stripBom, replacementCodepoint)).decodeRest();
   // TODO is16BitCodeUnit() is used to work around a bug with frog/dartc
   // (http://code.google.com/p/dart/issues/detail?id=1357). Consider
   // removing after this issue is resolved.
   if (is16BitCodeUnit()) {
-    return new String.fromCharCodes(codeUnits);
+    return new String.fromCharCodes(codeunits);
   } else {
     return new String.fromCharCodes(
-        utf16CodeUnitsToCodepoints(codeUnits, 0, null, replacementCodepoint));
+        utf16CodeUnitsToCodepoints(codeunits, 0, null, replacementCodepoint));
   }
 }
 
 /**
- * Produce a String from a sequence of UTF-16LE encoded bytes. The parameters
- * allow an offset into a list of bytes (as int), limiting the length of the
- * values be decoded and the ability of override the default Unicode
- * replacement character. Set the replacementCharacter to null to throw an
- * IllegalArgumentException rather than replace the bad value.
+ * Produce a String from a sequence of UTF-16LE encoded bytes. This method
+ * strips a leading BOM by default, but can be overridden by setting the
+ * optional parameter [stripBom] to false. Set the replacementCharacter to null
+ * to throw an IllegalArgumentException rather than replace the bad value.
  */
-String decodeFromUtf16le(List<int> bytes, [int offset = 0, int length,
+String decodeUtf16le(List<int> bytes, [int offset = 0, int length,
     bool stripBom = true,
     int replacementCodepoint = UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) {
-  List<int> codeUnits =
-      _utf16leToUtf16CodeUnits(bytes, offset, length, stripBom);
+  List<int> codeunits = (new Utf16leBytesToCodeUnitsDecoder(bytes, offset,
+      length, stripBom, replacementCodepoint)).decodeRest();
   // TODO is16BitCodeUnit() is used to work around a bug with frog/dartc
   // (http://code.google.com/p/dart/issues/detail?id=1357). Consider
   // removing after this issue is resolved.
   if (is16BitCodeUnit()) {
-    return new String.fromCharCodes(codeUnits);
+    return new String.fromCharCodes(codeunits);
   } else {
     return new String.fromCharCodes(
-        utf16CodeUnitsToCodepoints(codeUnits, 0, null, replacementCodepoint));
+        utf16CodeUnitsToCodepoints(codeunits, 0, null, replacementCodepoint));
   }
 }
 
 /**
- * Produce a sequence of UTF-16 encoded bytes.
+ * Produce a list of UTF-16 encoded bytes. This method prefixes the resulting
+ * bytes with a big-endian byte-order-marker.
  */
-List<int> encodeAsUtf16(String str) =>
-    encodeAsUtf16be(str, true);
+List<int> encodeUtf16(String str) =>
+    encodeUtf16be(str, true);
 
 /**
- * Produce a sequence of UTF-16BE encoded bytes.
+ * Produce a list of UTF-16BE encoded bytes. By default, this method produces
+ * UTF-16BE bytes with no BOM.
  */
-List<int> encodeAsUtf16be(String str, [bool writeBOM = false]) {
+List<int> encodeUtf16be(String str, [bool writeBOM = false]) {
   List<int> utf16CodeUnits = _stringToUtf16CodeUnits(str);
   List<int> encoding =
       new List<int>(2 * utf16CodeUnits.length + (writeBOM ? 2 : 0));
@@ -100,9 +144,10 @@ List<int> encodeAsUtf16be(String str, [bool writeBOM = false]) {
 }
 
 /**
- * Produce a sequence of UTF-16LE encoded bytes.
+ * Produce a list of UTF-16LE encoded bytes. By default, this method produces
+ * UTF-16LE bytes with no BOM.
  */
-List<int> encodeAsUtf16le(String str, [bool writeBOM = false]) {
+List<int> encodeUtf16le(String str, [bool writeBOM = false]) {
   List<int> utf16CodeUnits = _stringToUtf16CodeUnits(str);
   List<int> encoding =
       new List<int>(2 * utf16CodeUnits.length + (writeBOM ? 2 : 0));
@@ -118,52 +163,37 @@ List<int> encodeAsUtf16le(String str, [bool writeBOM = false]) {
   return encoding;
 }
 
+/**
+ * Identifies whether a List of bytes starts (based on offset) with a
+ * byte-order marker (BOM).
+ */
 bool hasUtf16Bom(List<int> utf32EncodedBytes, [int offset = 0, int length]) {
   return hasUtf16beBom(utf32EncodedBytes, offset, length) ||
       hasUtf16leBom(utf32EncodedBytes, offset, length);
 }
 
+/**
+ * Identifies whether a List of bytes starts (based on offset) with a
+ * big-endian byte-order marker (BOM).
+ */
 bool hasUtf16beBom(List<int> utf16EncodedBytes, [int offset = 0, int length]) {
-  if (!(offset >= 0)) {
-    throw new IllegalArgumentException("offset");
-  }
-
-  if (!(length == null || length >= 0)) {
-    throw new IllegalArgumentException("length");
-  }
-
-  int end = length != null ?
-      Math.min(utf16EncodedBytes.length, offset + length) :
-      utf16EncodedBytes.length;
-
+  int end = length != null ? offset + length : utf16EncodedBytes.length;
   return (offset + 2) <= end &&
       utf16EncodedBytes[offset] == UNICODE_UTF_BOM_HI &&
       utf16EncodedBytes[offset + 1] == UNICODE_UTF_BOM_LO;
 }
 
+/**
+ * Identifies whether a List of bytes starts (based on offset) with a
+ * little-endian byte-order marker (BOM).
+ */
 bool hasUtf16leBom(List<int> utf16EncodedBytes, [int offset = 0, int length]) {
-  if (!(offset >= 0)) {
-    throw new IllegalArgumentException("offset");
-  }
-
-  if (!(length == null || length >= 0)) {
-    throw new IllegalArgumentException("length");
-  }
-
-  int end = length != null ?
-      Math.min(utf16EncodedBytes.length, offset + length) :
-      utf16EncodedBytes.length;
-
+  int end = length != null ? offset + length : utf16EncodedBytes.length;
   return (offset + 2) <= end &&
       utf16EncodedBytes[offset] == UNICODE_UTF_BOM_LO &&
       utf16EncodedBytes[offset + 1] == UNICODE_UTF_BOM_HI;
 }
 
-int _sizeCodeUnits(int utf16CodeUnitsLength) {
-  int v = ((utf16CodeUnitsLength)/2).floor().toInt();
-  return v;
-}
-
 List<int> _stringToUtf16CodeUnits(String str) {
   // TODO is16BitCodeUnit() is used to work around a bug with frog/dartc
   // (http://code.google.com/p/dart/issues/detail?id=1357). Consider
@@ -176,98 +206,137 @@ List<int> _stringToUtf16CodeUnits(String str) {
 }
 
 /**
- * Convert UTF-16BE encoded bytes to utf16 code units by grouping 1-2 bytes
- * to produce the code unit (0-(2^16)-1).
+ * Return type of [decodeUtf16AsIterable] and variants. The Iterable type
+ * provides an iterator on demand and the iterator will only translate bytes
+ * as requested by the user of the iterator. (Note: results are not cached.)
  */
-List<int> _utf16beToUtf16CodeUnits(
-    List<int> utf16beEncodedBytes, [int offset = 0, int length,
-    bool stripBom = true]) {
-  if (!(offset >= 0)) {
-    throw new IllegalArgumentException("offset");
-  }
+class IterableUtf16Decoder implements Iterable<int> {
+  final Function codeunitsProvider;
+  final int replacementCodepoint;
 
-  if (!(length == null || length >= 0)) {
-    throw new IllegalArgumentException("length");
-  }
+  IterableUtf16Decoder._(ListRangeIterator<int> this.codeunitsProvider(),
+      int this.replacementCodepoint);
 
-  int end = length != null ?
-      Math.min(utf16beEncodedBytes.length, offset + length) :
-      utf16beEncodedBytes.length;
-
-  int i = (stripBom && hasUtf16beBom(utf16beEncodedBytes, offset, length)) ?
-      offset + 2 : offset;
-  List<int> codeUnits =
-      new List<int>(_sizeCodeUnits(end - i));
-  int lastIndex = end - 1;
-  int j = 0;
-  while (i < lastIndex) {
-    int hi = utf16beEncodedBytes[i++];
-    int lo = utf16beEncodedBytes[i++];
-    codeUnits[j++] = (hi << 8) | lo;
-  }
-  return codeUnits;
+  Utf16CodeUnitDecoder iterator() =>
+      new Utf16CodeUnitDecoder.fromListRangeIterator(codeunitsProvider(),
+          replacementCodepoint);
 }
 
 /**
- * Convert UTF-16LE encoded bytes to utf16 code units by grouping 1-2 bytes
- * to produce the code unit (0-(2^16)-1).
+ * Convert UTF-16 encoded bytes to UTF-16 code units by grouping 1-2 bytes
+ * to produce the code unit (0-(2^16)-1). Relies on BOM to determine
+ * endian-ness, and defaults to BE.
  */
-List<int> _utf16leToUtf16CodeUnits(
-    List<int> utf16leEncodedBytes, [int offset = 0, int length,
-    bool stripBom = true]) {
-  if (!(offset >= 0)) {
-    throw new IllegalArgumentException("offset");
+class Utf16BytesToCodeUnitsDecoder implements ListRangeIterator<int> {
+  final ListRangeIterator<int> utf16EncodedBytesIterator;
+  final int replacementCodepoint;
+
+  Utf16BytesToCodeUnitsDecoder._fromListRangeIterator(
+      ListRangeIterator<int> this.utf16EncodedBytesIterator,
+      int this.replacementCodepoint);
+
+  factory Utf16BytesToCodeUnitsDecoder(List<int> utf16EncodedBytes, [
+      int offset = 0, int length,
+      int replacementCodepoint = UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) {
+    int _length = length != null ? length : utf16EncodedBytes.length - offset;

[Søren Gjesse, 2012/02/16 15:08:18]

Can't you just use length instead of introducing _length?

[dcarlson, 2012/02/17 17:32:33]

Done.

+    if (hasUtf16beBom(utf16EncodedBytes, offset, _length)) {
+      return new Utf16beBytesToCodeUnitsDecoder(utf16EncodedBytes, offset + 2,
+          _length - 2, false, replacementCodepoint);
+    } else if (hasUtf16leBom(utf16EncodedBytes, offset, _length)) {
+      return new Utf16leBytesToCodeUnitsDecoder(utf16EncodedBytes, offset + 2,
+          _length - 2, false, replacementCodepoint);
+    } else {
+      return new Utf16beBytesToCodeUnitsDecoder(utf16EncodedBytes, offset,
+          _length, false, replacementCodepoint);
+    }
   }
 
-  if (!(length == null || length >= 0)) {
-    throw new IllegalArgumentException("length");
+  List<int> decodeRest() {
+    List<int> codeunits = new List<int>(remaining);
+    int i = 0;
+    while (hasNext()) {
+      codeunits[i++] = next();
+    }
+    if (i == codeunits.length) {
+      return codeunits;
+    } else {
+      List<int> truncCodeunits = new List<int>(i);
+      truncCodeunits.setRange(0, i, codeunits);
+      return truncCodeunits;
+    }
   }
 
-  int end = length != null ?
-      Math.min(utf16leEncodedBytes.length, offset + length) :
-      utf16leEncodedBytes.length;
-
-  int i = (stripBom && hasUtf16leBom(utf16leEncodedBytes, offset, length)) ?
-      offset + 2 : offset;
-  List<int> codeUnits =
-      new List<int>(_sizeCodeUnits(end - i));
-  int lastIndex = end - 1;
-  int j = 0;
-  while (i < lastIndex) {
-    int lo = utf16leEncodedBytes[i++];
-    int hi = utf16leEncodedBytes[i++];
-    codeUnits[j] = (hi << 8) | lo;
+  bool hasNext() => utf16EncodedBytesIterator.hasNext();
+
+  int next() {
+    if (utf16EncodedBytesIterator.remaining < 2) {
+      utf16EncodedBytesIterator.next();
+      if (replacementCodepoint != null) {
+        return replacementCodepoint;
+      } else {
+        throw new IllegalArgumentException(
+            "Invalid UTF16 at ${utf16EncodedBytesIterator.position}");
+      }
+    } else {
+      return decode();
+    }
+  }
+
+  int get position() => utf16EncodedBytesIterator.position ~/ 2;
+
+  void backup([int by = 1]) {
+    utf16EncodedBytesIterator.backup(2 * by);
   }
-  return codeUnits;
+
+  int get remaining() => (utf16EncodedBytesIterator.remaining + 1) ~/ 2;
+
+  void skip([int count = 1]) {
+    utf16EncodedBytesIterator.skip(2 * count);
+  }
+
+  abstract int decode();
 }
 
 /**
- * Convert UTF-16 encoded bytes to utf16 code units by grouping 1-2 bytes
- * to produce the code unit (0-(2^16)-1). Relies on BOM to determine
- * endian-ness, and defaults to BE.
+ * Convert UTF-16BE encoded bytes to utf16 code units by grouping 1-2 bytes
+ * to produce the code unit (0-(2^16)-1).
  */
-List<int> _utf16ToUtf16CodeUnits(
-    List<int> utf16EncodedBytes, [int offset = 0, int length]) {
-  if (!(offset >= 0)) {
-    throw new IllegalArgumentException("offset");
+class Utf16beBytesToCodeUnitsDecoder extends Utf16BytesToCodeUnitsDecoder {
+  Utf16beBytesToCodeUnitsDecoder(List<int> utf16EncodedBytes, [
+      int offset = 0, int length, bool stripBom = true,
+      int replacementCodepoint = UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) :
+      super._fromListRangeIterator((new ListRange(utf16EncodedBytes, offset,
+      length)).iterator(), replacementCodepoint) {
+    if (stripBom && hasUtf16beBom(utf16EncodedBytes, offset, length)) {
+      skip();
+    }
   }
 
-  if (!(length == null || length >= 0)) {
-    throw new IllegalArgumentException("length");
+  int decode() {
+    int hi = utf16EncodedBytesIterator.next();
+    int lo = utf16EncodedBytesIterator.next();
+    return (hi << 8) + lo;
   }
+}
 
-  int end = length != null ?
-      Math.min(utf16EncodedBytes.length, offset + length) :
-      utf16EncodedBytes.length;
+/**
+ * Convert UTF-16LE encoded bytes to utf16 code units by grouping 1-2 bytes
+ * to produce the code unit (0-(2^16)-1).
+ */
+class Utf16leBytesToCodeUnitsDecoder extends Utf16BytesToCodeUnitsDecoder {
+  Utf16leBytesToCodeUnitsDecoder(List<int> utf16EncodedBytes, [
+      int offset = 0, int length, bool stripBom = true,
+      int replacementCodepoint = UNICODE_REPLACEMENT_CHARACTER_CODEPOINT]) :
+      super._fromListRangeIterator((new ListRange(utf16EncodedBytes, offset,
+      length)).iterator(), replacementCodepoint) {
+    if (stripBom && hasUtf16leBom(utf16EncodedBytes, offset, length)) {
+      skip();
+    }
+  }
 
-  if (hasUtf16beBom(utf16EncodedBytes, offset, length)) {
-    return _utf16beToUtf16CodeUnits(utf16EncodedBytes, offset + 2,
-        end - (offset + 2), false);
-  } else if (hasUtf16leBom(utf16EncodedBytes, offset, length)) {
-    return _utf16leToUtf16CodeUnits(utf16EncodedBytes, offset + 2,
-        end - (offset + 2), false);
-  } else {
-    return _utf16beToUtf16CodeUnits(
-        utf16EncodedBytes, offset, end - offset, false);
+  int decode() {
+    int lo = utf16EncodedBytesIterator.next();
+    int hi = utf16EncodedBytesIterator.next();
+    return (hi << 8) + lo;
   }
 }