Big merge from experimental to bleeding edge.

tools/ddbg.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // Simple interactive debugger shell that connects to the Dart VM's debugger
 // connection port.
 
-#import("dart:io");
-#import("dart:json");
-#import("dart:math", prefix: "Math");
-#import("dart:utf");
+import "dart:io";
+import "dart:json";
+import "dart:utf";
 
 
 Map<int, Completer> outstandingCommands;
 
 Socket vmSock;
 String vmData;
 OutputStream vmStream;
 int seqNum = 0;
 int isolate_id = -1;
 
@@ skipping 38 matching lines @@
   vmSock.close();
   stdin.close();
 }
 
 
 Future sendCmd(Map<String, dynamic> cmd) {
   var completer = new Completer();
   int id = cmd["id"];
   outstandingCommands[id] = completer;
   if (verbose) {
-    print("sending: '${JSON.stringify(cmd)}'");
+    print("sending: '${jsonStringify(cmd)}'");
   }
-  vmStream.writeString(JSON.stringify(cmd));
+  vmStream.writeString(jsonStringify(cmd));
   return completer.future;
 }
 
 
 void processCommand(String cmdLine) {
   seqNum++;
   var args = cmdLine.split(' ');
   if (args.length == 0) {
     return;
   }
@@ skipping 13 matching lines @@
     sendCmd(cmd).then((result) => handleStackTraceResponse(result));
   } else if (command == "ll") {
     var cmd = { "id": seqNum,
                 "command": "getLibraries",
                 "params": { "isolateId" : isolate_id } };
     sendCmd(cmd).then((result) => handleGetLibraryResponse(result));
   } else if (command == "sbp" && args.length >= 2) {
     var url, line;
     if (args.length == 2) {
       url = stackTrace[0]["location"]["url"];
-      line = Math.parseInt(args[1]);
+      line = int.parse(args[1]);
     } else {
       url = args[1];
-      line = Math.parseInt(args[2]);
+      line = int.parse(args[2]);
     }
     var cmd = { "id": seqNum,
                 "command": "setBreakpoint",
                 "params": { "isolateId" : isolate_id,
                             "url": url,
                             "line": line }};
     sendCmd(cmd).then((result) => handleSetBpResponse(result));
   } else if (command == "rbp" && args.length == 2) {
     var cmd = { "id": seqNum,
                 "command": "removeBreakpoint",
                 "params": { "isolateId" : isolate_id,
-                            "breakpointId": Math.parseInt(args[1]) } };
+                            "breakpointId": int.parse(args[1]) } };
     sendCmd(cmd).then((result) => handleGenericResponse(result));
   } else if (command == "ls" && args.length == 2) {
     var cmd = { "id": seqNum,
                 "command": "getScriptURLs",
                 "params": { "isolateId" : isolate_id,
-                            "libraryId": Math.parseInt(args[1]) } };
+                            "libraryId": int.parse(args[1]) } };
     sendCmd(cmd).then((result) => handleGetScriptsResponse(result));
   } else if (command == "po" && args.length == 2) {
     var cmd = { "id": seqNum,
                 "command": "getObjectProperties",
                 "params": { "isolateId" : isolate_id,
-                            "objectId": Math.parseInt(args[1]) } };
+                            "objectId": int.parse(args[1]) } };
     sendCmd(cmd).then((result) => handleGetObjPropsResponse(result));
   } else if (command == "pl" && args.length >= 3) {
      var cmd;
      if (args.length == 3) {
        cmd = { "id": seqNum,
                "command": "getListElements",
                "params": { "isolateId" : isolate_id,
-                           "objectId": Math.parseInt(args[1]),
-                           "index": Math.parseInt(args[2]) } };
+                           "objectId": int.parse(args[1]),
+                           "index": int.parse(args[2]) } };
     } else {
        cmd = { "id": seqNum,
                "command": "getListElements",
                "params": { "isolateId" : isolate_id,
-                           "objectId": Math.parseInt(args[1]),
-                           "index": Math.parseInt(args[2]),
-                           "length": Math.parseInt(args[3]) } };
+                           "objectId": int.parse(args[1]),
+                           "index": int.parse(args[2]),
+                           "length": int.parse(args[3]) } };
     }
     sendCmd(cmd).then((result) => handleGetListResponse(result));
   } else if (command == "pc" && args.length == 2) {
     var cmd = { "id": seqNum,
                 "command": "getClassProperties",
                 "params": { "isolateId" : isolate_id,
-                            "classId": Math.parseInt(args[1]) } };
+                            "classId": int.parse(args[1]) } };
     sendCmd(cmd).then((result) => handleGetClassPropsResponse(result));
   } else if (command == "plib" && args.length == 2) {
     var cmd = { "id": seqNum,
                 "command": "getLibraryProperties",
                 "params": {"isolateId" : isolate_id,
-                           "libraryId": Math.parseInt(args[1]) } };
+                           "libraryId": int.parse(args[1]) } };
     sendCmd(cmd).then((result) => handleGetLibraryPropsResponse(result));
   } else if (command == "slib" && args.length == 3) {
     var cmd = { "id": seqNum,
                 "command": "setLibraryProperties",
                 "params": {"isolateId" : isolate_id,
-                           "libraryId": Math.parseInt(args[1]),
+                           "libraryId": int.parse(args[1]),
                            "debuggingEnabled": args[2] } };
     sendCmd(cmd).then((result) => handleSetLibraryPropsResponse(result));
   } else if (command == "pg" && args.length == 2) {
     var cmd = { "id": seqNum,
                 "command": "getGlobalVariables",
                 "params": { "isolateId" : isolate_id,
-                            "libraryId": Math.parseInt(args[1]) } };
+                            "libraryId": int.parse(args[1]) } };
     sendCmd(cmd).then((result) => handleGetGlobalVarsResponse(result));
   } else if (command == "gs" && args.length == 3) {
     var cmd = { "id": seqNum,
                 "command":  "getScriptSource",
                 "params": { "isolateId" : isolate_id,
-                            "libraryId": Math.parseInt(args[1]),
+                            "libraryId": int.parse(args[1]),
                             "url": args[2] } };
     sendCmd(cmd).then((result) => handleGetSourceResponse(result));
   } else if (command == "epi" && args.length == 2) {
     var cmd = { "id": seqNum,
                 "command":  "setPauseOnException",
                 "params": { "isolateId" : isolate_id,
                             "exceptions": args[1] } };
     sendCmd(cmd).then((result) => handleGenericResponse(result));
   } else if (command == "i" && args.length == 2) {
     var cmd = { "id": seqNum,
                 "command": "interrupt",
-                "params": { "isolateId": Math.parseInt(args[1]) } };
+                "params": { "isolateId": int.parse(args[1]) } };
     sendCmd(cmd).then((result) => handleGenericResponse(result));
   } else if (command == "q") {
     quitShell();
   } else if (command == "h") {
     printHelp();
   } else {
     print("command '$command' not understood, try h for help");
   }
 }
 
