Deal with unhandled exceptions the same way in all Dart api functions.

runtime/bin/main.cc

 // Copyright (c) 2011, 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.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 
@@ skipping 75 matching lines @@
     i += 1;
   }
 
   return 0;
 }
 
 
 static Dart_Handle SetupRuntimeOptions(CommandLineOptions* options) {
   int options_count = options->count();
   Dart_Handle dart_arguments = Dart_NewList(options_count);
-  if (!Dart_IsValid(dart_arguments)) {
+  if (Dart_IsError(dart_arguments)) {
     return dart_arguments;
   }
   for (int i = 0; i < options_count; i++) {
     Dart_Handle argument_value = Dart_NewString(options->GetArgument(i));
-    if (!Dart_IsValid(argument_value)) {
+    if (Dart_IsError(argument_value)) {
       return argument_value;
     }
     Dart_Handle result = Dart_ListSetAt(dart_arguments, i, argument_value);
-    if (!Dart_IsValid(result)) {
+    if (Dart_IsError(result)) {
       return result;
     }
   }
   Dart_Handle core_lib_url = Dart_NewString("dart:coreimpl");
-  if (!Dart_IsValid(core_lib_url)) {
+  if (Dart_IsError(core_lib_url)) {
     return core_lib_url;
   }
   Dart_Handle core_lib = Dart_LookupLibrary(core_lib_url);
-  if (!Dart_IsValid(core_lib)) {
+  if (Dart_IsError(core_lib)) {
     return core_lib;
   }
   Dart_Handle runtime_options_class_name = Dart_NewString("RuntimeOptions");
-  if (!Dart_IsValid(runtime_options_class_name)) {
+  if (Dart_IsError(runtime_options_class_name)) {
     return runtime_options_class_name;
   }
   Dart_Handle runtime_options_class = Dart_GetClass(
       core_lib, runtime_options_class_name);
-  if (!Dart_IsValid(runtime_options_class)) {
+  if (Dart_IsError(runtime_options_class)) {
     return runtime_options_class;
   }
   Dart_Handle native_name = Dart_NewString("_nativeArguments");
-  if (!Dart_IsValid(native_name)) {
+  if (Dart_IsError(native_name)) {
     return native_name;
   }
 
   return Dart_SetStaticField(runtime_options_class,
                              native_name,
                              dart_arguments);
 }
 
 
 static void DumpPprofSymbolInfo() {
@@ skipping 14 matching lines @@
 }
 
 
 static void* MainIsolateInitCallback(void* data) {
   const char* script_name = reinterpret_cast<const char*>(data);
   Dart_Handle library;
   Dart_EnterScope();
 
   // Load the specified script.
   library = LoadScript(script_name);
-  if (!Dart_IsValid(library)) {
+  if (Dart_IsError(library)) {
     const char* err_msg = Dart_GetError(library);
     fprintf(stderr, "Errors encountered while loading script: %s\n", err_msg);
     Dart_ExitScope();
     exit(255);
   }
 
   if (!Dart_IsLibrary(library)) {
     fprintf(stderr,
             "Expected a library when loading script: %s",
             script_name);
@@ skipping 18 matching lines @@
 static bool HasCompileAll(const CommandLineOptions& options) {
   for (int i = 0; i < options.count(); i++) {
     if (strcmp(options.GetArgument(i), "--compile_all") == 0) {
       return true;
     }
   }
   return false;
 }
 
 
-static void PrintObject(FILE* out, Dart_Handle object) {
-  Dart_Handle result = Dart_ToString(object);
-  if (Dart_IsValid(result)) {
-    PrintString(out, result);
-  } else {
-    fprintf(out, "%s\n", Dart_GetError(result));
-  }
-}
-
-
 int main(int argc, char** argv) {
   char* script_name;
   CommandLineOptions vm_options(argc);
   CommandLineOptions dart_options(argc);
 
   // Parse command line arguments.
   if (ParseArguments(argc,
                      argv,
                      &vm_options,
                      &script_name,
@@ skipping 17 matching lines @@
   Dart_Isolate isolate = Dart_CreateIsolate(snapshot_buffer,
                                             canonical_script_name);
   if (isolate == NULL) {
     free(canonical_script_name);
     return 255;
   }
 
   Dart_EnterScope();
   if (HasCompileAll(vm_options)) {
     Dart_Handle result = Dart_CompileAll();
-    if (!Dart_IsValid(result)) {
+    if (Dart_IsError(result)) {
       fprintf(stderr, "%s\n", Dart_GetError(result));
       Dart_ExitScope();
       Dart_ShutdownIsolate();
       free(canonical_script_name);
       return 255;  // Indicates we encountered an error.
     }
   }
 
   // Create a dart options object that can be accessed from dart code.
   Dart_Handle options_result = SetupRuntimeOptions(&dart_options);
-  if (!Dart_IsValid(options_result)) {
+  if (Dart_IsError(options_result)) {
     fprintf(stderr, "%s\n", Dart_GetError(options_result));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     free(canonical_script_name);
     return 255;  // Indicates we encountered an error.
   }
 
   // Lookup and invoke the top level main function.
   Dart_Handle script_url = Dart_NewString(canonical_script_name);
   Dart_Handle library = Dart_LookupLibrary(script_url);
-  if (!Dart_IsValid(library)) {
+  if (Dart_IsError(library)) {
     fprintf(stderr, "%s\n", Dart_GetError(library));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     free(canonical_script_name);
     return 255;  // Indicates we encountered an error.
   }
   Dart_Handle result = Dart_InvokeStatic(library,
                                          Dart_NewString(""),
                                          Dart_NewString("main"),
                                          0,
                                          NULL);
-  if (Dart_IsValid(result)) {
-    if (Dart_ExceptionOccurred(result)) {
-      // Print the exception object.
-      fprintf(stderr, "An unhandled exception has been thrown\n");
-      Dart_Handle exception_result = Dart_GetException(result);
-      ASSERT(Dart_IsValid(exception_result));
-      PrintObject(stderr, exception_result);
-      // Print the stack trace.
-      Dart_Handle stacktrace = Dart_GetStacktrace(result);
-      ASSERT(Dart_IsValid(stacktrace));
-      PrintObject(stderr, stacktrace);
-      fprintf(stderr, "\n");
-      Dart_ExitScope();
-      Dart_ShutdownIsolate();
-      free(canonical_script_name);
-      return 255;  // We had an unhandled exception, hence indicate an error.
-    }
-  } else {
+  if (Dart_IsError(result)) {
     fprintf(stderr, "%s\n", Dart_GetError(result));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     free(canonical_script_name);
     return 255;  // Indicates we encountered an error.
   }
   // Keep handling messages until the last active receive port is closed.
   result = Dart_RunLoop();
-  if (!Dart_IsValid(result)) {
+  if (Dart_IsError(result)) {
     fprintf(stderr, "%s\n", Dart_GetError(result));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     free(canonical_script_name);
     return 255;  // Indicates we encountered an error.
   }
   free(canonical_script_name);
   Dart_ExitScope();
   // Dump symbol information for the profiler.
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   return 0;
 }