Simplify line editor choice in d8.

src/d8-readline.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
 //       with the distribution.
 //     * Neither the name of Google Inc. nor the names of its
 //       contributors may be used to endorse or promote products derived
 //       from this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#ifdef USE_READLINE_CONSOLE
+
 #include <cstdio>  // NOLINT
-#include <string.h> // NOLINT
 #include <readline/readline.h> // NOLINT
 #include <readline/history.h> // NOLINT
 
 // The readline includes leaves RETURN defined which breaks V8 compilation.
 #undef RETURN
 
 #include "d8.h"
 
+
 // There are incompatibilities between different versions and different
 // implementations of readline.  This smooths out one known incompatibility.
 #if RL_READLINE_VERSION >= 0x0500
 #define completion_matches rl_completion_matches
 #endif
 
 
 namespace v8 {
 
-
-class ReadLineEditor: public LineEditor {
- public:
-  ReadLineEditor() : LineEditor(LineEditor::READLINE, "readline") { }
-  virtual Handle<String> Prompt(const char* prompt);
-  virtual bool Open();
-  virtual bool Close();
-  virtual void AddHistory(const char* str);
-
-  static const char* kHistoryFileName;
-  static const int kMaxHistoryEntries;
-
- private:
-#ifndef V8_SHARED
-  static char** AttemptedCompletion(const char* text, int start, int end);
-  static char* CompletionGenerator(const char* text, int state);
-#endif  // V8_SHARED
-  static char kWordBreakCharacters[];
-};
-
-
-static ReadLineEditor read_line_editor;
-char ReadLineEditor::kWordBreakCharacters[] = {' ', '\t', '\n', '"',
+static char kWordBreakCharacters[] = {' ', '\t', '\n', '"',
     '\\', '\'', '`', '@', '.', '>', '<', '=', ';', '|', '&', '{', '(',
     '\0'};
 
 
-const char* ReadLineEditor::kHistoryFileName = ".d8_history";
-const int ReadLineEditor::kMaxHistoryEntries = 1000;
+static const char* kHistoryFileName = ".d8_history";
+static const int kMaxHistoryEntries = 1000;
 
 
-bool ReadLineEditor::Open() {
+char* CompletionGenerator(const char* text, int state) {
+  static unsigned current_index;
+  static Persistent<Array> current_completions;
+  if (state == 0) {
+    HandleScope scope;
+    Local<String> full_text = String::New(rl_line_buffer, rl_point);
+    Handle<Array> completions =
+      Shell::GetCompletions(String::New(text), full_text);
+    current_completions = Persistent<Array>::New(completions);
+    current_index = 0;
+  }
+  if (current_index < current_completions->Length()) {
+    HandleScope scope;
+    Handle<Integer> index = Integer::New(current_index);
+    Handle<Value> str_obj = current_completions->Get(index);
+    current_index++;
+    String::Utf8Value str(str_obj);
+    return strdup(*str);
+  } else {
+    current_completions.Dispose();
+    current_completions.Clear();
+    return NULL;
+  }
+}
+
+
+char** AttemptedCompletion(const char* text,
+                                           int start,
+                                           int end) {
+  char** result = completion_matches(text, CompletionGenerator);
+  rl_attempted_completion_over = true;
+  return result;
+}
+
+
+void LineEditor::Open() {
   rl_initialize();
-
-#ifdef V8_SHARED
-  // Don't do completion on shared library mode
-  // http://cnswww.cns.cwru.edu/php/chet/readline/readline.html#SEC24
-  rl_bind_key('\t', rl_insert);
-#else
   rl_attempted_completion_function = AttemptedCompletion;
-#endif  // V8_SHARED
-
   rl_completer_word_break_characters = kWordBreakCharacters;
   rl_bind_key('\t', rl_complete);
   using_history();
   stifle_history(kMaxHistoryEntries);
-  return read_history(kHistoryFileName) == 0;
+  read_history(kHistoryFileName);
 }
 
 
-bool ReadLineEditor::Close() {
-  return write_history(kHistoryFileName) == 0;
+LineEditor::~LineEditor() {
+  write_history(kHistoryFileName);
 }
 
 
-Handle<String> ReadLineEditor::Prompt(const char* prompt) {
-  char* result = NULL;
-  {  // Release lock for blocking input.
-    Unlocker unlock(Isolate::GetCurrent());
-    result = readline(prompt);
-  }
-  if (result != NULL) {
-    AddHistory(result);
-  } else {
-    return Handle<String>();
-  }
-  return String::New(result);
-}
+const char* LineEditor::name() { return "readline"; }
 
 
-void ReadLineEditor::AddHistory(const char* str) {
+void LineEditor::AddHistory(const char* str) {
   // Do not record empty input.
   if (strlen(str) == 0) return;
   // Remove duplicate history entry.
   history_set_pos(history_length-1);
   if (current_history()) {
     do {
       if (strcmp(current_history()->line, str) == 0) {
         remove_history(where_history());
         break;
       }
     } while (previous_history());
   }
   add_history(str);
 }
 
 
-#ifndef V8_SHARED
-char** ReadLineEditor::AttemptedCompletion(const char* text,
-                                           int start,
-                                           int end) {
-  char** result = completion_matches(text, CompletionGenerator);
-  rl_attempted_completion_over = true;
-  return result;
+Handle<String> LineEditor::Prompt(const char* prompt) {
+  char* result = NULL;
+  {  // Release lock for blocking input.
+    Unlocker unlock(Isolate::GetCurrent());
+    result = readline(prompt);
+  }
+  if (result != NULL) {
+    AddHistory(result);
+  } else {
+    return Handle<String>();
+  }
+  return String::New(result);
 }
 
+}  // namespace v8
 
-char* ReadLineEditor::CompletionGenerator(const char* text, int state) {
-  static unsigned current_index;
-  static Persistent<Array> current_completions;
-  if (state == 0) {
-    HandleScope scope;
-    Local<String> full_text = String::New(rl_line_buffer, rl_point);
-    Handle<Array> completions =
-      Shell::GetCompletions(String::New(text), full_text);
-    current_completions = Persistent<Array>::New(completions);
-    current_index = 0;
-  }
-  if (current_index < current_completions->Length()) {
-    HandleScope scope;
-    Handle<Integer> index = Integer::New(current_index);
-    Handle<Value> str_obj = current_completions->Get(index);
-    current_index++;
-    String::Utf8Value str(str_obj);
-    return strdup(*str);
-  } else {
-    current_completions.Dispose();
-    current_completions.Clear();
-    return NULL;
-  }
-}
-#endif  // V8_SHARED
-
-
-}  // namespace v8
+#endif  // USE_READLINE_CONSOLE