Make linenoiseState a class with methods, various other adjustments

example/CMakeLists.txt

@@ -3,3 +3,11 @@ include_directories(.)
 add_definitions("-std=c++1y")
 
 add_executable(example example.cpp)
+add_executable(example_old example_old.cpp)
+
+add_executable(multiinclude
+       	multiinclude/main.cpp
+       	multiinclude/f1.cpp
+       	multiinclude/f2.cpp
+)
+

example/example.cpp

@@ -7,14 +7,22 @@ int main(int argc, const char** argv)
 {
     const auto path = "history.txt";
 
+#ifdef _WIN32
+    const char *prompt = "hello> ";
+#else
+    const char *prompt = "\033[32mこんにちは\x1b[0m> ";
+#endif
+
+    linenoise::linenoiseState l(prompt);
+
     // Enable the multi-line mode
-    linenoise::SetMultiLine(true);
+    l.EnableMultiLine();
 
     // Set max length of the history
-    linenoise::SetHistoryMaxLen(4);
+    l.SetHistoryMaxLen(4);
 
     // Setup completion words every time when a user types
-    linenoise::SetCompletionCallback([](const char* editBuffer, std::vector<std::string>& completions) {
+    l.SetCompletionCallback([](const char* editBuffer, std::vector<std::string>& completions) {
         if (editBuffer[0] == 'h') {
 #ifdef _WIN32
             completions.push_back("hello こんにちは");
@@ -27,15 +35,11 @@ int main(int argc, const char** argv)
     });
 
     // Load history
-    linenoise::LoadHistory(path);
+    l.LoadHistory(path);
 
     while (true) {
         std::string line;
-#ifdef _WIN32
-        auto quit = linenoise::Readline("hello> ", line);
-#else
-        auto quit = linenoise::Readline("\033[32mこんにちは\x1b[0m> ", line);
-#endif
+        auto quit = l.Readline(line);
 
         if (quit) {
             break;
@@ -44,10 +48,10 @@ int main(int argc, const char** argv)
         cout <<  "echo: '" << line << "'" << endl;
 
         // Add line to history
-        linenoise::AddHistory(line.c_str());
+        l.AddHistory(line.c_str());
 
         // Save history
-        linenoise::SaveHistory(path);
+        l.SaveHistory(path);
     }
 
     return 0;

example/example_old.cpp

@@ -0,0 +1,54 @@
+#include <iostream>
+#include "../linenoise.hpp"
+
+using namespace std;
+
+int main(int argc, const char** argv)
+{
+    const auto path = "history.txt";
+
+    // Enable the multi-line mode
+    linenoise::SetMultiLine(true);
+
+    // Set max length of the history
+    linenoise::SetHistoryMaxLen(4);
+
+    // Setup completion words every time when a user types
+    linenoise::SetCompletionCallback([](const char* editBuffer, std::vector<std::string>& completions) {
+        if (editBuffer[0] == 'h') {
+#ifdef _WIN32
+            completions.push_back("hello こんにちは");
+            completions.push_back("hello こんにちは there");
+#else
+            completions.push_back("hello");
+            completions.push_back("hello there");
+#endif
+        }
+    });
+
+    // Load history
+    linenoise::LoadHistory(path);
+
+    while (true) {
+        std::string line;
+#ifdef _WIN32
+        auto quit = linenoise::Readline("hello> ", line);
+#else
+        auto quit = linenoise::Readline("\033[32mこんにちは\x1b[0m> ", line);
+#endif
+
+        if (quit) {
+            break;
+        }
+
+        cout <<  "echo: '" << line << "'" << endl;
+
+        // Add line to history
+        linenoise::AddHistory(line.c_str());
+
+        // Save history
+        linenoise::SaveHistory(path);
+    }
+
+    return 0;
+}

example/multiinclude/f1.cpp

@@ -0,0 +1,8 @@
+#include "../linenoise.hpp"
+
+void f1()
+{
+    linenoise::linenoiseState l("p1");
+    l.EnableMultiLine();
+}
+

example/multiinclude/f2.cpp

@@ -0,0 +1,8 @@
+#include "../linenoise.hpp"
+
+void f2()
+{
+    linenoise::linenoiseState l("p2");
+    l.EnableMultiLine();
+}
+

example/multiinclude/main.cpp

@@ -0,0 +1,9 @@
+extern void f1();
+extern void f2();
+
+int main(int argc, const char** argv)
+{
+    f1();
+    f2();
+    return 0;
+}