diff --git a/samples/shell.cc b/samples/shell.cc index 087d4fd46b..27ed293e7e 100644 --- a/samples/shell.cc +++ b/samples/shell.cc @@ -38,6 +38,7 @@ bool ExecuteString(v8::Handle source, bool print_result, bool report_exceptions); v8::Handle Print(const v8::Arguments& args); +v8::Handle Read(const v8::Arguments& args); v8::Handle Load(const v8::Arguments& args); v8::Handle Quit(const v8::Arguments& args); v8::Handle Version(const v8::Arguments& args); @@ -52,6 +53,8 @@ int RunMain(int argc, char* argv[]) { v8::Handle 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 @@ -135,6 +138,25 @@ v8::Handle Print(const v8::Arguments& args) { } +// 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 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 source = ReadFile(*file); + if (source.IsEmpty()) { + return v8::ThrowException(v8::String::New("Error loading file")); + } + return source; +} + + // The callback that is invoked by v8 whenever the JavaScript 'load' // function is called. Loads, compiles and executes its argument // JavaScript file. diff --git a/src/d8.cc b/src/d8.cc index 9648168b33..6ede664900 100644 --- a/src/d8.cc +++ b/src/d8.cc @@ -163,6 +163,22 @@ Handle Shell::Print(const Arguments& args) { } +Handle 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 source = ReadFile(*file); + if (source.IsEmpty()) { + return ThrowException(String::New("Error loading file")); + } + return source; +} + + Handle Shell::Load(const Arguments& args) { for (int i = 0; i < args.Length(); i++) { HandleScope handle_scope; @@ -381,6 +397,7 @@ void Shell::Initialize() { HandleScope scope; Handle 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 @@ void ShellThread::Run() { Handle 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"), diff --git a/src/d8.h b/src/d8.h index 342a0d2c2e..c17eeef331 100644 --- a/src/d8.h +++ b/src/d8.h @@ -139,6 +139,7 @@ class Shell: public i::AllStatic { static Handle Yield(const Arguments& args); static Handle Quit(const Arguments& args); static Handle Version(const Arguments& args); + static Handle Read(const Arguments& args); static Handle Load(const Arguments& args); // The OS object on the global object contains methods for performing // operating system calls: