Changeset 14983 for trunk/FACT++/src

Timestamp:

03/04/13 20:13:19 (12 years ago)

Author:

tbretz

Message:

Implemented to possibility to run an interactive javascript interpreter.

Location:

trunk/FACT++/src

Files:

• InterpreterV8.cc (modified) (4 diffs)
• InterpreterV8.h (modified) (1 diff)

trunk/FACT++/src/InterpreterV8.cc

@@ -23 +23 @@
 #include "dim.h"
 #include "tools.h"
+#include "Readline.h"
 #include "externals/izstream.h"
+
+#include "WindowLog.h"
 
 using namespace std;
@@ -1719 +1722 @@
         // Print (filename):(line number): (message).
         const String::AsciiValue filename(message->GetScriptResourceName());
-
-        out << *filename;
-        if (message->GetLineNumber()>0)
-            out << ": l." << message->GetLineNumber();
-        if (*exception)
-            out << ": ";
+        if (filename.length()>0)
+        {
+            out << *filename;
+            if (message->GetLineNumber()>0)
+                out << ": l." << message->GetLineNumber();
+            if (*exception)
+                out << ": ";
+        }
     }
 
@@ -1843 +1848 @@
 
     return !ExecuteCode(buffer, name, main).IsEmpty();
+}
+
+bool InterpreterV8::ExecuteConsole()
+{
+    JsSetState(3);
+
+    WindowLog lout;
+    lout << "\n " << kUnderline << " JavaScript interpreter " << kReset << " (enter '.q' to quit)\n" << endl;
+
+    Readline::StaticPushHistory("java.his");
+
+    string command;
+
+    while (1)
+    {
+        const string buffer = Tools::Trim(Readline::StaticPrompt(command.empty() ? "JS> " : " \\> "));
+        if (buffer==".q")
+            break;
+
+        // buffer empty, do nothing
+        if (buffer.empty())
+            continue;
+
+        // Compose command
+        if (!command.empty())
+            command += ' ';
+        command += buffer;
+
+        // If line ends with a backslash, allow addition of next line
+        if (command.back()=='\\')
+        {
+            command[command.length()-1] = ' ';
+            command = Tools::Trim(command);
+            continue;
+        }
+
+        // Catch exceptions during code compilation
+        TryCatch exception;
+
+        // Execute code which was entered
+        bool rc = ExecuteCode(command, "", false).IsEmpty();
+        if (exception.HasCaught())
+        {
+            HandleException(exception, "compile");
+            rc = true;
+        }
+
+        // In case of an exception add an empty line to the output
+        if (rc)
+            lout << endl;
+
+        // command has been executed, collect new command
+        command = "";
+    }
+
+    lout << endl;
+
+    Readline::StaticPopHistory("java.his");
+
+    return true;
 }
 
@@ -2072 +2137 @@
         Locker::StartPreemption(10);
 
-        rc &= ExecuteFile(filename, true);
+        rc &= filename.empty() ? ExecuteConsole() : ExecuteFile(filename, true);
 
         Locker::StopPreemption();

trunk/FACT++/src/InterpreterV8.h

@@ -57 +57 @@
     bool HandleException(v8::TryCatch &try_catch, const char *where);
     bool ExecuteFile(const std::string &name, bool main=false);
+    bool ExecuteConsole();
     v8::Handle<v8::Value> ExecuteCode(const std::string &code, const std::string &file="internal", bool main=false);
     v8::Handle<v8::Value> ExecuteInternal(const std::string &code);