Simplify conversion between VM::Value and V8::Value

Also implement the Exception class and ThrowException.

Change-Id: Ib9ca804cb82288d9da8b74f6cd3c38ecd61dbc1b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/v4/qv4v8.cpp b/src/v4/qv4v8.cpp
index 312e524..05c9618 100644 (file)
--- a/src/v4/qv4v8.cpp
+++ b/src/v4/qv4v8.cpp
@@ -111,6 +111,18 @@ bool Value::StrictEquals(Handle<Value> that) const
     return __qmljs_strict_equal(*ConstValuePtr(this), *ConstValuePtr(&that));
 }
 
+VM::Value Value::vmValue() const
+{
+    return *ConstValuePtr(this);
+}
+
+Handle<Value> Value::fromVmValue(const VM::Value &vmValue)
+{
+    Handle<Value> res;
+    res.val = vmValue.val;
+    return res;
+}
+
 Local<Boolean> Value::ToBoolean() const
 {
     return Local<Boolean>::New(Value::NewFromInternalValue(QQmlJS::VM::Value::fromBoolean(ConstValuePtr(this)->toBoolean()).val));
@@ -470,5 +482,39 @@ Handle<Boolean> False()
     return val;
 }
 
+Handle<Value> ThrowException(Handle<Value> exception)
+{
+    __qmljs_throw(currentEngine()->current, exception->vmValue());
+    return Handle<Value>();
+}
+
+
+Local<Value> Exception::ReferenceError(Handle<String> message)
+{
+    Q_UNUSED(message);
+    VM::Object *o = currentEngine()->newReferenceErrorObject(currentEngine()->current, message->ToString()->asQString());
+    return Local<Value>::New(Value::fromVmValue(VM::Value::fromObject(o)));
+}
+
+Local<Value> Exception::SyntaxError(Handle<String> message)
+{
+    Q_UNUSED(message);
+    VM::Object *o = currentEngine()->newSyntaxErrorObject(currentEngine()->current, 0);
+    return Local<Value>::New(Value::fromVmValue(VM::Value::fromObject(o)));
+}
+
+Local<Value> Exception::TypeError(Handle<String> message)
+{
+    Q_UNUSED(message);
+    VM::Object *o = currentEngine()->newTypeErrorObject(currentEngine()->current, message->ToString()->asQString());
+    return Local<Value>::New(Value::fromVmValue(VM::Value::fromObject(o)));
+}
+
+Local<Value> Exception::Error(Handle<String> message)
+{
+    Q_UNUSED(message);
+    VM::Object *o = currentEngine()->newErrorObject(VM::Value::fromString(currentEngine()->current, message->ToString()->asQString()));
+    return Local<Value>::New(Value::fromVmValue(VM::Value::fromObject(o)));
+}
 
 }

diff --git a/src/v4/qv4v8.h b/src/v4/qv4v8.h
index 1261dfd..4c38c8b 100644 (file)
--- a/src/v4/qv4v8.h
+++ b/src/v4/qv4v8.h
@@ -966,6 +966,9 @@ class V8EXPORT Value : public Data {
       return res;
   }
 
+  QQmlJS::VM::Value vmValue() const;
+  static Handle<Value> fromVmValue(const QQmlJS::VM::Value &vmValue);
+
 };
 
 
@@ -2048,7 +2051,6 @@ Handle<Value> V8EXPORT ThrowException(Handle<Value> exception);
  */
 class V8EXPORT Exception {
  public:
-  static Local<Value> RangeError(Handle<String> message);
   static Local<Value> ReferenceError(Handle<String> message);
   static Local<Value> SyntaxError(Handle<String> message);
   static Local<Value> TypeError(Handle<String> message);