[es6] Fix missing bits for full @@toPrimitive support.

src/debug/debug.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.
 
 (function (global, utils) {
 "use strict";
 
 // ----------------------------------------------------------------------------
 // Imports
 
 var FrameMirror = global.FrameMirror;
 var GlobalArray = global.Array;
 var GlobalRegExp = global.RegExp;
 var IsNaN = global.isNaN;
 var JSONParse = global.JSON.parse;
 var JSONStringify = global.JSON.stringify;
 var LookupMirror = global.LookupMirror;
 var MakeMirror = global.MakeMirror;
 var MakeMirrorSerializer = global.MakeMirrorSerializer;
 var MathMin = global.Math.min;
 var Mirror = global.Mirror;
 var MirrorType;
 var ParseInt = global.parseInt;
 var ToBoolean;
-var ToNumber;
-var ToString;
 var ValueMirror = global.ValueMirror;
 
 utils.Import(function(from) {
   MirrorType = from.MirrorType;
   ToBoolean = from.ToBoolean;
-  ToNumber = from.ToNumber;
-  ToString = from.ToString;
 });
 
 //----------------------------------------------------------------------------
 
 // Default number of frames to include in the response to backtrace request.
 var kDefaultBacktraceLength = 10;
 
 var Debug = {};
 
 // Regular expression to skip "crud" at the beginning of a source line which is
@@ skipping 899 matching lines @@
 }
 
 function ExecutionState(break_id) {
   this.break_id = break_id;
   this.selected_frame = 0;
 }
 
 ExecutionState.prototype.prepareStep = function(opt_action, opt_count,
     opt_callframe) {
   var action = Debug.StepAction.StepIn;
-  if (!IS_UNDEFINED(opt_action)) action = ToNumber(opt_action);
-  var count = opt_count ? ToNumber(opt_count) : 1;
+  if (!IS_UNDEFINED(opt_action)) action = TO_NUMBER(opt_action);
+  var count = opt_count ? TO_NUMBER(opt_count) : 1;
   var callFrameId = 0;
   if (!IS_UNDEFINED(opt_callframe)) {
     callFrameId = opt_callframe.details_.frameId();
   }
 
   return %PrepareStep(this.break_id, action, count, callFrameId);
 };
 
 ExecutionState.prototype.evaluateGlobal = function(source, disable_break,
     opt_additional_context) {
@@ skipping 13 matching lines @@
 ExecutionState.prototype.frame = function(opt_index) {
   // If no index supplied return the selected frame.
   if (opt_index == null) opt_index = this.selected_frame;
   if (opt_index < 0 || opt_index >= this.frameCount()) {
     throw MakeTypeError(kDebuggerFrame);
   }
   return new FrameMirror(this.break_id, opt_index);
 };
 
 ExecutionState.prototype.setSelectedFrame = function(index) {
-  var i = ToNumber(index);
+  var i = TO_NUMBER(index);
   if (i < 0 || i >= this.frameCount()) {
     throw MakeTypeError(kDebuggerFrame);
   }
   this.selected_frame = i;
 };
 
 ExecutionState.prototype.selectedFrame = function() {
   return this.selected_frame;
 };
 
@@ skipping 426 matching lines @@
       } else {
         throw MakeError(kDebugger,
                         'Unknown command "' + request.command + '" in request');
       }
     } catch (e) {
       // If there is no response object created one (without command).
       if (!response) {
         response = this.createResponse();
       }
       response.success = false;
-      response.message = ToString(e);
+      response.message = TO_STRING(e);
     }
 
     // Return the response as a JSON encoded string.
     try {
       if (!IS_UNDEFINED(response.running)) {
         // Response controls running state.
         this.running_ = response.running;
       }
       response.running = this.running_;
       return response.toJSONProtocol();
     } catch (e) {
       // Failed to generate response - return generic error.
       return '{"seq":' + response.seq + ',' +
               '"request_seq":' + request.seq + ',' +
               '"type":"response",' +
               '"success":false,' +
-              '"message":"Internal error: ' + ToString(e) + '"}';
+              '"message":"Internal error: ' + TO_STRING(e) + '"}';
     }
   } catch (e) {
     // Failed in one of the catch blocks above - most generic error.
     return '{"seq":0,"type":"response","success":false,"message":"Internal error"}';
   }
 };
 
 
 DebugCommandProcessor.prototype.continueRequest_ = function(request, response) {
   // Check for arguments for continue.
   if (request.arguments) {
     var count = 1;
     var action = Debug.StepAction.StepIn;
 
     // Pull out arguments.
     var stepaction = request.arguments.stepaction;
     var stepcount = request.arguments.stepcount;
 
     // Get the stepcount argument if any.
     if (stepcount) {
-      count = ToNumber(stepcount);
+      count = TO_NUMBER(stepcount);
       if (count < 0) {
         throw MakeError(kDebugger,
                         'Invalid stepcount argument "' + stepcount + '".');
       }
     }
 
     // Get the stepaction argument.
     if (stepaction) {
       if (stepaction == 'in') {
         action = Debug.StepAction.StepIn;
@@ skipping 54 matching lines @@
     // Handle function break point.
     if (!IS_STRING(target)) {
       response.failed('Argument "target" is not a string value');
       return;
     }
     var f;
     try {
       // Find the function through a global evaluate.
       f = this.exec_state_.evaluateGlobal(target).value();
     } catch (e) {
-      response.failed('Error: "' + ToString(e) +
+      response.failed('Error: "' + TO_STRING(e) +
                       '" evaluating "' + target + '"');
       return;
     }
     if (!IS_FUNCTION(f)) {
       response.failed('"' + target + '" does not evaluate to a function');
       return;
     }
 
     // Set function break point.
     break_point_number = Debug.setBreakPoint(f, line, column, condition);
@@ skipping 68 matching lines @@
 
 DebugCommandProcessor.prototype.changeBreakPointRequest_ = function(
     request, response) {
   // Check for legal request.
   if (!request.arguments) {
     response.failed('Missing arguments');
     return;
   }
 
   // Pull out arguments.
-  var break_point = ToNumber(request.arguments.breakpoint);
+  var break_point = TO_NUMBER(request.arguments.breakpoint);
   var enabled = request.arguments.enabled;
   var condition = request.arguments.condition;
   var ignoreCount = request.arguments.ignoreCount;
 
   // Check for legal arguments.
   if (!break_point) {
     response.failed('Missing argument "breakpoint"');
     return;
   }
 
@@ skipping 55 matching lines @@
 
 DebugCommandProcessor.prototype.clearBreakPointRequest_ = function(
     request, response) {
   // Check for legal request.
   if (!request.arguments) {
     response.failed('Missing arguments');
     return;
   }
 
   // Pull out arguments.
-  var break_point = ToNumber(request.arguments.breakpoint);
+  var break_point = TO_NUMBER(request.arguments.breakpoint);
 
   // Check for legal arguments.
   if (!break_point) {
     response.failed('Missing argument "breakpoint"');
     return;
   }
 
   // Clear break point.
   Debug.clearBreakPoint(break_point);
 
@@ skipping 237 matching lines @@
 };
 
 
 DebugCommandProcessor.prototype.scopeRequest_ = function(request, response) {
   // Get the frame or function for which the scope is requested.
   var scope_holder = this.resolveScopeHolder_(request.arguments);
 
   // With no scope argument just return top scope.
   var scope_index = 0;
   if (request.arguments && !IS_UNDEFINED(request.arguments.number)) {
-    scope_index = ToNumber(request.arguments.number);
+    scope_index = TO_NUMBER(request.arguments.number);
     if (scope_index < 0 || scope_holder.scopeCount() <= scope_index) {
       return response.failed('Invalid scope number');
     }
   }
 
   response.body = scope_holder.scope(scope_index);
 };
 
 
 // Reads value from protocol description. Description may be in form of type
 // (for singletons), raw value (primitive types supported in JSON),
 // string value description plus type (for primitive values) or handle id.
 // Returns raw value or throws exception.
 DebugCommandProcessor.resolveValue_ = function(value_description) {
   if ("handle" in value_description) {
     var value_mirror = LookupMirror(value_description.handle);
     if (!value_mirror) {
       throw MakeError(kDebugger, "Failed to resolve value by handle, ' #" +
                                  value_description.handle + "# not found");
     }
     return value_mirror.value();
   } else if ("stringDescription" in value_description) {
     if (value_description.type == MirrorType.BOOLEAN_TYPE) {
       return ToBoolean(value_description.stringDescription);
     } else if (value_description.type == MirrorType.NUMBER_TYPE) {
-      return ToNumber(value_description.stringDescription);
+      return TO_NUMBER(value_description.stringDescription);
     } if (value_description.type == MirrorType.STRING_TYPE) {
-      return ToString(value_description.stringDescription);
+      return TO_STRING(value_description.stringDescription);
     } else {
       throw MakeError(kDebugger, "Unknown type");
     }
   } else if ("value" in value_description) {
     return value_description.value;
   } else if (value_description.type == MirrorType.UNDEFINED_TYPE) {
     return UNDEFINED;
   } else if (value_description.type == MirrorType.NULL_TYPE) {
     return null;
   } else {
@@ skipping 15 matching lines @@
   var variable_name = request.arguments.name;
 
   var scope_description = request.arguments.scope;
 
   // Get the frame or function for which the scope is requested.
   var scope_holder = this.resolveScopeHolder_(scope_description);
 
   if (IS_UNDEFINED(scope_description.number)) {
     response.failed('Missing scope number');
   }
-  var scope_index = ToNumber(scope_description.number);
+  var scope_index = TO_NUMBER(scope_description.number);
 
   var scope = scope_holder.scope(scope_index);
 
   var new_value =
       DebugCommandProcessor.resolveValue_(request.arguments.newValue);
 
   scope.setVariableValue(variable_name, new_value);
 
   var new_value_mirror = MakeMirror(new_value);
 
@@ skipping 11 matching lines @@
   // Pull out arguments.
   var expression = request.arguments.expression;
   var frame = request.arguments.frame;
   var global = request.arguments.global;
   var disable_break = request.arguments.disable_break;
   var additional_context = request.arguments.additional_context;
 
   // The expression argument could be an integer so we convert it to a
   // string.
   try {
-    expression = ToString(expression);
+    expression = TO_STRING(expression);
   } catch(e) {
     return response.failed('Failed to convert expression argument to string');
   }
 
   // Check for legal arguments.
   if (!IS_UNDEFINED(frame) && global) {
     return response.failed('Arguments "frame" and "global" are exclusive');
   }
 
   var additional_context_object;
@@ skipping 25 matching lines @@
     disable_break = true;
   }
 
   // No frames no evaluate in frame.
   if (this.exec_state_.frameCount() == 0) {
     return response.failed('No frames');
   }
 
   // Check whether a frame was specified.
   if (!IS_UNDEFINED(frame)) {
-    var frame_number = ToNumber(frame);
+    var frame_number = TO_NUMBER(frame);
     if (frame_number < 0 || frame_number >= this.exec_state_.frameCount()) {
       return response.failed('Invalid frame "' + frame + '"');
     }
     // Evaluate in the specified frame.
     response.body = this.exec_state_.frame(frame_number).evaluate(
         expression, ToBoolean(disable_break), additional_context_object);
     return;
   } else {
     // Evaluate in the selected frame.
     response.body = this.exec_state_.frame().evaluate(
@@ skipping 79 matching lines @@
 
   var from_line;
   var to_line;
   var frame = this.exec_state_.frame();
   if (request.arguments) {
     // Pull out arguments.
     from_line = request.arguments.fromLine;
     to_line = request.arguments.toLine;
 
     if (!IS_UNDEFINED(request.arguments.frame)) {
-      var frame_number = ToNumber(request.arguments.frame);
+      var frame_number = TO_NUMBER(request.arguments.frame);
       if (frame_number < 0 || frame_number >= this.exec_state_.frameCount()) {
         return response.failed('Invalid frame "' + frame + '"');
       }
       frame = this.exec_state_.frame(frame_number);
     }
   }
 
   // Get the script selected.
   var script = frame.func().script();
   if (!script) {
@@ skipping 15 matching lines @@
 };
 
 
 DebugCommandProcessor.prototype.scriptsRequest_ = function(request, response) {
   var types = ScriptTypeFlag(Debug.ScriptType.Normal);
   var includeSource = false;
   var idsToInclude = null;
   if (request.arguments) {
     // Pull out arguments.
     if (!IS_UNDEFINED(request.arguments.types)) {
-      types = ToNumber(request.arguments.types);
+      types = TO_NUMBER(request.arguments.types);
       if (IsNaN(types) || types < 0) {
         return response.failed('Invalid types "' +
                                request.arguments.types + '"');
       }
     }
 
     if (!IS_UNDEFINED(request.arguments.includeSource)) {
       includeSource = ToBoolean(request.arguments.includeSource);
       response.setOption('includeSource', includeSource);
     }
 
     if (IS_ARRAY(request.arguments.ids)) {
       idsToInclude = {};
       var ids = request.arguments.ids;
       for (var i = 0; i < ids.length; i++) {
         idsToInclude[ids[i]] = true;
       }
     }
 
     var filterStr = null;
     var filterNum = null;
     if (!IS_UNDEFINED(request.arguments.filter)) {
-      var num = ToNumber(request.arguments.filter);
+      var num = TO_NUMBER(request.arguments.filter);
       if (!IsNaN(num)) {
         filterNum = num;
       }
       filterStr = request.arguments.filter;
     }
   }
 
   // Collect all scripts in the heap.
   var scripts = %DebugGetLoadedScripts();
 
@@ skipping 115 matching lines @@
   var frame = request.arguments.frame;
 
   // No frames to evaluate in frame.
   if (this.exec_state_.frameCount() == 0) {
     return response.failed('No frames');
   }
 
   var frame_mirror;
   // Check whether a frame was specified.
   if (!IS_UNDEFINED(frame)) {
-    var frame_number = ToNumber(frame);
+    var frame_number = TO_NUMBER(frame);
     if (frame_number < 0 || frame_number >= this.exec_state_.frameCount()) {
       return response.failed('Invalid frame "' + frame + '"');
     }
     // Restart specified frame.
     frame_mirror = this.exec_state_.frame(frame_number);
   } else {
     // Restart selected frame.
     frame_mirror = this.exec_state_.frame();
   }
 
@@ skipping 201 matching lines @@
   "IsBreakPointTriggered", IsBreakPointTriggered,
   "UpdateScriptBreakPoints", UpdateScriptBreakPoints,
 ]);
 
 // Export to liveedit.js
 utils.Export(function(to) {
   to.GetScriptBreakPoints = GetScriptBreakPoints;
 });
 
 })