Add a readline() command to d8. This reads a single line, stripping
the new-line at the end. This is the other half of what is required to make the Debian Language Shootout code work correctly: http://code.google.com/p/v8/issues/detail?id=353 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2671 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
de8c403f1c
commit
0b60fe88da
20
src/d8.cc
20
src/d8.cc
@ -167,9 +167,6 @@ Handle<Value> Shell::Write(const Arguments& args) {
|
||||
|
||||
|
||||
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"));
|
||||
@ -182,6 +179,19 @@ Handle<Value> Shell::Read(const Arguments& args) {
|
||||
}
|
||||
|
||||
|
||||
Handle<Value> Shell::ReadLine(const Arguments& args) {
|
||||
char line_buf[256];
|
||||
if (fgets(line_buf, sizeof(line_buf), stdin) == NULL) {
|
||||
return ThrowException(String::New("Error reading line"));
|
||||
}
|
||||
int len = strlen(line_buf);
|
||||
if (line_buf[len - 1] == '\n') {
|
||||
--len;
|
||||
}
|
||||
return String::New(line_buf, len);
|
||||
}
|
||||
|
||||
|
||||
Handle<Value> Shell::Load(const Arguments& args) {
|
||||
for (int i = 0; i < args.Length(); i++) {
|
||||
HandleScope handle_scope;
|
||||
@ -404,6 +414,8 @@ void Shell::Initialize() {
|
||||
global_template->Set(String::New("print"), FunctionTemplate::New(Print));
|
||||
global_template->Set(String::New("write"), FunctionTemplate::New(Write));
|
||||
global_template->Set(String::New("read"), FunctionTemplate::New(Read));
|
||||
global_template->Set(String::New("readline"),
|
||||
FunctionTemplate::New(ReadLine));
|
||||
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));
|
||||
@ -596,6 +608,8 @@ void ShellThread::Run() {
|
||||
FunctionTemplate::New(Shell::Write));
|
||||
global_template->Set(String::New("read"),
|
||||
FunctionTemplate::New(Shell::Read));
|
||||
global_template->Set(String::New("readline"),
|
||||
FunctionTemplate::New(Shell::ReadLine));
|
||||
global_template->Set(String::New("load"),
|
||||
FunctionTemplate::New(Shell::Load));
|
||||
global_template->Set(String::New("yield"),
|
||||
|
1
src/d8.h
1
src/d8.h
@ -143,6 +143,7 @@ class Shell: public i::AllStatic {
|
||||
static Handle<Value> Quit(const Arguments& args);
|
||||
static Handle<Value> Version(const Arguments& args);
|
||||
static Handle<Value> Read(const Arguments& args);
|
||||
static Handle<Value> ReadLine(const Arguments& args);
|
||||
static Handle<Value> Load(const Arguments& args);
|
||||
// The OS object on the global object contains methods for performing
|
||||
// operating system calls:
|
||||
|
Loading…
Reference in New Issue
Block a user