Tweak D8 remote debugger...

src/d8-debug.cc

 // 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 16 matching lines @@
 
 
 #include "d8.h"
 #include "d8-debug.h"
 #include "platform.h"
 #include "debug-agent.h"
 
 
 namespace v8 {
 
+void PrintPrompt() {
+  printf("dbg> ");
+  fflush(stdout);
+}
+
 
 void HandleDebugEvent(DebugEvent event,
                       Handle<Object> exec_state,
                       Handle<Object> event_data,
                       Handle<Value> data) {
   HandleScope scope;
 
   // Check for handled event.
   if (event != Break && event != Exception && event != AfterCompile) {
     return;
@@ skipping 32 matching lines @@
       Object::Cast(*fun->Call(exec_state, 0, NULL));
   if (try_catch.HasCaught()) {
     Shell::ReportException(&try_catch);
     return;
   }
 
   static const int kBufferSize = 256;
   bool running = false;
   while (!running) {
     char command[kBufferSize];
-    printf("dbg> ");
+    PrintPrompt();
     char* str = fgets(command, kBufferSize, stdin);
     if (str == NULL) break;
 
     // Ignore empty commands.
     if (strlen(command) == 0) continue;
 
     TryCatch try_catch;
 
     // Convert the debugger command to a JSON debugger request.
     Handle<Value> request =
@@ skipping 71 matching lines @@
     return;
   }
 
   // Start the receiver thread.
   ReceiverThread receiver(this);
   receiver.Start();
 
   // Start the keyboard thread.
   KeyboardThread keyboard(this);
   keyboard.Start();
+  PrintPrompt();
 
   // Process events received from debugged VM and from the keyboard.
   bool terminate = false;
   while (!terminate) {
     event_available_->Wait();
     RemoteDebuggerEvent* event = GetEvent();
     switch (event->type()) {
       case RemoteDebuggerEvent::kMessage:
         HandleMessageReceived(event->data());
         break;
@@ skipping 66 matching lines @@
 
 
 void RemoteDebugger::HandleMessageReceived(char* message) {
   HandleScope scope;
 
   // Print the event details.
   TryCatch try_catch;
   Handle<Object> details =
       Shell::DebugMessageDetails(Handle<String>::Cast(String::New(message)));
   if (try_catch.HasCaught()) {
-      Shell::ReportException(&try_catch);
+    Shell::ReportException(&try_catch);
+    PrintPrompt();
     return;
   }
   String::Utf8Value str(details->Get(String::New("text")));
   if (str.length() == 0) {
     // Empty string is used to signal not to process this event.
     return;
   }
   if (*str != NULL) {
     printf("%s\n", *str);
   } else {
     printf("???\n");
   }
-  printf("dbg> ");
+  PrintPrompt();
 }
 
 
 void RemoteDebugger::HandleKeyboardCommand(char* command) {
   HandleScope scope;
 
   // Convert the debugger command to a JSON debugger request.
   TryCatch try_catch;
   Handle<Value> request =
       Shell::DebugCommandToJSONRequest(String::New(command));
   if (try_catch.HasCaught()) {
-    Shell::ReportException(&try_catch);
+    v8::String::Utf8Value exception(try_catch.Exception());
+    const char* exception_string = Shell::ToCString(exception);
+    printf("%s\n", exception_string);
+    PrintPrompt();
     return;
   }
 
   // If undefined is returned the command was handled internally and there is
   // no JSON to send.
   if (request->IsUndefined()) {
+    PrintPrompt();
     return;
   }
 
   // Send the JSON debugger request.
   i::DebuggerAgentUtil::SendMessage(conn_, Handle<String>::Cast(request));
 }
 
 
 void ReceiverThread::Run() {
   // Receive the connect message (with empty body).
@@ skipping 27 matching lines @@
     }
 
     // Pass the keyboard command to the main thread.
     remote_debugger_->KeyboardCommand(
         i::SmartPointer<char>(i::StrDup(command)));
   }
 }
 
 
 }  // namespace v8