Revert trunk to bleeding_edge at r12484

src/messages.js

 // Copyright 2012 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 122 matching lines @@
   throw new $Error("Not supported");
 });
 
 
 // Helper functions; called from the runtime system.
 function FormatMessage(message) {
   if (kMessages === 0) {
     var messagesDictionary = [
       // Error
       "cyclic_proto",                 ["Cyclic __proto__ value"],
-      "code_gen_from_strings",        ["%0"],
+      "code_gen_from_strings",        ["Code generation from strings disallowed for this context"],
       // TypeError
       "unexpected_token",             ["Unexpected token ", "%0"],
       "unexpected_token_number",      ["Unexpected number"],
       "unexpected_token_string",      ["Unexpected string"],
       "unexpected_token_identifier",  ["Unexpected identifier"],
       "unexpected_reserved",          ["Unexpected reserved word"],
       "unexpected_strict_reserved",   ["Unexpected strict mode reserved word"],
       "unexpected_eos",               ["Unexpected end of input"],
       "malformed_regexp",             ["Invalid regular expression: /", "%0", "/: ", "%1"],
       "unterminated_regexp",          ["Invalid regular expression: missing /"],
@@ skipping 68 matching lines @@
       "called_on_non_object",         ["%0", " called on non-object"],
       "called_on_null_or_undefined",  ["%0", " called on null or undefined"],
       "array_indexof_not_defined",    ["Array.getIndexOf: Argument undefined"],
       "object_not_extensible",        ["Can't add property ", "%0", ", object is not extensible"],
       "illegal_access",               ["Illegal access"],
       "invalid_preparser_data",       ["Invalid preparser data for function ", "%0"],
       "strict_mode_with",             ["Strict mode code may not include a with statement"],
       "strict_catch_variable",        ["Catch variable may not be eval or arguments in strict mode"],
       "too_many_arguments",           ["Too many arguments in function call (only 32766 allowed)"],
       "too_many_parameters",          ["Too many parameters in function definition (only 32766 allowed)"],
-      "too_many_variables",           ["Too many variables declared (only 65535 allowed)"],
+      "too_many_variables",           ["Too many variables declared (only 32767 allowed)"],
       "strict_param_name",            ["Parameter name eval or arguments is not allowed in strict mode"],
       "strict_param_dupe",            ["Strict mode function may not have duplicate parameter names"],
       "strict_var_name",              ["Variable name may not be eval or arguments in strict mode"],
       "strict_function_name",         ["Function name may not be eval or arguments in strict mode"],
       "strict_octal_literal",         ["Octal literals are not allowed in strict mode."],
       "strict_duplicate_property",    ["Duplicate data property in object literal not allowed in strict mode"],
       "accessor_data_property",       ["Object literal may not have data and accessor property with the same name"],
       "accessor_get_set",             ["Object literal may not have multiple get/set accessors with the same name"],
       "strict_lhs_assignment",        ["Assignment to eval or arguments is not allowed in strict mode"],
       "strict_lhs_postfix",           ["Postfix increment/decrement may not have eval or arguments operand in strict mode"],
@@ skipping 282 matching lines @@
  * @return {number}
  *     Number of source lines.
  */
 function ScriptLineCount() {
   // Return number of source lines.
   return this.line_ends.length;
 }
 
 
 /**
- * If sourceURL comment is available and script starts at zero returns sourceURL
- * comment contents. Otherwise, script name is returned. See
+ * Returns the name of script if available, contents of sourceURL comment
+ * otherwise. See
  * http://fbug.googlecode.com/svn/branches/firebug1.1/docs/ReleaseNotes_1.1.txt
  * for details on using //@ sourceURL comment to identify scritps that don't
  * have name.
  *
  * @return {?string} script name if present, value for //@ sourceURL comment
  * otherwise.
  */
 function ScriptNameOrSourceURL() {
-  if (this.line_offset > 0 || this.column_offset > 0) {
+  if (this.name) {
     return this.name;
   }
 
   // The result is cached as on long scripts it takes noticable time to search
   // for the sourceURL.
-  if (this.hasCachedNameOrSourceURL) {
-    return this.cachedNameOrSourceURL;
-  }
+  if (this.hasCachedNameOrSourceURL)
+      return this.cachedNameOrSourceURL;
   this.hasCachedNameOrSourceURL = true;
 
   // TODO(608): the spaces in a regexp below had to be escaped as \040
   // because this file is being processed by js2c whose handling of spaces
   // in regexps is broken. Also, ['"] are excluded from allowed URLs to
   // avoid matches against sources that invoke evals with sourceURL.
   // A better solution would be to detect these special comments in
   // the scanner/parser.
   var source = ToString(this.source);
   var sourceUrlPos = %StringIndexOf(source, "sourceURL=", 0);
@@ skipping 697 matching lines @@
     throw e;
   }
 }
 
 
 InstallFunctions($Error.prototype, DONT_ENUM, ['toString', ErrorToString]);
 
 // Boilerplate for exceptions for stack overflows. Used from
 // Isolate::StackOverflow().
 var kStackOverflowBoilerplate = MakeRangeError('stack_overflow', []);