Revert 8942 "Make scanner not accept invalid unicode escapes in identifiers"

src/scanner-base.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 23 matching lines @@
 namespace v8 {
 namespace internal {
 
 // ----------------------------------------------------------------------------
 // Scanner
 
 Scanner::Scanner(UnicodeCache* unicode_cache)
     : unicode_cache_(unicode_cache) { }
 
 
-  uc32 Scanner::ScanHexNumber(int expected_length) {
-  ASSERT(expected_length <= 4);  // prevent overflow
+uc32 Scanner::ScanHexEscape(uc32 c, int length) {
+  ASSERT(length <= 4);  // prevent overflow
 
   uc32 digits[4];
   uc32 x = 0;
-  for (int i = 0; i < expected_length; i++) {
+  for (int i = 0; i < length; i++) {
     digits[i] = c0_;
     int d = HexValue(c0_);
     if (d < 0) {
       // According to ECMA-262, 3rd, 7.8.4, page 18, these hex escapes
       // should be illegal, but other JS VMs just return the
       // non-escaped version of the original character.
 
-      // Push back digits that we have advanced past.
+      // Push back digits read, except the last one (in c0_).
       for (int j = i-1; j >= 0; j--) {
         PushBack(digits[j]);
       }
-      return unibrow::Utf8::kBadChar;
+      // Notice: No handling of error - treat it as "\u"->"u".
+      return c;
     }
     x = x * 16 + d;
     Advance();
   }
 
   return x;
 }
 
 
 
@@ skipping 559 matching lines @@
 
   switch (c) {
     case '\'':  // fall through
     case '"' :  // fall through
     case '\\': break;
     case 'b' : c = '\b'; break;
     case 'f' : c = '\f'; break;
     case 'n' : c = '\n'; break;
     case 'r' : c = '\r'; break;
     case 't' : c = '\t'; break;
-    case 'u' : {
-      c = ScanHexNumber(4);
-      if (c == static_cast<uc32>(unibrow::Utf8::kBadChar)) c = 'u';
-      break;
-    }
+    case 'u' : c = ScanHexEscape(c, 4); break;
     case 'v' : c = '\v'; break;
-    case 'x' : {
-      c = ScanHexNumber(2);
-      if (c == static_cast<uc32>(unibrow::Utf8::kBadChar)) c = 'x';
-      break;
-    }
+    case 'x' : c = ScanHexEscape(c, 2); break;
     case '0' :  // fall through
     case '1' :  // fall through
     case '2' :  // fall through
     case '3' :  // fall through
     case '4' :  // fall through
     case '5' :  // fall through
     case '6' :  // fall through
     case '7' : c = ScanOctalEscape(c, 2); break;
   }
 
@@ skipping 141 matching lines @@
   literal.Complete();
 
   return Token::NUMBER;
 }
 
 
 uc32 JavaScriptScanner::ScanIdentifierUnicodeEscape() {
   Advance();
   if (c0_ != 'u') return unibrow::Utf8::kBadChar;
   Advance();
-  uc32 c = ScanHexNumber(4);
+  uc32 c = ScanHexEscape('u', 4);
   // We do not allow a unicode escape sequence to start another
   // unicode escape sequence.
   if (c == '\\') return unibrow::Utf8::kBadChar;
   return c;
 }
 
 
 // ----------------------------------------------------------------------------
 // Keyword Matcher
 
@@ skipping 222 matching lines @@
     }
     AddLiteralCharAdvance();
   }
   literal.Complete();
 
   next_.location.end_pos = source_pos() - 1;
   return true;
 }
 
 } }  // namespace v8::internal