diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 16:03:39 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:28:02 +0000 |
| commit | 69a99ed0b2b2ef69d393c371b03db3a98aaf880e (patch) | |
| tree | 6438154d0f3ab526b9206f8860fa4db5cf073c11 /src/debug-debugger.js | |
| parent | 3fb3ca8c7ca439d408449a395897395c0faae8d1 (diff) | |
| download | android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.tar.gz android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.tar.bz2 android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.zip | |
Upgrade to V8 3.5
Merge V8 3.5.10.24
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: I0acdb9a1a53919d84e9a7525308e8371739d2f06
Diffstat (limited to 'src/debug-debugger.js')
| -rw-r--r-- | src/debug-debugger.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/debug-debugger.js b/src/debug-debugger.js index 36b624e5..d254ee56 100644 --- a/src/debug-debugger.js +++ b/src/debug-debugger.js @@ -404,7 +404,7 @@ ScriptBreakPoint.prototype.matchesScript = function(script) { return this.script_name_ == script.nameOrSourceURL(); } else if (this.type_ == Debug.ScriptBreakPointType.ScriptRegExp) { return this.script_regexp_object_.test(script.nameOrSourceURL()); - } else { + } else { throw new Error("Unexpected breakpoint type " + this.type_); } } @@ -1579,7 +1579,7 @@ DebugCommandProcessor.prototype.setBreakPointRequest_ = response.failed('Missing argument "type" or "target"'); return; } - + // Either function or script break point. var break_point_number; if (type == 'function') { @@ -1623,10 +1623,10 @@ DebugCommandProcessor.prototype.setBreakPointRequest_ = break_point_number = Debug.setScriptBreakPointByName(target, line, column, condition, groupId); - } else if (type == 'scriptId') { + } else if (type == 'scriptId') { break_point_number = Debug.setScriptBreakPointById(target, line, column, condition, groupId); - } else if (type == 'scriptRegExp') { + } else if (type == 'scriptRegExp') { break_point_number = Debug.setScriptBreakPointByRegExp(target, line, column, condition, groupId); @@ -1797,7 +1797,7 @@ DebugCommandProcessor.prototype.listBreakpointsRequest_ = function(request, resp description.type = 'scriptRegExp'; description.script_regexp = break_point.script_regexp_object().source; } else { - throw new Error("Internal error: Unexpected breakpoint type: " + break_point.type()); + throw new Error("Internal error: Unexpected breakpoint type: " + break_point.type()); } array.push(description); } @@ -1838,7 +1838,7 @@ DebugCommandProcessor.prototype.setExceptionBreakRequest_ = enabled = !Debug.isBreakOnException(); } else if (type == 'uncaught') { enabled = !Debug.isBreakOnUncaughtException(); - } + } // Pull out and check the 'enabled' argument if present: if (!IS_UNDEFINED(request.arguments.enabled)) { @@ -2022,22 +2022,22 @@ DebugCommandProcessor.prototype.evaluateRequest_ = function(request, response) { if (!IS_UNDEFINED(frame) && global) { return response.failed('Arguments "frame" and "global" are exclusive'); } - + var additional_context_object; if (additional_context) { additional_context_object = {}; for (var i = 0; i < additional_context.length; i++) { var mapping = additional_context[i]; if (!IS_STRING(mapping.name) || !IS_NUMBER(mapping.handle)) { - return response.failed("Context element #" + i + + return response.failed("Context element #" + i + " must contain name:string and handle:number"); - } + } var context_value_mirror = LookupMirror(mapping.handle); if (!context_value_mirror) { return response.failed("Context object '" + mapping.name + "' #" + mapping.handle + "# not found"); } - additional_context_object[mapping.name] = context_value_mirror.value(); + additional_context_object[mapping.name] = context_value_mirror.value(); } } |
