| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
| |
QScriptValue::toObject() call QScriptEngine::toObject() so the code is
not duplicated.
Reviewed-by: Kent Hansen
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
JSC doesn't provide a way of un-defining a getter/setter. If
deleting e.g. only the setter, we remember the getter, delete
the property, then re-establish the getter.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
JSC requires that the global object is actually a
JSGlobalObject instance, whereas QScriptEngine::setGlobalObject()
allows any object to be set as the global object. The way we
solve this is by proxying from an internal global object to the
custom (user-set) object.
We need to take care that the internal global object is never
actually exposed through our API; a brilliantly named helper
function, toUsableValue(), makes that happen.
Evaluating "var a = 10" with a custom global object doesn't work
yet; the variable always ends up in the internal Global Object.
For variable assignments, JSC appears to bypass the normal
JSObject::put() and instead use
JSGlobalObject::copyGlobals{From,To}(), which means I can't
intercept and proxy the assignments.
This commit enough to get the Context2D example working. There's
another bug with iteration of the built-in Global Object's
properties (non-enumerable properties are always skipped by the
JSC C++ API, whereas with QScriptValueIterator they should not
be), but that's a totally separate issue.
|
|
|
|
|
|
|
|
|
|
|
| |
Install custom ClientData on JSGlobalData instance instead.
Also some cleanups to avoid globalObject et al being accessed
directly.
Killed the proxying scheme employed in setGlobalObject() since it
didn't work; if you stored the original Global Object and replaced
it with another object, then added properties to the new object,
they would show up in the old object, too (because the old object
would always proxy to whatever the current Global Object was).
|
|
|
|
|
|
|
|
|
| |
Use the exception from JSC::exec instead of
QScriptEngin::uncaughtException.
A few more tests are passing for qscriptvalue and qscriptqobject.
Reviewed-by: Kent Hansen
|
|
|
|
|
|
|
|
| |
So the exception we get as result are the one thrown by the function.
(fix tst_QScriptEngine::newRegExp test)
Reviewed-by: Kent Hansen
|
| |
|
|
|
|
|
| |
Support has been added to the JSC functions to support host functions
as well, so now we can use them directly.
|
|
|
|
|
|
| |
Handle Exception in a toString function
Reviewed-by: Kent Hansen
|
| |
|
| |
|
| |
|
|
|
|
|
| |
JSC refuses to call functions when there's an exception that hasn't
been dealt with, so save the exception and restore it afterwards.
|
|
|
|
| |
getter
|
|
|
|
|
|
|
| |
engine
Also change the stringValue not to be a pointer. This fixes a memory
leak.
|
|
|
|
|
|
| |
If we implement the ability to change the global object, the
global object pointer can change, so we need to keep a
reference to the object if it's stored in a QScriptValue.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With an object created by QScriptEngine::newObject(), it should
be possible to call QScriptValue::setClass() to dynamically
change the behavior of that object. Similarly, it should be
possible to promote plain script objects to QObject (QVariant)
wrappers by calling the overload of QScriptEngine::newQObject()
(newVariant()) that takes a script object as the first argument.
This commit implements this capability.
The premise is the (internal) QScriptObject class, which inherits
JSC::JSObject. It reimplements all the methods for getting/setting
properties etc. Then there's a level of indirection to facilitate
dynamic change of the class: Each QScriptObject can have a
delegate associated with it that will handle operations on the
object. By default there is no delegate, so the object behaves as
a normal JS object, as you expect. However, once a delegate is set
(e.g., when QScriptValue::setScriptClass() is called),
QScriptObject will give the delegate the chance to handle the
object operation.
In addition to a delegate implementation for QScriptClass-based
objects, there are also delegates for QObject and QVariant
wrappers. These replace the QObjectWrapperObject and
QVariantWrapperObject classes.
|
| |
|
|
|
|
| |
(QScriptValue::objectId() and QScriptEnigne::objectById)
|
| |
|
|
|
|
| |
E.g. QScriptClass-based objects.
|
|
|
|
| |
Do it The right way(TM), by lazily wrapping JSC::ExecState objects.
|
| |
|
|
|
|
|
|
| |
It's possible that JSC evaluate() returns a completion of type
Throw without hadException() being true, so we need to store the
exception value explicitly.
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Enumeration is missing, as is the ability to change the class
of an object after it has been created.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Not everything passes but at least nothing asserts anymore, so
the test runs to completion.
|
|
|
|
| |
call(), construct() etc.
|
| |
|
|
|