3 files changed, 61 insertions, 44 deletions

diff --git a/akonadish/main.cpp b/akonadish/main.cpp
index f3cbcac..4c00b9b 100644
--- a/akonadish/main.cpp
+++ b/akonadish/main.cpp
@@ -31,71 +31,82 @@
 /*
  * modes of operation:
  *
- *   1. called with no commands: start the REPL and listen for JSON on stin
- *   2. called with -: listen for JSON on stdin
- *   3. called with commands: try to match to syntx
+ *   1. called with no commands: start the REPL
+ *   2. called with -: listen for commands on stdin
+ *   3. called with a filename: try to run it as a script
+ *   4. called with commands: try to match to syntax and run the result
  */
 
+int enterRepl()
+{
+    if (State::hasEventLoop()) {
+        return 0;
+    }
+
+    Repl *repl = new Repl;
+    QObject::connect(repl, &QStateMachine::finished,
+                     repl, &QObject::deleteLater);
+    QObject::connect(repl, &QStateMachine::finished,
+                     QCoreApplication::instance(), &QCoreApplication::quit);
+
+    State::setHasEventLoop(true);
+    int rv = QCoreApplication::instance()->exec();
+    State::setHasEventLoop(false);
+    return rv;
+}
+
+bool goInteractive(const QStringList &, State &)
+{
+    enterRepl();
+    return true;
+}
+
+Syntax::List goInteractiveSyntax()
+{
+    Syntax interactive("go_interactive", QString(), &goInteractive);
+    return Syntax::List() << interactive;
+}
+
+void processCommandStream(QTextStream &stream)
+{
+    SyntaxTree::self()->registerSyntax(&goInteractiveSyntax);
+    QString line = stream.readLine();
+    while (!line.isEmpty()) {
+        line = line.trimmed();
+
+        if (!line.isEmpty() && !line.startsWith('#')) {
+            SyntaxTree::self()->run(SyntaxTree::tokenize(line));
+        }
+
+        line = stream.readLine();
+    }
+}
+
 int main(int argc, char *argv[])
 {
     const bool interactive = isatty(fileno(stdin));
     const bool startRepl = (argc == 1) && interactive;
     //TODO: make a json command parse cause that would be awesomesauce
-    const bool startJsonListener = !startRepl &&
-                                   (argc == 2 && qstrcmp(argv[1], "-") == 0);
     const bool fromScript = !startRepl && QFile::exists(argv[1]);
 
-    //qDebug() << "state at startup is" << interactive << startRepl << startJsonListener << fromScript;
+    //qDebug() << "state at startup is" << interactive << startRepl << fromScript;
 
     QCoreApplication app(argc, argv);
     app.setApplicationName(fromScript ? "interactive-app-shell" : argv[0]);
-    //app.setApplicationName(argv[0]);
-
-    if (startRepl || startJsonListener) {
-        if (startRepl) {
-            Repl *repl = new Repl;
-            QObject::connect(repl, &QStateMachine::finished,
-                             repl, &QObject::deleteLater);
-            QObject::connect(repl, &QStateMachine::finished,
-                             &app, &QCoreApplication::quit);
-        }
-
-        if (startJsonListener) {
-//        JsonListener listener(syntax);
-        }
 
-        State::setHasEventLoop(true);
-        return app.exec();
+    if (startRepl) {
+        return enterRepl();
     } else if (fromScript) {
         QFile f(argv[1]);
         if (!f.open(QIODevice::ReadOnly)) { 
             return 1;
         }
 
-        QString line = f.readLine();
-        while (!line.isEmpty()) {
-            line = line.trimmed();
-
-            if (!line.isEmpty() && !line.startsWith('#')) {
-                SyntaxTree::self()->run(SyntaxTree::tokenize(line));
-            }
-
-            line = f.readLine();
-        }
-        exit(0);
+        QTextStream inputStream(&f);
+        processCommandStream(inputStream);
     } else if (!interactive) {
         QTextStream inputStream(stdin);
-
-        QString line = inputStream.readLine();
-        while (!line.isEmpty()) {
-            line = line.trimmed();
-
-            if (!line.isEmpty() && !line.startsWith('#')) {
-                SyntaxTree::self()->run(SyntaxTree::tokenize(line));
-            }
-
-            line = inputStream.readLine();
-        }
+        processCommandStream(inputStream);
     } else {
         QStringList commands = app.arguments();
         commands.removeFirst();
diff --git a/akonadish/state.cpp b/akonadish/state.cpp
index dbd5952..9fb5bcc 100644
--- a/akonadish/state.cpp
+++ b/akonadish/state.cpp
@@ -114,6 +114,11 @@ void State::setHasEventLoop(bool evented)
     s_hasEventLoop = evented;
 }
 
+bool State::hasEventLoop()
+{
+    return s_hasEventLoop;
+}
+
 void State::setCommandTiming(bool time)
 {
     d->timing = time;
diff --git a/akonadish/state.h b/akonadish/state.h
index 543b063..3c4c2c7 100644
--- a/akonadish/state.h
+++ b/akonadish/state.h
@@ -43,6 +43,7 @@ public:
     QString loggingLevel() const;
 
     static void setHasEventLoop(bool evented);
+    static bool hasEventLoop();
 
 private:
     class Private;