Add synchronous directory listing to dart:io Directory.

runtime/bin/directory.cc

Index: runtime/bin/directory.cc
diff --git a/runtime/bin/directory.cc b/runtime/bin/directory.cc
index cc37c28da650c95cbac634d5c75035f8b7eb4dca..6a47d15fe636a55edf738d176a7b7af66785afd6 100644
--- a/runtime/bin/directory.cc
+++ b/runtime/bin/directory.cc
@@ -107,6 +107,26 @@ void FUNCTION_NAME(Directory_Rename)(Dart_NativeArguments args) {
 }
 
 
+void FUNCTION_NAME(Directory_List)(Dart_NativeArguments args) {
+  Dart_EnterScope();
+  Dart_Handle path = Dart_GetNativeArgument(args, 0);
+  Dart_Handle recursive = Dart_GetNativeArgument(args, 1);
+  // Create the list to hold the directory listing here, and pass it to the
+  // DirectorySyncListing object, which adds elements to it.
+  Dart_Handle results =
+      Dart_New(DartUtils::GetDartClass(DartUtils::kCoreLibURL, "List"),
+               Dart_Null(),
+               0,
+               NULL);
+  DirectorySyncListing sync_listing(results);
+  Directory::List(DartUtils::GetStringValue(path),
+                  DartUtils::GetBooleanValue(recursive),
+                  &sync_listing);
+  Dart_SetReturnValue(args, results);
+  Dart_ExitScope();
+}
+
+
 static CObject* DirectoryCreateRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString path(request[1]);
@@ -171,7 +191,8 @@ static CObject* DirectoryCreateTempRequest(const CObjectArray& request) {
 static CObject* DirectoryListRequest(const CObjectArray& request,
                                      Dart_Port response_port) {
   if (request.Length() == 3 && request[1]->IsString() && request[2]->IsBool()) {
-    DirectoryListing* dir_listing = new DirectoryListing(response_port);
+    DirectoryAsyncListing* dir_listing =
+        new DirectoryAsyncListing(response_port);
     CObjectString path(request[1]);
     CObjectBool recursive(request[2]);
     bool completed = Directory::List(
@@ -179,21 +200,22 @@ static CObject* DirectoryListRequest(const CObjectArray& request,
     delete dir_listing;
     CObjectArray* response = new CObjectArray(CObject::NewArray(2));
     response->SetAt(
-        0, new CObjectInt32(CObject::NewInt32(DirectoryListing::kListDone)));
+        0,
+        new CObjectInt32(CObject::NewInt32(DirectoryAsyncListing::kListDone)));
     response->SetAt(1, CObject::Bool(completed));
     return response;
   }
   // Respond with an illegal argument list error message.
   CObjectArray* response = new CObjectArray(CObject::NewArray(3));
   response->SetAt(0, new CObjectInt32(
-      CObject::NewInt32(DirectoryListing::kListError)));
+      CObject::NewInt32(DirectoryAsyncListing::kListError)));
   response->SetAt(1, CObject::Null());
   response->SetAt(2, CObject::IllegalArgumentError());
   Dart_PostCObject(response_port, response->AsApiCObject());
 
   response = new CObjectArray(CObject::NewArray(2));
   response->SetAt(
-      0, new CObjectInt32(CObject::NewInt32(DirectoryListing::kListDone)));
+      0, new CObjectInt32(CObject::NewInt32(DirectoryAsyncListing::kListDone)));
   response->SetAt(1, CObject::False());
   return response;
 }
@@ -289,7 +311,7 @@ void FUNCTION_NAME(Directory_NewServicePort)(Dart_NativeArguments args) {
 }
 
 
-CObjectArray* DirectoryListing::NewResponse(Response type, char* arg) {
+CObjectArray* DirectoryAsyncListing::NewResponse(Response type, char* arg) {
   CObjectArray* response = new CObjectArray(CObject::NewArray(2));
   response->SetAt(0, new CObjectInt32(CObject::NewInt32(type)));
   response->SetAt(1, new CObjectString(CObject::NewString(arg)));
@@ -297,19 +319,19 @@ CObjectArray* DirectoryListing::NewResponse(Response type, char* arg) {
 }
 
 
-bool DirectoryListing::HandleDirectory(char* dir_name) {
+bool DirectoryAsyncListing::HandleDirectory(char* dir_name) {
   CObjectArray* response = NewResponse(kListDirectory, dir_name);
   return Dart_PostCObject(response_port_, response->AsApiCObject());
 }
 
 
-bool DirectoryListing::HandleFile(char* file_name) {
+bool DirectoryAsyncListing::HandleFile(char* file_name) {
   CObjectArray* response = NewResponse(kListFile, file_name);
   return Dart_PostCObject(response_port_, response->AsApiCObject());
 }
 
 
-bool DirectoryListing::HandleError(const char* dir_name) {
+bool DirectoryAsyncListing::HandleError(const char* dir_name) {
   CObject* err = CObject::NewOSError();
   CObjectArray* response = new CObjectArray(CObject::NewArray(3));
   response->SetAt(0, new CObjectInt32(CObject::NewInt32(kListError)));
@@ -317,3 +339,32 @@ bool DirectoryListing::HandleError(const char* dir_name) {
   response->SetAt(2, err);
   return Dart_PostCObject(response_port_, response->AsApiCObject());
 }
+
+bool DirectorySyncListing::HandleDirectory(char* dir_name) {
+  Dart_Handle dir_name_dart = DartUtils::NewString(dir_name);
+  Dart_Handle dir = Dart_New(directory_class_, Dart_Null(), 1, &dir_name_dart);
+  Dart_Invoke(results_, add_, 1, &dir);
+

[Mads Ager (google), 2013/01/04 10:00:25]

Remove empty line.

+  return true;
+}
+
+bool DirectorySyncListing::HandleFile(char* file_name) {
+  Dart_Handle file_name_dart = DartUtils::NewString(file_name);
+  Dart_Handle file = Dart_New(file_class_, Dart_Null(), 1, &file_name_dart);
+  Dart_Invoke(results_, add_, 1, &file);
+  return true;
+}
+
+bool DirectorySyncListing::HandleError(const char* dir_name) {
+  Dart_Handle dart_os_error = DartUtils::NewDartOSError();
+  Dart_Handle args[3];
+  args[0] = DartUtils::NewString("Directory listing failed");
+  args[1] = DartUtils::NewString(dir_name);
+  args[2] = dart_os_error;
+  Dart_ThrowException(Dart_New(
+      DartUtils::GetDartClass(DartUtils::kIOLibURL, "DirectoryIOException"),
+      Dart_Null(),
+      3,
+      args));
+  return true;
+}