summaryrefslogtreecommitdiffstats
path: root/src/script/api
Commit message (Collapse)AuthorAgeFilesLines
...
* make QScriptEngine::setGlobalObject() work to some extentKent Hansen2009-07-273-26/+140
| | | | | | | | | | | | | | | | | | | | | | | | | 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.
* don't rely on custom global object to get GC callbackKent Hansen2009-07-275-43/+40
| | | | | | | | | | | 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).
* The line number is correctly reported for exceptionBenjamin Poulain2009-07-271-0/+1
| | | | | Enable the tests checking the line number of exception. Add a lower bound on the lineNumber of QScriptEngin::evaluate()
* Remove the uncaughtException, use the JSC exception insteadBenjamin Poulain2009-07-273-26/+13
| | | | | | | | | Use the exception from JSC::exec instead of QScriptEngin::uncaughtException. A few more tests are passing for qscriptvalue and qscriptqobject. Reviewed-by: Kent Hansen
* Fix tst_QScriptValue::callOlivier Goffart2009-07-271-2/+5
| | | | | | | | | | We have to set the CallFrame correctly in QScriptEngine::evaluate() in order to ger the 'arguments' object and all the local stuff working. The code Assert if dynamicGlobalObject is not set, so set it to the global object. Reviewed-by: Kent Hansen
* Fix tst_QScriptContext::argumentsOlivier Goffart2009-07-271-2/+3
|
* use custom JSGlobalData clientdata to keep pointer to script engineKent Hansen2009-07-271-1/+11
| | | | Better than relying on a custom Global Object.
* move engine-specific GC marking to QScriptEnginePrivateKent Hansen2009-07-272-40/+45
|
* use scriptEngineFromExec() in a few more placesKent Hansen2009-07-271-3/+3
|
* introduce scriptEngineFromExec() helper functionKent Hansen2009-07-272-27/+27
| | | | | No need to expose the fact that we go via the Global Object to get an engine pointer.
* Clear the exceptions before calling a function.Olivier Goffart2009-07-241-4/+24
| | | | | | | | So the exception we get as result are the one thrown by the function. (fix tst_QScriptEngine::newRegExp test) Reviewed-by: Kent Hansen
* Implement QScriptString as a wraper around the JSC::IdentifierOlivier Goffart2009-07-236-91/+114
|
* Try best to convert a regexp to a ECMAScript expressionOlivier Goffart2009-07-231-1/+40
|
* make QScriptValue::{call,construct}() use JSC::{call,construct}()Kent Hansen2009-07-231-56/+4
| | | | | Support has been added to the JSC functions to support host functions as well, so now we can use them directly.
* More tests fixed (QScriptValue::toString)Olivier Goffart2009-07-221-0/+8
| | | | | | Handle Exception in a toString function Reviewed-by: Kent Hansen
* Fix the return value of a function call that throws an error.Ariya Hidayat2009-07-171-1/+3
|
* Fix the return value of a constructor that throws an error.Ariya Hidayat2009-07-171-1/+3
|
* implement cyclic prototype chain checkKent Hansen2009-07-171-1/+12
|
* make QScriptValue::toString() et al work when there's an exceptionKent Hansen2009-07-172-11/+78
| | | | | JSC refuses to call functions when there's an exception that hasn't been dealt with, so save the exception and restore it afterwards.
* set correct property flags in newFunction()Kent Hansen2009-07-171-2/+3
|
* We cant rely on property attributes from JavaScriptCore for the setter and ↵Olivier Goffart2009-07-161-3/+3
| | | | getter
* do the correct prototype checkKent Hansen2009-07-161-2/+1
| | | | There was a bug in commit 1d56e14605d74aefb955bdd81ee4083131252c9e
* start implementing constructors for QMetaObject wrappersKent Hansen2009-07-162-7/+13
|
* fix bug in built-in print() functionKent Hansen2009-07-161-3/+2
| | | | D'oh, inverse logic.
* Convert the strings or number value to jscvalue when they are used with an ↵Olivier Goffart2009-07-163-22/+26
| | | | | | | engine Also change the stringValue not to be a pointer. This fixes a memory leak.
* only set default prototype if resulting object has built-in Object prototype ↵Kent Hansen2009-07-161-1/+4
| | | | | | as its prototype port of commit 4182e9c4b2cbfcd0604c57da210e97d68cbbbb52 in qt/master.
* compile when JIT is enabledKent Hansen2009-07-151-0/+1
| | | | NativeFunctionWrapper is typedef for JSFunction
* don't try to be so cleverKent Hansen2009-07-151-7/+4
| | | | | | 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.
* fix GC-related crashKent Hansen2009-07-151-2/+4
| | | | | | | For some reason our Global Object is not marked by the collector. This fixes the case when you invoke GC explicitly by calling collectGarbage(), but the issue is probably still there when GC is invoked implicitly.
* fix some memory leaksKent Hansen2009-07-152-2/+7
|
* avoid crashing when attempting to set this-object of global contextKent Hansen2009-07-151-0/+4
|
* initial attempt at implementing QScriptEngine::setGlobalObject()Kent Hansen2009-07-152-7/+80
| | | | | Doesn't actually replace the global object, but rather has the standard global object act as a proxy to the custom one.
* implement enumeration of custom script classesKent Hansen2009-07-151-3/+0
|
* implement QObject wrapper caching (PreferExistingWrapperObject)Kent Hansen2009-07-151-2/+12
|
* implement QScriptEngine::isEvaluating()Kent Hansen2009-07-151-3/+2
|
* don't assert in QScriptEngine::setGlobalObject()Kent Hansen2009-07-131-2/+2
| | | | allow stuff to run, even though it's likely to crash/not work...
* add GC marking guardsKent Hansen2009-07-131-7/+13
| | | | | Caller is responsible for calling marked() before mark(), otherwise you might get infinite recursion.
* Merge branch 'qtscript-jsc-backend' of ↵Jedrzej Nowacki2009-07-133-268/+93
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/qt-webkit into qtscript-jsc-backend
| * don't crash during GC if no prototype has been set for a metatypeKent Hansen2009-07-101-4/+7
| | | | | | | | | | | | Also, have pushContext() return currentContext() for now, to avoid crashing, and disable processing of __postInit__ property in importExtension() for same reason.
| * implement ability to dynamically change class of script objectsKent Hansen2009-07-103-264/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | fix checkSyntax autotest.Jedrzej Nowacki2009-07-133-17/+42
| |
* | fix autotest canEvaluate.Jedrzej Nowacki2009-07-132-5/+82
|/
* some small fixes/experimentsKent Hansen2009-07-101-4/+20
|
* register QScriptValue as meta-typeKent Hansen2009-07-091-0/+2
| | | | The old engine did it as well. Makes more tests pass.
* use JSC::call() and JSC::construct()Kent Hansen2009-07-091-54/+2
|
* Fix autotest checking QScriptValue::objectId method.Jedrzej Nowacki2009-07-094-19/+29
| | | | (QScriptValue::objectId() and QScriptEnigne::objectById)
* make arguments object work for native functionsKent Hansen2009-07-091-1/+1
| | | | There's an off-by-one issue that we just work around for now.
* use currentFrame instead of globalExec whenever we canKent Hansen2009-07-092-47/+47
|
* support callees that are not function objectsKent Hansen2009-07-092-5/+5
| | | | E.g. QScriptClass-based objects.
* rewrite most of QScriptContext handlingKent Hansen2009-07-086-82/+294
| | | | Do it The right way(TM), by lazily wrapping JSC::ExecState objects.
generated by cgit v0.12 at 2025-04-24 07:54:18 (GMT)