summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Collapse)AuthorAgeFilesLines
* add configure options for (not) building the QtScript moduleKent Hansen2009-08-0758-229/+0
| | | | | | | | | | | | | | | | | | -script (default) and -no-script. This means we can get rid of the SCRIPT feature from qfeatures, since it's now handled by the new configure variable. It also allows us to get rid of all the QT_NO_SCRIPT ifdefs from the source files, since qmake isn't going to include those files for compilation when you configure with -no-script. The QtScriptTools module will be disabled if the QtScript module is not built. You'll have to build the old QtScript back-end (will be made available in a separate package), then build the QtScriptTools module yourself. Reviewed-by: Simon Hausmann
* kill dead codeKent Hansen2009-08-061-134/+0
|
* delete AST-to-string visitorKent Hansen2009-08-062-1675/+0
| | | | | We don't need it anymore because we use JSC's toString implementation for function objects.
* fix regression in enumeration of QPropertiesKent Hansen2009-08-061-1/+1
|
* port commit 47c9e7b1b3551ff6dbe71590461a45ae398a9501 from qt/masterKent Hansen2009-08-064-17/+26
|
* finish implementation of QVariant.prototype.toString()Kent Hansen2009-08-061-16/+24
| | | | Behave like the old back-end.
* make iteration work for the global object againKent Hansen2009-08-062-6/+8
| | | | Follow-up to commit 520378cfedd63544a9689687256d2c89352ee561
* remove docs that mention QScriptValue::{scope,setScope}()Kent Hansen2009-08-061-2/+2
| | | | | | Those functions are internal and we don't want to support them in the JSC back-end, because they expose too much implementation detail of the old back-end.
* Updates getPropertyNames() on all javascript object to use the flagBenjamin Poulain2009-08-057-28/+17
| | | | | | | | getPropertyNames() now uses a flag to specify which property should be filtered. This flag should be used by all javascript objects. This patch fixes the changes introduced by e520df1f8678bd59adb341fb586f008a7de17fe8
* make QScriptEngine::newQMetaObject() workKent Hansen2009-08-053-65/+107
|
* add type info and attribute getters for function wrappersKent Hansen2009-08-052-0/+17
|
* don't store QScriptEngine pointer in native function wrappersKent Hansen2009-08-053-29/+31
| | | | | We can infer it from the JSC environment when the function is actually called.
* remove unused codeOlivier Goffart2009-08-043-7/+0
|
* clear abort flag when we start a new evaluateKent Hansen2009-08-041-0/+1
| | | | | Otherwise evaluate() would _always_ return the value previously passed to abortEvaluation(), once a script had been aborted.
* move Global Object to its own fileKent Hansen2009-08-044-132/+267
|
* adapt to commit 014c4c63066fd3920594e6a58b02f314b5c88cdfKent Hansen2009-08-048-28/+39
|
* Use a more reliable method to dinstinguish between an op_call and an ↵Olivier Goffart2009-08-041-2/+5
| | | | | | | | | | | | | | | | | | op_construct The two opcode operand looks like this. -7 -6 -5 -4 -3 -2 -1 op_construct dst(r) func(r) argCount(n) registerOffset(n) proto(r) thisRegister(r) op_call dst(r) func(r) argCount(n) registerOffset(n) as the registerOffset must always be bigger than any register we can use that knoweldge to differenciate the two calls Note that this is only the fallback used for JavaScript function. native function still uses the QScriptActivationObject Reviewed-by: Kent Hansen
* Do not crash if using popContext() while the current context have not been ↵Olivier Goffart2009-08-041-0/+5
| | | | | | pushed Reviewed-by: Kent Hansen
* Implement QScriptEngine::abortEvaluation()Tor Arne Vestbø2009-08-032-3/+16
| | | | | | We store the abort-state in the TimeoutChecker, since that's where we'll mostly access it, but the abort result is stored in the QScriptEngine's d-pointer.
* Implement QScriptEngine::setProcessEventsInterval()Tor Arne Vestbø2009-08-031-5/+35
| | | | | We're using a wrapper around TimeoutChecker, where we re-implement didTimeout() to call processEvents().
* Complete the implementation of QScriptValueIterator with JSCoreBenjamin Poulain2009-08-031-24/+43
| | | | | | | | | | | | | This new implementation of QScriptValueIterator passes all the tests. QScriptValueIterator uses an linked list instead of JSC::PropertyNameArray so the list can be modified by ::remove() and to be able to add internal properties for the strings and arrays. Structure::getPropertyNames() has been modified to not show the property from the prototype. Reviewed-by: Kent Hansen
* Unify QScriptValue::toObject() and QScriptEngine::toObject()Benjamin Poulain2009-08-031-19/+1
| | | | | | | QScriptValue::toObject() call QScriptEngine::toObject() so the code is not duplicated. Reviewed-by: Kent Hansen
* QScriptContext::calledAsConstructor also works with non-native functionOlivier Goffart2009-08-031-5/+21
| | | | | | | Use the opcode to see if it was called with op_construct This could also work with native function, but not when they are called with QScriptValue::call() or QScriptValue::construct()
* Remove QScriptContextPrivate, QScriptContext is now a JSC::CallFrameOlivier Goffart2009-07-315-133/+80
| | | | | | | | | | | | | | There will not be instances of QScriptContext anymore. Pointer to QScriptContext are just pointer to JSC::CallFrame This simplifies the code as we do not need to manage the memory for the QScriptContext anymore. It is compatible because it is not possible to create QScriptContext. They were all created by QScriptEngine. QScriptContext constructor is private. Aknoweldged-by: Kent
* Move the declaration on some function into qscriptengine_p.hOlivier Goffart2009-07-318-41/+19
|
* Small Refactoring of QScriptOlivier Goffart2009-07-318-57/+78
| | | | | | | | | - Create a scope (activation object) for the native constructor in QScriptClass - put the isCalledasConstructor in the activation object (so i can clean up the QScriptContext - Remove the code duplication in all native functions. Aknoweldged-by: Kent
* QScriptValueIterator: fix missing non-enumerable valuesTor Arne Vestbø2009-07-318-24/+30
| | | | | | | | | | Added an extra argument to JSObject::getPropertyNames() that specifies if the non-enumerable properties (those with the DontEnum attribute set) should be included or not. Tried looking at using a unsigned as an attribute-inclusion or exclusion filter, but the semantics of either the calling or the callee code would be very strange so I opted out.
* Basic implementation of QScriptValueIterator with JSCBenjamin Poulain2009-07-311-15/+30
| | | | | Implement the methods to move forward and backward in the list of property.
* implement QScriptContext::activationObject()Kent Hansen2009-07-301-9/+38
|
* Add missing fileOlivier Goffart2009-07-301-0/+88
|
* attempt to return something sensible in uncaughtExceptionBacktrace()Kent Hansen2009-07-301-4/+10
| | | | | | | | JSC doesn't provide a way to get the backtrace after the exception has happened (you can only get it at the point it's thrown, by installing a debugger). As a least effort, we try to use the uncaught exception to provide a 1-line backtrace (the filename and linenumber of the innermost call where the exception happened).
* Implement QScriptEngine::pushContext end popContextOlivier Goffart2009-07-302-4/+28
| | | | Reviewed-by: Kent Hansen
* Move QScriptActivationObject to his own fileOlivier Goffart2009-07-303-37/+100
|
* set calledAsConstructor to true when function is called as constructorKent Hansen2009-07-294-0/+11
|
* initialize calledAsConstructor memberKent Hansen2009-07-291-0/+1
|
* Fix license headersOlivier Goffart2009-07-2936-151/+1231
|
* Compile in release mode.Olivier Goffart2009-07-291-0/+1
| | | | | | Some function (such as JSValue::strictEquals) are declared inline in Operations.h and if that header is not included, that will produce link errors
* Enter a scope when enterning a native function.Olivier Goffart2009-07-292-13/+90
| | | | | | | | | | | | | | so native function that would call engine->evaluate("var b = 'foo'); would not change the global object. The change in qscriptengine.cpp makes sure that the correct scope is used for the execution of QScriptEngine::evaluate. The changes in qscriptfunction.cpp push a new scope for native function calls. We might want to move that into QScriptContext later Reviewed-by: Kent Hansen
* Memory leak.Olivier Goffart2009-07-291-1/+1
| | | | d_ptr is not stack allocated anymore
* Set the this object on the global context sets the global objectOlivier Goffart2009-07-281-1/+1
| | | | Reviewed-by: Kent Hansen
* don't allow defining getter/setter for __proto__ propertyKent Hansen2009-07-281-4/+9
|
* make more tests pass for QScriptValue::setProperty()Kent Hansen2009-07-281-23/+53
| | | | | | 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.
* Fix tst_QScriptEngine::uncaughtExceptionOlivier Goffart2009-07-281-1/+0
| | | | | | | | | | | | The test used to test that passing 0 as line number works. There is no reason to impose the lineNumber to be >= 1, this is an arbitrary limitation. It even works when passing negative value, but as -1 is a magic number, an error on line '-1' will not have lineNumber Reviewed-by: Kent Hansen
* Fix tst_QScriptEngine::nestedEvaluateOlivier Goffart2009-07-283-8/+18
| | | | | | The 'this' value was not correctly set when evaluating Reviewed-by: Kent Hansen
* Make the 'arguments' object working when calling eval from native functionsOlivier Goffart2009-07-281-2/+7
| | | | | | | The 'arguments' is not handled by JavaScriptCore for native function. We have to do that manually Reviewed-by: Kent Hansen
* Change JavaScriptCore so it throw error when passing invalid regexp flagOlivier Goffart2009-07-281-1/+8
| | | | | | | | | As specified in the specification. The QScriptEngine::newRegExp on the other hand used to work with invalid flags. Reviewed-by: Kent Hansen
* compileKent Hansen2009-07-271-3/+3
|
* make QScriptEngine::setGlobalObject() work to some extentKent Hansen2009-07-275-34/+165
| | | | | | | | | | | | | | | | | | | | | | | | | 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.
* use engine's globalObject() instead of exec's lexicalGlobalObject()Kent Hansen2009-07-271-7/+7
|
* don't rely on custom global object to get GC callbackKent Hansen2009-07-276-45/+42
| | | | | | | | | | | 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).