- Refactor the isolate callback mechanism to also include creation of the

bin/builtin_in.cc

Index: bin/builtin_in.cc
===================================================================
--- bin/builtin_in.cc	(revision 1955)
+++ bin/builtin_in.cc	(working copy)
@@ -5,151 +5,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "include/dart_api.h"
-
 #include "bin/builtin.h"
-#include "bin/dartutils.h"
 
 // The string on the next line will be filled in with the contents of the
 // builtin.dart file.
 // This string forms the content of builtin functionality which is injected
 // into standalone dart to provide some test/debug functionality.
-static const char Builtin_source_[] = {
+const char Builtin::Builtin_source_[] = {
   {{DART_SOURCE}}
 };
-
-
-// List all native functions implemented in standalone dart that is used
-// to inject additional functionality e.g: Logger, file I/O, socket I/O etc.
-#define BUILTIN_NATIVE_LIST(V)                                                 \
-  V(Directory_List, 7)                                                         \
-  V(Directory_Exists, 2)                                                       \
-  V(Directory_Create, 2)                                                       \
-  V(Directory_CreateTemp, 3)                                                   \
-  V(Directory_Delete, 2)                                                       \
-  V(EventHandler_Start, 1)                                                     \
-  V(EventHandler_SendData, 4)                                                  \
-  V(Exit, 1)                                                                   \
-  V(File_Open, 2)                                                              \
-  V(File_Exists, 1)                                                            \
-  V(File_Close, 1)                                                             \
-  V(File_ReadByte, 1)                                                          \
-  V(File_WriteByte, 2)                                                         \
-  V(File_WriteString, 2)                                                       \
-  V(File_ReadList, 4)                                                          \
-  V(File_WriteList, 4)                                                         \
-  V(File_Position, 1)                                                          \
-  V(File_SetPosition, 2)                                                       \
-  V(File_Truncate, 2)                                                          \
-  V(File_Length, 1)                                                            \
-  V(File_Flush, 1)                                                             \
-  V(File_Create, 1)                                                            \
-  V(File_Delete, 1)                                                            \
-  V(File_FullPath, 1)                                                          \
-  V(Logger_PrintString, 1)                                                     \
-  V(Platform_NumberOfProcessors, 0)                                            \
-  V(Platform_OperatingSystem, 0)                                               \
-  V(Platform_PathSeparator, 0)                                                 \
-  V(Process_Start, 8)                                                          \
-  V(Process_Kill, 2)                                                           \
-  V(Process_Exit, 2)                                                           \
-  V(ServerSocket_CreateBindListen, 4)                                          \
-  V(ServerSocket_Accept, 2)                                                    \
-  V(Socket_CreateConnect, 3)                                                   \
-  V(Socket_Available, 1)                                                       \
-  V(Socket_ReadList, 4)                                                        \
-  V(Socket_WriteList, 4)                                                       \
-  V(Socket_GetPort, 1)                                                         \
-  V(Socket_GetStdioHandle, 2)
-
-
-BUILTIN_NATIVE_LIST(DECLARE_FUNCTION);
-
-static struct NativeEntries {
-  const char* name_;
-  Dart_NativeFunction function_;
-  int argument_count_;
-} BuiltinEntries[] = {
-  BUILTIN_NATIVE_LIST(REGISTER_FUNCTION)
-};
-
-
-static Dart_NativeFunction native_lookup(Dart_Handle name,
-                                         int argument_count) {
-  const char* function_name = NULL;
-  Dart_Handle result = Dart_StringToCString(name, &function_name);
-  DART_CHECK_VALID(result);
-  ASSERT(function_name != NULL);
-  int num_entries = sizeof(BuiltinEntries) / sizeof(struct NativeEntries);
-  for (int i = 0; i < num_entries; i++) {
-    struct NativeEntries* entry = &(BuiltinEntries[i]);
-    if (!strcmp(function_name, entry->name_)) {
-      if (entry->argument_count_ == argument_count) {
-        return reinterpret_cast<Dart_NativeFunction>(entry->function_);
-      } else {
-        // Wrong number of arguments.
-        // TODO(regis): Should we pass a buffer for error reporting?
-        return NULL;
-      }
-    }
-  }
-  return NULL;
-}
-
-
-static void SetupCorelibImports(Dart_Handle builtin_lib) {
-  // Lookup the core libraries and import the builtin library into them.
-  Dart_Handle url = Dart_NewString(DartUtils::kCoreLibURL);
-  Dart_Handle core_lib = Dart_LookupLibrary(url);
-  DART_CHECK_VALID(core_lib);
-  Dart_Handle result = Dart_LibraryImportLibrary(core_lib, builtin_lib);
-  DART_CHECK_VALID(result);
-
-  url = Dart_NewString(DartUtils::kCoreImplLibURL);
-  Dart_Handle coreimpl_lib = Dart_LookupLibrary(url);
-  DART_CHECK_VALID(coreimpl_lib);
-  result = Dart_LibraryImportLibrary(coreimpl_lib, builtin_lib);
-  DART_CHECK_VALID(result);
-}
-
-
-Dart_Handle Builtin_Source() {
-  Dart_Handle str = Dart_NewString(Builtin_source_);
-  return str;
-}
-
-
-void Builtin_SetupLibrary(Dart_Handle builtin_lib) {
-  // Setup core lib, builtin import structure.
-  SetupCorelibImports(builtin_lib);
-  // Setup the native resolver for built in library functions.
-  Dart_Handle result = Dart_SetNativeResolver(builtin_lib, native_lookup);
-  DART_CHECK_VALID(result);
-}
-
-
-void Builtin_ImportLibrary(Dart_Handle library) {
-  Dart_Handle url = Dart_NewString(DartUtils::kBuiltinLibURL);
-  Dart_Handle builtin_lib = Dart_LookupLibrary(url);
-  if (Dart_IsError(builtin_lib)) {
-    Dart_Handle source = Dart_NewString(Builtin_source_);
-    builtin_lib = Dart_LoadLibrary(url, source);
-    if (!Dart_IsError(builtin_lib)) {
-      Builtin_SetupLibrary(builtin_lib);
-    }
-  }
-  // Import the builtin library into current library.
-  DART_CHECK_VALID(builtin_lib);
-  Dart_Handle result = Dart_LibraryImportLibrary(library, builtin_lib);
-  DART_CHECK_VALID(result);
-}
-
-
-void Builtin_SetNativeResolver() {
-  Dart_Handle url = Dart_NewString(DartUtils::kBuiltinLibURL);
-  Dart_Handle builtin_lib = Dart_LookupLibrary(url);
-  DART_CHECK_VALID(builtin_lib);
-  // Setup the native resolver for built in library functions.
-  Dart_Handle result = Dart_SetNativeResolver(builtin_lib, native_lookup);
-  DART_CHECK_VALID(result);
-}