Migrate error messages, part 2.

src/messages.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // -------------------------------------------------------------------
 
 var kMessages = {
   // Error
-  cyclic_proto:                  ["Cyclic __proto__ value"],
-  code_gen_from_strings:         ["%0"],
   constructor_is_generator:      ["Class constructor may not be a generator"],
   constructor_is_accessor:       ["Class constructor may not be an accessor"],
   // TypeError
-  generator_running:             ["Generator is already running"],
   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"],
   unexpected_template_string:    ["Unexpected template string"],
   malformed_regexp:              ["Invalid regular expression: /", "%0", "/: ", "%1"],
   malformed_regexp_flags:        ["Invalid regular expression flags"],
   unterminated_regexp:           ["Invalid regular expression: missing /"],
   unterminated_template:         ["Unterminated template literal"],
   unterminated_template_expr:    ["Missing } in template expression"],
   unterminated_arg_list:         ["missing ) after argument list"],
   regexp_flags:                  ["Cannot supply flags when constructing one RegExp from another"],
-  incompatible_method_receiver:  ["Method ", "%0", " called on incompatible receiver ", "%1"],
   multiple_defaults_in_switch:   ["More than one default clause in switch statement"],
   newline_after_throw:           ["Illegal newline after throw"],
   label_redeclaration:           ["Label '", "%0", "' has already been declared"],
   var_redeclaration:             ["Identifier '", "%0", "' has already been declared"],
   duplicate_template_property:   ["Object template has duplicate property '", "%0", "'"],
   no_catch_or_finally:           ["Missing catch or finally after try"],
   unknown_label:                 ["Undefined label '", "%0", "'"],
   uncaught_exception:            ["Uncaught ", "%0"],
-  stack_trace:                   ["Stack Trace:\n", "%0"],
-  called_non_callable:           ["%0", " is not a function"],
   undefined_method:              ["Object ", "%1", " has no method '", "%0", "'"],
   cannot_convert_to_primitive:   ["Cannot convert object to primitive value"],
   not_constructor:               ["%0", " is not a constructor"],
   not_defined:                   ["%0", " is not defined"],
   non_method:                    ["'super' is referenced from non-method"],
   unsupported_super:             ["Unsupported reference to 'super'"],
   non_object_property_load:      ["Cannot read property '", "%0", "' of ", "%1"],
   non_object_property_store:     ["Cannot set property '", "%0", "' of ", "%1"],
   illegal_invocation:            ["Illegal invocation"],
   no_setter_in_callback:         ["Cannot set property ", "%0", " of ", "%1", " which has only a getter"],
@@ skipping 259 matching lines @@
       var constructorName = constructor.name;
       if (IS_STRING(constructorName) && constructorName !== "") {
         return "#<" + constructorName + ">";
       }
     }
   }
   return ToStringCheckErrorObject(obj);
 }
 
 
-function MakeGenericError(constructor, type, args) {
-  if (IS_UNDEFINED(args)) args = [];
-  return new constructor(FormatMessage(type, args));
-}
-
-
-function MakeGenericError2(constructor, type, arg0, arg1, arg2) {
+function MakeGenericError(constructor, type, arg0, arg1, arg2) {
+  if (IS_UNDEFINED(arg0) && IS_STRING(type)) arg0 = [];
   return new constructor(FormatMessage(type, arg0, arg1, arg2));
 }
 
 
 /**
  * Set up the Script function and constructor.
  */
 %FunctionSetInstanceClassName(Script, 'Script');
 %AddNamedProperty(Script.prototype, 'constructor', Script,
                   DONT_ENUM | DONT_DELETE | READ_ONLY);
@@ skipping 36 matching lines @@
 // position, or the empty string if the position is invalid.
 function GetSourceLine(message) {
   var script = %MessageGetScript(message);
   var start_position = %MessageGetStartPosition(message);
   var location = script.locationFromPosition(start_position, true);
   if (location == null) return "";
   return location.sourceText();
 }
 
 
-function MakeTypeError(type, args) {
-  return MakeGenericError($TypeError, type, args);
+function MakeError(type, arg0, arg1, arg2) {
+  return MakeGenericError($Error, type, arg0, arg1, arg2);
 }
 
 
-// TODO(yangguo): rename this once we migrated all messages.
-function MakeTypeError2(type, arg0, arg1, arg2) {
-  return MakeGenericError2($TypeError, type, arg0, arg1, arg2);
+function MakeTypeError(type, arg0, arg1, arg2) {
+  return MakeGenericError($TypeError, type, arg0, arg1, arg2);
 }
 
 
-function MakeRangeError(type, args) {
-  return MakeGenericError($RangeError, type, args);
+function MakeRangeError(type, arg0, arg1, arg2) {
+  return MakeGenericError($RangeError, type, arg0, arg1, arg2);
 }
 
 
-function MakeSyntaxError(type, args) {
-  return MakeGenericError($SyntaxError, type, args);
+function MakeSyntaxError(type, arg0, arg1, arg2) {
+  return MakeGenericError($SyntaxError, type, arg0, arg1, arg2);
 }
 
 
-function MakeReferenceError(type, args) {
-  return MakeGenericError($ReferenceError, type, args);
+function MakeReferenceError(type, arg0, arg1, arg2) {
+  return MakeGenericError($ReferenceError, type, arg0, arg1, arg2);
 }
 
 
-function MakeEvalError(type, args) {
-  return MakeGenericError($EvalError, type, args);
+function MakeEvalError(type, arg0, arg1, arg2) {
+  return MakeGenericError($EvalError, type, arg0, arg1, arg2);
 }
 
-
-function MakeError(type, args) {
-  return MakeGenericError($Error, type, args);
-}
-
-
 // The embedded versions are called from unoptimized code, with embedded
 // arguments. Those arguments cannot be arrays, which are context-dependent.
 function MakeTypeErrorEmbedded(type, arg) {
   return MakeGenericError($TypeError, type, [arg]);
 }
 
 
 function MakeSyntaxErrorEmbedded(type, arg) {
   return MakeGenericError($SyntaxError, type, [arg]);
 }
@@ skipping 881 matching lines @@
 function SetUpStackOverflowBoilerplate() {
   var boilerplate = MakeRangeError('stack_overflow', []);
 
   %DefineAccessorPropertyUnchecked(
       boilerplate, 'stack', StackTraceGetter, StackTraceSetter, DONT_ENUM);
 
   return boilerplate;
 }
 
 var kStackOverflowBoilerplate = SetUpStackOverflowBoilerplate();