Changeset 14055 for trunk/FACT++/src/InterpreterV8.cc

Timestamp:

06/03/12 21:39:43 (12 years ago)

Author:

tbretz

Message:

Added the possibility to run with arguments; added exit() command to JS

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (10 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -13 +13 @@
 using namespace v8;
 
-void InterpreterV8::ReportException(TryCatch* try_catch)
+bool InterpreterV8::ReportException(TryCatch* try_catch)
 {
     const HandleScope handle_scope;
 
     const String::Utf8Value exception(try_catch->Exception());
+
+    if (*exception && string(*exception)=="exit")
+        return true;
 
     const Handle<Message> message = try_catch->Message();
@@ -29 +32 @@
         out << *filename;
     if (!message.IsEmpty())
-        out << ": l. " << message->GetLineNumber();
+        out << ": l." << message->GetLineNumber();
     if (*exception)
         out << ": " << *exception;
@@ -36 +39 @@
 
     if (message.IsEmpty())
-        return;
+        return false;
 
     // Print line of source code.
@@ -48 +51 @@
 
     out.str("");
-    out << setfill(' ') <<  setw(start)     << ' ';
-    out << setfill('^') <<  setw(end-start) << '^';
+    if (start>0)
+        out << setfill(' ') << setw(start) << ' ';
+    out << setfill('^') << setw(end-start) << '^';
 
     JsException(out.str());
@@ -55 +59 @@
     String::Utf8Value stack_trace(try_catch->StackTrace());
     if (stack_trace.length()<=0)
-        return;
-
-    if (*stack_trace)
-        JsException(string("\n")+*stack_trace);
+        return false;
+
+    //if (*stack_trace)
+    //    JsException(string("\n")+*stack_trace);
+
+    return false;
 }
 
@@ -95 +101 @@
 
     if (exception.HasCaught())
-    {
-        ReportException(&exception);
-        return false;
-    }
+        return ReportException(&exception);
+
     return rc;
 }
@@ -191 +195 @@
     JsSleep(args[0]->Int32Value());
 
+    return Undefined();
+}
+
+Handle<Value> InterpreterV8::FuncExit(const Arguments &)
+{
+    v8::V8::TerminateExecution(fThreadId);
+    return ThrowException(String::New("exit"));
+/*
+    if (args.Length()!=1)
+        return ThrowException(String::New("Number of arguments must be exactly 1."));
+
+    if (!args[0]->IsUint32())
+        return ThrowException(String::New("Argument 1 must be an uint32."));
+
+    const HandleScope handle_scope;
+
+    JsSleep(args[0]->Int32Value());
+*/
     return Undefined();
 }
@@ -234 +256 @@
 }
 
-bool InterpreterV8::JsRun(const string &filename)
+#include <iostream>
+
+bool InterpreterV8::JsRun(const string &filename, const map<string, string> &map)
 {
     v8::Locker locker;
@@ -253 +277 @@
     global->Set(String::New("include"), FunctionTemplate::New(WrapInclude),                ReadOnly);
     global->Set(String::New("sleep"),   FunctionTemplate::New(WrapSleep),                  ReadOnly);
+    global->Set(String::New("exit"),    FunctionTemplate::New(WrapExit),                   ReadOnly);
     global->Set(String::New("version"), FunctionTemplate::New(InterpreterV8::FuncVersion), ReadOnly);
 
@@ -263 +288 @@
     }
 
+    v8::Context::Scope scope(context);
+
+    Local<Array> args = Array::New(map.size());
+    for (auto it=map.begin(); it!=map.end(); it++)
+        args->Set(String::New(it->first.c_str()), String::New(it->second.c_str()));
+    context->Global()->Set(String::New("arg"), args);
+
     JsStart(filename);
 
-    v8::Context::Scope scope(context);
     //context->Enter();
-
     v8::Locker::StartPreemption(10);
     const bool rc = ExecuteFile(filename);
     v8::Locker::StopPreemption();
-
     //context->Exit();