Author: [email protected]
Date: Mon Jul 13 04:17:51 2009
New Revision: 2434
Modified:
branches/bleeding_edge/src/unicode.cc
Log:
Small cleanup to Utf8::CalculateValue:
- Don't duplicate kMaxXByteChar constants.
- Don't compare signed and unsigned integers.
Review URL: http://codereview.chromium.org/155414
Modified: branches/bleeding_edge/src/unicode.cc
==============================================================================
--- branches/bleeding_edge/src/unicode.cc (original)
+++ branches/bleeding_edge/src/unicode.cc Mon Jul 13 04:17:51 2009
@@ -194,18 +194,13 @@
uchar Utf8::CalculateValue(const byte* str,
unsigned length,
unsigned* cursor) {
- static const uchar kMaxOneByteChar = 0x7F;
- static const uchar kMaxTwoByteChar = 0x7FF;
- static const uchar kMaxThreeByteChar = 0xFFFF;
- static const uchar kMaxFourByteChar = 0x1FFFFF;
-
// We only get called for non-ascii characters.
if (length == 1) {
*cursor += 1;
return kBadChar;
}
- int first = str[0];
- int second = str[1] ^ 0x80;
+ byte first = str[0];
+ byte second = str[1] ^ 0x80;
if (second & 0xC0) {
*cursor += 1;
return kBadChar;
@@ -227,7 +222,7 @@
*cursor += 1;
return kBadChar;
}
- int third = str[2] ^ 0x80;
+ byte third = str[2] ^ 0x80;
if (third & 0xC0) {
*cursor += 1;
return kBadChar;
@@ -245,7 +240,7 @@
*cursor += 1;
return kBadChar;
}
- int fourth = str[3] ^ 0x80;
+ byte fourth = str[3] ^ 0x80;
if (fourth & 0xC0) {
*cursor += 1;
return kBadChar;
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
