NewGC: Merge bleeding edge up to 9009.

src/d8.js

 // Copyright 2008 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 85 matching lines @@
 Debug.ScriptCompilationType = { Host: 0,
                                 Eval: 1,
                                 JSON: 2 };
 
 
 // The different types of scopes matching constants runtime.cc.
 Debug.ScopeType = { Global: 0,
                     Local: 1,
                     With: 2,
                     Closure: 3,
-                    Catch: 4 };
+                    Catch: 4,
+                    Block: 5 };
 
 
 // Current debug state.
 const kNoFrame = -1;
 Debug.State = {
   currentFrame: kNoFrame,
   displaySourceStartLine: -1,
   displaySourceEndLine: -1,
   currentSourceLine: -1
 }
@@ skipping 267 matching lines @@
     case 'exit':
     case 'quit':
       this.request_ = this.disconnectCommandToJSONRequest_(args);
       break;
 
     case 'up':
       this.request_ =
           this.frameCommandToJSONRequest_('' +
                                           (Debug.State.currentFrame + 1));
       break;
-      
+
     case 'down':
     case 'do':
       this.request_ =
           this.frameCommandToJSONRequest_('' +
                                           (Debug.State.currentFrame - 1));
       break;
-      
+
     case 'set':
     case 'print':
     case 'p':
       this.request_ = this.printCommandToJSONRequest_(args);
       break;
 
     case 'dir':
       this.request_ = this.dirCommandToJSONRequest_(args);
       break;
 
@@ skipping 652 matching lines @@
     if (arg1 == 'exc' || arg1 == 'exception' || arg1 == 'exceptions') {
 
       var arg2 = (nextPos > 0) ?
           args.substring(nextPos + 1, args.length) : 'all';
       if (!arg2) {
         arg2 = 'all'; // if unspecified, set for all.
       } if (arg2 == 'unc') { // check for short cut.
         arg2 = 'uncaught';
       }
       excType = arg2;
-      
+
     // Check for:
     //   en[able] [all|unc[aught]] exc[eptions]
     //   dis[able] [all|unc[aught]] exc[eptions]
     } else if (arg1 == 'all' || arg1 == 'unc' || arg1 == 'uncaught') {
 
       var arg2 = (nextPos > 0) ?
           args.substring(nextPos + 1, args.length) : null;
       if (arg2 == 'exc' || arg1 == 'exception' || arg1 == 'exceptions') {
         excType = arg1;
         if (excType == 'unc') {
@@ skipping 38 matching lines @@
       case 'enable':
         request.arguments.enabled = true;
         break;
       case 'disable':
         request.arguments.enabled = false;
         break;
       case 'ignore':
         request.arguments.ignoreCount = parseInt(otherArgs);
         break;
       default:
-        throw new Error('Invalid arguments.');  
+        throw new Error('Invalid arguments.');
     }
   } else {
     throw new Error('Invalid arguments.');
   }
 
   return request.toJSONProtocol();
 };
 
 
 // Create a JSON request for the disconnect command.
@@ skipping 100 matching lines @@
 
     // Check for i[ndex] <i>:
     } else if (arg === 'index' || arg === 'i') {
       i++;
       if (args.length < i) {
         throw new Error('Missing index after ' + arg + '.');
       }
       start_index = parseInt(args[i]);
       // The user input start index starts at 1:
       if (start_index <= 0) {
-        throw new Error('Invalid index ' + args[i] + '.');                
+        throw new Error('Invalid index ' + args[i] + '.');
       }
       start_index -= 1;
       is_verbose = true;
 
     // Check for t[ype] <type>:
     } else if (arg === 'type' || arg === 't') {
       i++;
       if (args.length < i) {
         throw new Error('Missing type after ' + arg + '.');
       }
@@ skipping 748 matching lines @@
         if (body.breakpoints.length === 0) {
           result = "No user defined breakpoints\n";
         } else {
           result += '\n';
         }
         if (body.breakOnExceptions) {
           result += '* breaking on ALL exceptions is enabled\n';
         } else if (body.breakOnUncaughtExceptions) {
           result += '* breaking on UNCAUGHT exceptions is enabled\n';
         } else {
-          result += '* all exception breakpoints are disabled\n';            
+          result += '* all exception breakpoints are disabled\n';
         }
         details.text = result;
         break;
 
       case 'setexceptionbreak':
         result = 'Break on ' + body.type + ' exceptions: ';
         result += body.enabled ? 'enabled' : 'disabled';
         details.text = result;
         break;
 
@@ skipping 763 matching lines @@
       json += NumberToJSON_(elem);
     } else if (typeof(elem) === 'string')  {
       json += StringToJSON_(elem);
     } else {
       json += elem;
     }
   }
   json += ']';
   return json;
 }