Simplify line editor choice in d8.

src/d8.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
@@ skipping 105 matching lines @@
 #undef DEFINE_SYMBOL_GETTER
 
  private:
   Isolate* isolate_;
 #define DEFINE_MEMBER(name, value) Persistent<String> name##_;
   FOR_EACH_SYMBOL(DEFINE_MEMBER)
 #undef DEFINE_MEMBER
 };
 
 
-LineEditor *LineEditor::first_ = NULL;
+#ifndef USE_READLINE_CONSOLE
 
+void LineEditor::Open() { }
 
-LineEditor::LineEditor(Type type, const char* name)
-    : type_(type),
-      name_(name),
-      next_(first_) {
-  first_ = this;
-}
+LineEditor::~LineEditor() { }
 
+const char* LineEditor::name() { return "dumb"; }
 
-LineEditor* LineEditor::Get() {
-  LineEditor* current = first_;
-  LineEditor* best = current;
-  while (current != NULL) {
-    if (current->type_ > best->type_)
-      best = current;
-    current = current->next_;
-  }
-  return best;
-}
+void LineEditor::AddHistory(const char* str) { }
 
-
-class DumbLineEditor: public LineEditor {
- public:
-  explicit DumbLineEditor(Isolate* isolate)
-      : LineEditor(LineEditor::DUMB, "dumb"), isolate_(isolate) { }
-  virtual Handle<String> Prompt(const char* prompt);
- private:
-  Isolate* isolate_;
-};
-
-
-Handle<String> DumbLineEditor::Prompt(const char* prompt) {
+Handle<String> LineEditor::Prompt(const char* prompt) {
   printf("%s", prompt);
   return Shell::ReadFromStdin(isolate_);
 }
 
+#endif  // USE_READLINE_CONSOLE
+
 
 #ifndef V8_SHARED
 CounterMap* Shell::counter_map_;
 i::OS::MemoryMappedFile* Shell::counters_file_ = NULL;
 CounterCollection Shell::local_counters_;
 CounterCollection* Shell::counters_ = &local_counters_;
 i::Mutex* Shell::context_mutex_(i::OS::CreateMutex());
 Persistent<Context> Shell::utility_context_;
 #endif  // V8_SHARED
 
@@ skipping 1173 matching lines @@
 
 
 int CompareKeys(const void* a, const void* b) {
   return strcmp(static_cast<const CounterAndKey*>(a)->key,
                 static_cast<const CounterAndKey*>(b)->key);
 }
 #endif  // V8_SHARED
 
 
 void Shell::OnExit() {
-  LineEditor* line_editor = LineEditor::Get();
-  if (line_editor) line_editor->Close();
 #ifndef V8_SHARED
   if (i::FLAG_dump_counters) {
     int number_of_counters = 0;
     for (CounterMap::Iterator i(counter_map_); i.More(); i.Next()) {
       number_of_counters++;
     }
     CounterAndKey* counters = new CounterAndKey[number_of_counters];
     int j = 0;
     for (CounterMap::Iterator i(counter_map_); i.More(); i.Next(), j++) {
       counters[j].counter = i.CurrentValue();
@@ skipping 133 matching lines @@
   delete[] chars;
   return result;
 }
 
 
 void Shell::RunShell(Isolate* isolate) {
   Locker locker(isolate);
   Context::Scope context_scope(evaluation_context_);
   HandleScope outer_scope;
   Handle<String> name = String::New("(d8)");
-  LineEditor* console = LineEditor::Get();
-  printf("V8 version %s [console: %s]\n", V8::GetVersion(), console->name());
-  console->Open();
+  LineEditor console(isolate);
+  printf("V8 version %s [console: %s]\n", V8::GetVersion(), console.name());
   while (true) {
     HandleScope inner_scope;
-    Handle<String> input = console->Prompt(Shell::kPrompt);
+    Handle<String> input = console.Prompt(Shell::kPrompt);
     if (input.IsEmpty()) break;
     ExecuteString(input, name, true, true);
   }
   printf("\n");
 }
 
 
 #ifndef V8_SHARED
 class ShellThread : public i::Thread {
  public:
@@ skipping 378 matching lines @@
   }
 #endif  // V8_SHARED
   return 0;
 }
 
 
 int Shell::Main(int argc, char* argv[]) {
   if (!SetOptions(argc, argv)) return 1;
   int result = 0;
   Isolate* isolate = Isolate::GetCurrent();
-  DumbLineEditor dumb_line_editor(isolate);
   {
     Initialize(isolate);
     Symbols symbols(isolate);
     InitializeDebugger(isolate);
 
     if (options.stress_opt || options.stress_deopt) {
       Testing::SetStressRunType(options.stress_opt
                                 ? Testing::kStressTypeOpt
                                 : Testing::kStressTypeDeopt);
       int stress_runs = Testing::GetStressRuns();
@@ skipping 49 matching lines @@
 }
 
 }  // namespace v8
 
 
 #ifndef GOOGLE3
 int main(int argc, char* argv[]) {
   return v8::Shell::Main(argc, argv);
 }
 #endif