Index: src/d8.h |
diff --git a/src/d8.h b/src/d8.h |
index 6c7733ccfaf1a4bede8308f969c283ed70486c14..e9b417be7d0a90e6e8b0447f1038ce27dcea2e97 100644 |
--- a/src/d8.h |
+++ b/src/d8.h |
@@ -116,14 +116,13 @@ class CounterMap { |
#endif // V8_SHARED |
-#ifndef V8_SHARED |
class LineEditor { |
public: |
enum Type { DUMB = 0, READLINE = 1 }; |
LineEditor(Type type, const char* name); |
virtual ~LineEditor() { } |
- virtual i::SmartArrayPointer<char> Prompt(const char* prompt) = 0; |
+ virtual Handle<String> Prompt(const char* prompt) = 0; |
virtual bool Open() { return true; } |
virtual bool Close() { return true; } |
virtual void AddHistory(const char* str) { } |
@@ -136,7 +135,6 @@ class LineEditor { |
LineEditor* next_; |
static LineEditor* first_; |
}; |
-#endif // V8_SHARED |
class SourceGroup { |
@@ -287,7 +285,10 @@ class Shell : public i::AllStatic { |
static Handle<Value> EnableProfiler(const Arguments& args); |
static Handle<Value> DisableProfiler(const Arguments& args); |
static Handle<Value> Read(const Arguments& args); |
- static Handle<Value> ReadLine(const Arguments& args); |
+ static Handle<String> ReadFromStdin(); |
+ static Handle<Value> ReadLine(const Arguments& args) { |
+ return ReadFromStdin(); |
+ } |
static Handle<Value> Load(const Arguments& args); |
static Handle<Value> ArrayBuffer(const Arguments& args); |
static Handle<Value> Int8Array(const Arguments& args); |
@@ -335,11 +336,8 @@ class Shell : public i::AllStatic { |
static Handle<Value> RemoveDirectory(const Arguments& args); |
static void AddOSMethods(Handle<ObjectTemplate> os_template); |
-#ifndef V8_SHARED |
- static const char* kHistoryFileName; |
- static const int kMaxHistoryEntries; |
+ |
static LineEditor* console; |
-#endif // V8_SHARED |
static const char* kPrompt; |
static ShellOptions options; |