Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Unified Diff: sdk/lib/convert/utf.dart

Issue 736583008: Make Utf8Decoder and Utf8Encoder's convert methods take start and end too. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/lib/convert/utf8_encode_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/convert/utf.dart
diff --git a/sdk/lib/convert/utf.dart b/sdk/lib/convert/utf.dart
index 2fcb915c9a52a83d5ac5196e96c7ad8b87a68782..e853c45fb6acb9486314063efc64640ace68d666 100644
--- a/sdk/lib/convert/utf.dart
+++ b/sdk/lib/convert/utf.dart
@@ -84,14 +84,28 @@ class Utf8Encoder extends Converter<String, List<int>> {
* Converts [string] to its UTF-8 code units (a list of
* unsigned 8-bit integers).
floitsch 2014/11/19 13:19:58 Update comment.
*/
- List<int> convert(String string) {
+ List<int> convert(String string, [int start = 0, int end]) {
floitsch 2014/11/19 13:19:58 Make it named?
Lasse Reichstein Nielsen 2014/11/19 13:25:00 I'd rather not use named parameters. That's a lot
+ int stringLength = string.length;
+ if (start < 0 || start > stringLength) {
+ throw new RangeError.range(start, 0, stringLength, "start");
+ }
+ if (end == null) {
+ end = stringLength;
+ } else if (end < start || end > stringLength) {
+ throw new RangeError.range(end, start, stringLength, "end");
+ }
+ int length = end - start;
+ if (length == 0) return new Uint8List(0);
// Create a new encoder with a length that is guaranteed to be big enough.
- // A single code unit uses at most 3 bytes. Two code units at most 4.
- _Utf8Encoder encoder = new _Utf8Encoder.withBufferSize(string.length * 3);
- int endPosition = encoder._fillBuffer(string, 0, string.length);
- assert(endPosition >= string.length - 1);
- if (endPosition != string.length) {
- int lastCodeUnit = string.codeUnitAt(string.length - 1);
+ // A single code unit uses at most 3 bytes, a surrogate pair at most 4.
+ _Utf8Encoder encoder = new _Utf8Encoder.withBufferSize(length * 3);
+ int endPosition = encoder._fillBuffer(string, start, end);
+ assert(endPosition >= end - 1);
+ if (endPosition != end) {
+ // Encoding skipped the last code unit.
+ // That can only happen if the last code unit is a leadsurrogate.
+ // Force encoding of the lead surrogate by itself.
+ int lastCodeUnit = string.codeUnitAt(end - 1);
assert(_isLeadSurrogate(lastCodeUnit));
// We use a non-surrogate as `nextUnit` so that _writeSurrogate just
// writes the lead-surrogate.
@@ -313,13 +327,25 @@ class Utf8Decoder extends Converter<List<int>, String> {
* Converts the UTF-8 [codeUnits] (a list of unsigned 8-bit integers) to the
* corresponding string.
*
+ * Uses the code units from [start] to, but no including, [end].
+ * If [end] is omitted, it defaults to `codeUnits.length`.
+ *
* If the [codeUnits] start with a leading [UNICODE_BOM_CHARACTER_RUNE] this
* character is discarded.
*/
- String convert(List<int> codeUnits) {
+ String convert(List<int> codeUnits, [int start = 0, int end]) {
floitsch 2014/11/19 13:19:57 ditto.
+ int length = codeUnits.length;
+ if (start < 0 || start > length) {
+ throw new RangeError.range(start, 0, length, "start");
+ }
+ if (end == null) {
+ end = length;
+ } else if (end < start || end > length) {
+ throw new RangeError.range(end, start, length, "end");
+ }
StringBuffer buffer = new StringBuffer();
_Utf8Decoder decoder = new _Utf8Decoder(buffer, _allowMalformed);
- decoder.convert(codeUnits, 0, codeUnits.length);
+ decoder.convert(codeUnits, start, end);
decoder.close();
return buffer.toString();
}
« no previous file with comments | « no previous file | tests/lib/convert/utf8_encode_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698