Revert OneByteString back to ISO Latin-1 instead of ASCII

runtime/vm/unicode.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/unicode.h"
 
 #include "vm/allocation.h"
 #include "vm/globals.h"
 #include "vm/object.h"
 
@@ skipping 40 matching lines @@
   0xFFFFFFFF,
   0xFFFFFFFF
 };
 
 
 static bool IsTrailByte(uint8_t code_unit) {
   return (code_unit & 0xc0) == 0x80;
 }
 
 
-static bool IsAsciiSequenceStart(uint8_t code_unit) {
-  // Check is codepoint is <= U+007F
+static bool IsLatin1SequenceStart(uint8_t code_unit) {
+  // Check is codepoint is <= U+00FF
   return (code_unit <= Utf8::kMaxOneByteChar);
 }
 
 
 static bool IsSmpSequenceStart(uint8_t code_unit) {
   // Check is codepoint is >= U+10000.
   return (code_unit >= 0xF0);
 }
 
 
@@ skipping 21 matching lines @@
   dst[0] = (Utf8::kLeadOffset + (codepoint >> 10));
   dst[1] = (0xDC00 + (codepoint & 0x3FF));
 }
 
 
 // Returns a count of the number of UTF-8 trail bytes.
 intptr_t Utf8::CodePointCount(const uint8_t* utf8_array,
                               intptr_t array_len,
                               Type* type) {
   intptr_t len = 0;
-  Type char_type = kAscii;
+  Type char_type = kLatin1;
   for (intptr_t i = 0; i < array_len; i++) {
     uint8_t code_unit = utf8_array[i];
     if (!IsTrailByte(code_unit)) {
       ++len;
     }
-    if (!IsAsciiSequenceStart(code_unit)) {  // > U+007F
+    if (!IsLatin1SequenceStart(code_unit)) {  // > U+00FF
       if (IsSmpSequenceStart(code_unit)) {  // >= U+10000
         char_type = kSMP;
         ++len;
-      } else if (char_type == kAscii) {
+      } else if (char_type == kLatin1) {
         char_type = kBMP;
       }
     }
   }
   *type = char_type;
   return len;
 }
 
 
 // Returns true if str is a valid NUL-terminated UTF-8 string.
@@ skipping 119 matching lines @@
           !IsSurrogate(ch))) {
       *dst = -1;
       return 0;
     }
   }
   *dst = ch;
   return i;
 }
 
 
-bool Utf8::DecodeToAscii(const uint8_t* utf8_array,
-                         intptr_t array_len,
-                         uint8_t* dst,
-                         intptr_t len) {
-  if (len < array_len) {
+bool Utf8::DecodeToLatin1(const uint8_t* utf8_array,
+                          intptr_t array_len,
+                          uint8_t* dst,
+                          intptr_t len) {
+  intptr_t i = 0;
+  intptr_t j = 0;
+  intptr_t num_bytes;
+  for (; (i < array_len) && (j < len); i += num_bytes, ++j) {
+    int32_t ch;
+    ASSERT(IsLatin1SequenceStart(utf8_array[i]));
+    num_bytes = Utf8::Decode(&utf8_array[i], (array_len - i), &ch);
+    if (ch == -1) {
+      return false;  // invalid input
+    }
+    ASSERT(ch <= 0xff);
+    dst[j] = ch;
+  }
+  if ((i < array_len) && (j == len)) {
     return false;  // output overflow
   }
-#ifdef DEBUG
-  for (intptr_t i = 0; i < array_len; i++) {
-    ASSERT(IsAsciiSequenceStart(utf8_array[i]));
-  }
-#endif
-  memmove(dst, utf8_array, array_len);
   return true;  // success
 }
 
 
 bool Utf8::DecodeToUTF16(const uint8_t* utf8_array,
                          intptr_t array_len,
                          uint16_t* dst,
                          intptr_t len) {
   intptr_t i = 0;
   intptr_t j = 0;
@@ skipping 34 matching lines @@
     }
     dst[j] = ch;
   }
   if ((i < array_len) && (j == len)) {
     return false;  // output overflow
   }
   return true;  // success
 }
 
 }  // namespace dart