WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom/VM/virtualmachine.cpp

     //access global context within this scope
     Context::Scope context_scope(myContext);
     //exception handler
-    TryCatch try_catch;
+    TryCatch tryCatch;
     //compile script to binary code - JIT
     Handle<Script> script = Script::Compile(source, name);
     //check if we got problems on compilation
     if (script.IsEmpty())
+    {
-        // Print errors that happened during compilation.
-        String::AsciiValue error(try_catch.Exception());
+        printException(&tryCatch);
-        string sError = *error;
+        slog << "\n";
-        slog << "Failed to compile script: " + sError + "\n";
+        return;
+    }
     else
+    {
         //no errors , let's continue
         Handle<Value> result = script->Run();
         //check if execution ended with errors
         if (result.IsEmpty())
+        {
-            // Print errors that happened during execution.
-            String::AsciiValue error(try_catch.Exception());
+            printException(&tryCatch);
-            string sError = *error;
+            slog << "\n";
-            slog << "Constructor: Failed to run script: " << sError << "\n";
+            return;
+        }
         else
+        {
             loadScript("System/Startup.js");
                 callHandleNMTMessage(canMessage);
+            }
             else
+            {
                 callHandleMessage(canMessage);
             }
         }
         mySemaphore.wait();
+    }
     mySemaphore.unlock();
+}
 void VirtualMachine::queueCanMessage(CanMessage canMessage)
 {
     myCanMessages.push(canMessage);
     mySemaphore.broadcast();
 }
 void VirtualMachine::queueExpression(string expression)
+{
     myExpressions.push(expression);
     mySemaphore.broadcast();
+}
 bool VirtualMachine::loadScript(string scriptName)
 {
     SyslogStream &slog = SyslogStream::getInstance();
     string basePath = Settings::get("BasePath") + "Services/";
     string scriptFileName = basePath + scriptName;
     if (!file_exists(scriptFileName))
+    {
         slog << "Failed to load " + scriptFileName + "\n";
         return false;
     }
-    string scriptSource = file_get_contents(scriptFileName);
-    Handle<String> source =  String::New(scriptSource.c_str(), scriptSource.length());
-    //each script name must be unique , for this demo I just run one embedded script, so the name can be fixed
-    Handle<String> name = String::New(scriptName.c_str(), scriptName.length());
-    //access global context within this scope
-    Context::Scope context_scope(myContext);
-    //exception handler
-    TryCatch try_catch;
-    //compile script to binary code - JIT
-    Handle<Script> script = Script::Compile(source, name);
-    //check if we got problems on compilation
-    if (script.IsEmpty())
-    {
-        // Print errors that happened during compilation.
-        String::AsciiValue error(try_catch.Exception());
-        string sError = *error;
-        slog << "loadScript: Failed to compile script: " + sError + "\n";
-        return false;
-    }
-    else
-    {
-        //no errors , let's continue
-        Handle<Value> result = script->Run();
-        //check if execution ended with errors
-        if (result.IsEmpty())
-        {
-            // Print errors that happened during execution.
-            String::AsciiValue error(try_catch.Exception());
-            string sError = *error;
-            slog << "loadScript: Failed to run script: " + sError + "\n";
-            return false;
-        }
+    string scriptSource = file_get_contents(scriptFileName);
+    Handle<String> source =  String::New(scriptSource.c_str(), scriptSource.length());
+    //each script name must be unique , for this demo I just run one embedded script, so the name can be fixed
+    Handle<String> name = String::New(scriptName.c_str(), scriptName.length());
+    //access global context within this scope
+    Context::Scope context_scope(myContext);
+    //exception handler
+    TryCatch tryCatch;
+    //compile script to binary code - JIT
+    Handle<Script> script = Script::Compile(source, name);
+    //check if we got problems on compilation
+    if (script.IsEmpty())
+    {
+        printException(&tryCatch);
+        slog << "\n";
+        return false;
+    }
+    else
+    {
+        //no errors , let's continue
+        Handle<Value> result = script->Run();
+        //check if execution ended with errors
+        if (result.IsEmpty())
+        {
+            printException(&tryCatch);
+            slog << "\n";
+            return false;
+        }
         slog << "Loaded " + scriptName + "\n";
     }
     return true;
+}
 void VirtualMachine::callHandleNMTMessage(CanMessage canMessage)
         mySocketThreads[id]->send(data);
+    }
+}
 bool VirtualMachine::runExpression(string expression)
 {
     SyslogStream &slog = SyslogStream::getInstance();
     string scriptName = "runExpression";
     Handle<String> source =  String::New(expression.c_str(), expression.length());
     //each script name must be unique , for this demo I just run one embedded script, so the name can be fixed
     Handle<String> name = String::New(scriptName.c_str(), scriptName.length());
     //access global context within this scope
     Context::Scope context_scope(myContext);
     //exception handler
-    TryCatch try_catch;
+    TryCatch tryCatch;
     //compile script to binary code - JIT
     Handle<Script> script = Script::Compile(source, name);
     //check if we got problems on compilation
     if (script.IsEmpty())
     {
-        // Print errors that happened during compilation.
-        String::AsciiValue error(try_catch.Exception());
-        string sError = *error;
+        printException(&tryCatch);
-        slog << "runExpression: Failed to compile script: " + sError + "\n";
-        slog << expression << "\n\n";
+        slog << "\n";
         return false;
+    }
     else
+    {
         //no errors , let's continue
         Handle<Value> result = script->Run();
         //check if execution ended with errors
         if (result.IsEmpty())
+        {
-            // Print errors that happened during execution.
-            String::AsciiValue error(try_catch.Exception());
+            printException(&tryCatch);
-            string sError = *error;
+            slog << "\n";
-            slog << "runExpression: Failed to run script: " + sError + "\n";
             return false;
         }
     }
     return true;
+}
+void VirtualMachine::printException(TryCatch* tryCatch)
+{
+    SyslogStream &slog = SyslogStream::getInstance();
+    HandleScope handle_scope;
+    String::Utf8Value exception(tryCatch->Exception());
+    Handle<v8::Message> message = tryCatch->Message();
+    string strException = *exception;
+    if (message.IsEmpty())
+    {
+        // V8 didn't provide any extra information about this error; just print the exception.
+        slog << strException + "\n";
+    }
+    else
+    {
+        // Print (filename):(line number): (message).
+        String::Utf8Value filename(message->GetScriptResourceName());
+        int linenum = message->GetLineNumber();
+        string strFilename = *filename;
+        slog << strFilename + ":" + itos(linenum) + ": " + strException + "\n";
+        // Print line of source code.
+        String::Utf8Value sourceline(message->GetSourceLine());
+        string strSourceline = *sourceline;
+        slog << strSourceline + "\n";
+        string underline;
+        // Print wavy underline (GetUnderline is deprecated).
+        int start = message->GetStartColumn();
+        for (int i = 0; i < start; i++)
+        {
+            underline += " ";
+        }
+        int end = message->GetEndColumn();
+        for (int i = start; i < end; i++)
+        {
+            underline += "^";
+        }
+        slog << underline + "\n";
+    }
+}
 Handle<Value> VirtualMachine_log(const Arguments& args)
+{
     SyslogStream &slog = SyslogStream::getInstance();

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom/VM/virtualmachine.cpp @ 995 – Rev 986 → 995