@@ skipping 201 matching lines @@
     var excObj = msg["params"]["exception"];
     print("Isolate $isolate_id paused on exception");
     print(remoteObject(excObj));
   }
   print("Stack trace:");
   printStackTrace(stackTrace);
 }
 
 
 void processVmMessage(String json) {
-  var msg = JSON.parse(json);
+  var msg = parseJson(json);
   if (msg == null) {
     return;
   }
   var event = msg["event"];
   if (event == "paused") {
     handlePausedEvent(msg);
     return;
   }
   if (event == "breakpointResolved") {
     Map params = msg["params"];
@@ skipping 50 matching lines @@
     vmData = vmData.substring(msg_len);
     msg_len = jsonObjectLength(vmData);
   }
   if (printMessages) { print("leftover vm data '$vmData'"); }
 }
 
 /**
  * Skip past a JSON object value.
  * The object value must start with '{' and continues to the
  * matching '}'. No attempt is made to otherwise validate the contents
- * as JSON. If it is invalid, a later [JSON.parse] will fail.
+ * as JSON. If it is invalid, a later [parseJson] will fail.
  */
 int jsonObjectLength(String string) {
   int skipWhitespace(int index) {
     while (index < string.length) {
       String char = string[index];
       if (char != " " && char != "\n" && char != "\r" && char != "\t") break;
       index++;
     }
     return index;
   }
   int skipString(int index) {
     assert(string[index - 1] == '"');
     while (index < string.length) {
       String char = string[index];
       if (char == '"') return index + 1;
       if (char == r'\') index++;
       if (index == string.length) return index;
       index++;
     }
     return index;
   }
   int index = 0;
   index = skipWhitespace(index);
   // Bail out if the first non-whitespace character isn't '{'.
   if (index == string.length || string[index] != '{') return 0;
-  int nexting = 0;
+  int nesting = 0;
   while (index < string.length) {
     String char = string[index++];
     if (char == '{') {
-      nexting++;
+      nesting++;
     } else if (char == '}') {
-      nexting--;
-      if (nexting == 0) return index;
+      nesting--;
+      if (nesting == 0) return index;
     } else if (char == '"') {
       // Strings can contain braces. Skip their content.
       index = skipString(index);
     }
   }
   return 0;
 }
 
 
 void debuggerMain() {
@@ skipping 34 matching lines @@
       // are coming from the debugger, and which errors are coming
       // from the process being debugged.
       process.stderr.pipe(stdout);
       process.stdout.pipe(stdout);
       debuggerMain();
     });
   } else {
     debuggerMain();
   }
 }