Author: ipo...@chromium.org
Date: Fri Apr 17 14:04:34 2009
New Revision: 1741

Modified:
    branches/bleeding_edge/samples/shell.cc
    branches/bleeding_edge/src/d8.cc
    branches/bleeding_edge/src/d8.h

Log:
Add a "read" extension to the shell programs. This global function
reads the contents of a file into a string and returns it.

Review URL: http://codereview.chromium.org/67262

Modified: branches/bleeding_edge/samples/shell.cc
==============================================================================
--- branches/bleeding_edge/samples/shell.cc     (original)
+++ branches/bleeding_edge/samples/shell.cc     Fri Apr 17 14:04:34 2009
@@ -38,6 +38,7 @@
                     bool print_result,
                     bool report_exceptions);
  v8::Handle<v8::Value> Print(const v8::Arguments& args);
+v8::Handle<v8::Value> Read(const v8::Arguments& args);
  v8::Handle<v8::Value> Load(const v8::Arguments& args);
  v8::Handle<v8::Value> Quit(const v8::Arguments& args);
  v8::Handle<v8::Value> Version(const v8::Arguments& args);
@@ -52,6 +53,8 @@
    v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New();
    // Bind the global 'print' function to the C++ Print callback.
    global->Set(v8::String::New("print"), v8::FunctionTemplate::New(Print));
+  // Bind the global 'read' function to the C++ Read callback.
+  global->Set(v8::String::New("read"), v8::FunctionTemplate::New(Read));
    // Bind the global 'load' function to the C++ Load callback.
    global->Set(v8::String::New("load"), v8::FunctionTemplate::New(Load));
    // Bind the 'quit' function
@@ -132,6 +135,25 @@
    printf("\n");
    fflush(stdout);
    return v8::Undefined();
+}
+
+
+// The callback that is invoked by v8 whenever the JavaScript 'read'
+// function is called.  This function loads the content of the file named  
in
+// the argument into a JavaScript string.
+v8::Handle<v8::Value> Read(const v8::Arguments& args) {
+  if (args.Length() != 1) {
+    return v8::ThrowException(v8::String::New("Bad parameters"));
+  }
+  v8::String::Utf8Value file(args[0]);
+  if (*file == NULL) {
+    return v8::ThrowException(v8::String::New("Error loading file"));
+  }
+  v8::Handle<v8::String> source = ReadFile(*file);
+  if (source.IsEmpty()) {
+    return v8::ThrowException(v8::String::New("Error loading file"));
+  }
+  return source;
  }



Modified: branches/bleeding_edge/src/d8.cc
==============================================================================
--- branches/bleeding_edge/src/d8.cc    (original)
+++ branches/bleeding_edge/src/d8.cc    Fri Apr 17 14:04:34 2009
@@ -163,6 +163,22 @@
  }


+Handle<Value> Shell::Read(const Arguments& args) {
+  if (args.Length() != 1) {
+    return ThrowException(String::New("Bad parameters"));
+  }
+  String::Utf8Value file(args[0]);
+  if (*file == NULL) {
+    return ThrowException(String::New("Error loading file"));
+  }
+  Handle<String> source = ReadFile(*file);
+  if (source.IsEmpty()) {
+    return ThrowException(String::New("Error loading file"));
+  }
+  return source;
+}
+
+
  Handle<Value> Shell::Load(const Arguments& args) {
    for (int i = 0; i < args.Length(); i++) {
      HandleScope handle_scope;
@@ -381,6 +397,7 @@
    HandleScope scope;
    Handle<ObjectTemplate> global_template = ObjectTemplate::New();
    global_template->Set(String::New("print"), FunctionTemplate::New(Print));
+  global_template->Set(String::New("read"), FunctionTemplate::New(Read));
    global_template->Set(String::New("load"), FunctionTemplate::New(Load));
    global_template->Set(String::New("quit"), FunctionTemplate::New(Quit));
    global_template->Set(String::New("version"),  
FunctionTemplate::New(Version));
@@ -555,6 +572,8 @@
    Handle<ObjectTemplate> global_template = ObjectTemplate::New();
    global_template->Set(String::New("print"),
                         FunctionTemplate::New(Shell::Print));
+  global_template->Set(String::New("read"),
+                       FunctionTemplate::New(Shell::Read));
    global_template->Set(String::New("load"),
                         FunctionTemplate::New(Shell::Load));
    global_template->Set(String::New("yield"),

Modified: branches/bleeding_edge/src/d8.h
==============================================================================
--- branches/bleeding_edge/src/d8.h     (original)
+++ branches/bleeding_edge/src/d8.h     Fri Apr 17 14:04:34 2009
@@ -139,6 +139,7 @@
    static Handle<Value> Yield(const Arguments& args);
    static Handle<Value> Quit(const Arguments& args);
    static Handle<Value> Version(const Arguments& args);
+  static Handle<Value> Read(const Arguments& args);
    static Handle<Value> Load(const Arguments& args);
    // The OS object on the global object contains methods for performing
    // operating system calls:

--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---

Reply via email to