summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Collapse)AuthorAgeFilesLines
* Quick fix for translation.Michael Brasser2009-12-091-3/+4
|
* Fix garbage collection issue with script-owned objects with connectionsKent Hansen2009-11-302-23/+25
| | | | | | | | | | This reinstates the pre-4.6 behavior: A script-owned C++ object that's not referenced anymore should be garbage collected, even if it has connections. In order to achieve this, the "weak" reference to the C++ object's wrapper must be invalidated. Task-number: QTBUG-6366 Reviewed-by: Simon Hausmann
* Fix miracously exported WTF symbols in QtScript with the Maemo 5 toolchain.Lars Knoll2009-11-271-1/+1
| | | | | | | Rename the WTF namespace. Task-number: http://bugreports.qt.nokia.com/browse/QTBUG-5513 Reviewed-by: Simon Hausmann
* Don't crash in eval() function when QtScript debugger is attachedKent Hansen2009-11-231-2/+8
| | | | | | | | | | | | | | | | | | | | | The built-in eval() function bypasses the script registration performed by QScriptEngine::evaluate(), so if we get an atStatement() callback from JSC from that script, the scriptID-to-sourceProvider lookup will fail. In this case, just return from atStatement() without delivering the positionChange() callback to the QScriptEngineAgent, since the agent will not have received the scriptLoad() callback for that script anyway. This is a change in behavior from 4.5, but we consider it the minimum-impact fix at this point to keep 4.6.0 from crashing. The only downside is that debugging will effectively be "disabled" for the script passed to eval(), but that's a lot better than crashing. Task-number: QTBUG-6108 Reviewed-by: Jedrzej Nowacki
* Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-191-1/+5
|\
| * Application object must be constructed before QScriptEngineKent Hansen2009-11-181-1/+5
| | | | | | | | | | | | | | | | | | This is required due to the switch to the JavaScriptCore-based back-end. Instead of segfaulting somewhere inside JSC::initializeThreading(), call qFatal() when this constraint has been violated. Reviewed-by: Simon Hausmann
* | Ran the script utils/normalizeOlivier Goffart2009-11-181-1/+1
|/ | | | Over src/ tools/ examples/ and demos/
* Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-176-56/+126
|\
| * Merge commit 'coreteam/4.6' into oslo1-4.6Marius Storm-Olsen2009-11-136-56/+126
| |\
| | * utils/qlalr generator: adapt changes to xmlstream and script filesPeter Hartmann2009-11-116-56/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some changes were made to qxmlstream_p.h and script files directly; however, those files are generated automatically by src/corelib/xml/make-parser.sh and src/script/parser/make-parser.sh, respectively, so the generator would overwrite the manual changes to the files the next time it is run. This patch integrates those changes into the generator rather than into the files directly. Reviewed-by: Roberto Raggi Reviewed-by: Olivier Goffart
* | | Fixed the QtScript license information in the source files to referSimon Hausmann2009-11-1766-1254/+66
| | | | | | | | | | | | | | | | | | | | | | | | to the LGPL only. To do this I ran replace-licenses.zsh $QTDIR/src/script release Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | | Replace LGPL license tags with LGPL-ONLYSimon Hausmann2009-11-1766-66/+66
| | | | | | | | | | | | Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | | Compile in namespaceAaron Kennedy2009-11-171-0/+1
|/ / | | | | | | Reviewed-by: alex
* | Add QScriptDeclarativeClassAaron Kennedy2009-11-109-6/+826
| | | | | | | | | | | | | | | | | | QScriptDeclarativeClass is a private, but exported, class used by the declarativeui module. It is very similar to QScriptClass, but slightly faster and provides a couple of "backdoor" extension mechanisms used by declarative. Reviewed-by: Warwick Allison
* | added missing include for template instantiation (in qDeleteAll)mae2009-11-101-1/+1
| | | | | | | | (cherry picked from commit d01db18696a7729b0d54af76f5224aed6750f3bb)
* | During a GC mark the scope chain of QScriptContextsAaron Kennedy2009-11-101-0/+18
|/ | | | | | | | | | | | | | | | | It appears that simply being in the scope chain of an existant frame isn't sufficient to be marked. This can lead to a QScriptContext scope chain that contains a JSObject that has been collected. For example, this code: QScriptContext *ctxt = engine->pushContext(); ctxt.pushScope(engine->newObject()); previouslyCreatedFunctionObject.call(); // causes a GC can lead to the object added to the scope chain to have become invalid. This leads to hilarity later on. Reviewed-by: Kent Hansen
* Merge commit 'origin/4.6' into featureJørgen Lind2009-11-022-0/+31
|\
| * Add QScriptString::toArrayIndex() functionKent Hansen2009-10-302-0/+31
| | | | | | | | | | | | | | | | | | | | Avoid hacking a custom toArrayIndex() in the example; instead provide an ECMA-compliant conversion that's as fast as possible (having to convert the QScriptString to a QString and then convert the result to a number is considerably slower than calling JSC's Identifier::toArrayIndex() function directly). Reviewed-by: Olivier Goffart
* | Fix QT_NO_PROPERTIESJørgen Lind2009-10-291-0/+16
|/ | | | | | | However, there are some stuff added to qscript that I'm really not sure about. Reviewed-by: tom
* Say hello to QScriptProgram :-)Kent Hansen2009-10-287-58/+510
| | | | | | | | | | | QScriptProgram encapsulates a Qt Script program (AKA a script). It retains the compiled representation of the script, so that repeated evaluation of the same script becomes faster. An overload of QScriptEngine::evaluate() that takes a QScriptProgram has been added. Reviewed-by: Olivier Goffart
* Inline QtScript exception helper functionsKent Hansen2009-10-233-18/+18
| | | | | | Makes QScriptValue::toNumber() ~50% faster. Reviewed-by: Olivier Goffart
* Avoid calls to public QScriptValue::engine() functionKent Hansen2009-10-233-16/+31
| | | | | | | | | | Calls to engine() are mostly done for checking that the "source" and "target" engines are the same, but we don't want those checks to slow us down. Use an inline getEngine() function instead. This makes e.g. QScriptValue::call() ~10% faster for a function like "function(a, b) { return a + b; }". Reviewed-by: Olivier Goffart
* Speed up QScriptValue creation by avoiding operator= to be calledKent Hansen2009-10-231-32/+18
| | | | | | | | For non-object values, just return the value immediately; there is no way that the later check (result.isObject()) will be true anyway. This makes qScriptValueFromValue() ~50% faster. Reviewed-by: Olivier Goffart
* Bind QScriptValue to engine when the value is created internallyKent Hansen2009-10-231-26/+27
| | | | | | | | Makes creation+destruction of the QScriptValue a lot faster because it uses the engine's pool of QScriptValuePrivates instead of qMalloc()/qFree(). Reviewed-by: Olivier Goffart
* Inline internal property lookup functionKent Hansen2009-10-233-28/+47
| | | | | | | | | Also avoid looking up the object's own properties twice (before we called getOwnPropertySlot() and then getPropertySlot() on the same object). Makes QScriptValue::property() ~20% faster when calling it on an "empty" object. Reviewed-by: Olivier Goffart
* Use an inline helper function to check if a QScriptString is validKent Hansen2009-10-233-5/+11
| | | | | | Makes QScriptValue::property() ~10% faster. Reviewed-by: Olivier Goffart
* Inline internal QtScript object data() functionsKent Hansen2009-10-232-16/+16
| | | | | | Makes QScriptValue::data() 15% faster. Reviewed-by: Olivier Goffart
* Inline internal QtScript object delegate functionsKent Hansen2009-10-234-31/+31
| | | | | | Makes QScriptValue::scriptClass() 20% faster. Reviewed-by: Olivier Goffart
* Inline scriptEngineFromExec() functionKent Hansen2009-10-232-15/+21
| | | | | | Makes QScriptContext::engine() 80% faster. Reviewed-by: Olivier Goffart
* Inline internal QtScript functions (frameForContext())Kent Hansen2009-10-232-12/+12
| | | | | | Makes QScriptContext::parentContext() 50% faster. Reviewed-by: Olivier Goffart
* Inline two internal QtScript functions (contextForFrame() and globalExec())Kent Hansen2009-10-232-17/+17
| | | | | | Makes QScriptEngine::currentContext() 25% faster. Reviewed-by: Olivier Goffart
* Use the qsreal type instead of double when working with QtScript numbersKent Hansen2009-10-224-7/+7
| | | | | | | | The idea is that qsreal can be typedef'ed to float on platforms where it's appropriate. Since the QScriptValue ctor takes a qsreal, we should not convert it to a double internally. Reviewed-by: Olivier Goffart
* QtScript: Compatibility with 4.5Olivier Goffart2009-10-221-0/+4
| | | | | | | | We must register the same type as they were registered in Qt 4.5 Reported on qt4-preview-feedback mailing list. Reviewed-by: Kent Hansen
* Regression fix. Fix the hasUncaughtException() flag in debugger's event.Jedrzej Nowacki2009-10-194-3/+19
| | | | | | | | | | | The QScriptEngine::hasUncaughtException() flag should be set to true if returning from a JS function was caused by an exception. According to documentation, the flag had to be accessible from the QScriptEngineAgent::functionExit event. New autotest was added. Reviewed-by: Kent Hansen
* Fix "Warning: #381-D: extra ";" ignored" reported by RVCTJanne Anttila2009-10-081-1/+1
| | | | Reviewed-by: TrustMe
* Use JSC::asObject() when we know that the value is an objectKent Hansen2009-10-071-2/+2
| | | | | It's faster than calling getObject(), since getObject() will do type checking of the value.
* Inline QScriptValuePrivate operator new and deleteKent Hansen2009-10-073-18/+18
| | | | Make allocation faster.
* Get rid of some superfluous checks in QScriptString::operator==()Kent Hansen2009-10-071-6/+0
| | | | Reviewed-by: Olivier Goffart
* implement qHash function for QScriptStringKent Hansen2009-10-073-0/+17
| | | | Reviewed-by: Olivier Goffart
* QScriptContext::parentContext: don't skip unessecary framesOlivier Goffart2009-10-061-1/+1
| | | | | | | | Calling QScriptValue::call doesn't create a fake frame. We can detect a real fake frame as it does not have a callee. Task-number: QT-2270 Reviewed-by: Kent Hansen
* implement property getters&setters for setProperty(quint32) overloadKent Hansen2009-10-061-2/+4
| | | | | | It's better that this works rather than asserts. Reviewed-by: Olivier Goffart
* QtScript: Another crash fix on PowerPCOlivier Goffart2009-10-061-2/+1
| | | | | | | | | | on 32bit PowerPC, the integer value and the pointer value are not in the same word leading to crash. So blindly casting between them lead to crashes. Use the new Register::withInt instead Reviewed-by: Kent Hansen
* QScript: do not crash on PowerPCOlivier Goffart2009-10-061-2/+2
| | | | | | | | | | | | | | | There is no 'this' register in the global context. The computation of the this register for the global context gives the 'codeBlock' register in the frame header. On Intel processor, a JSValue() is 0x0 when converted to a pointer, but this is not the case on PowerPC (it is 0xfffffff9) so it just crash later when acessing the code block. Solution: special condition for the global context when getting the 'this' object Reviewed-by: Kent Hansen
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-10-051-1/+1
| | | | | | jsc-for-qtscript-4.6-staging-05102009 ( 38c2b17366f24220d9ae0456a7cfe2ac78a9f91c ) Adapt src/script to src/3rdparty/javascriptcore changes
* Reset timeout-checker before evaluating when processEventsInterval is usedKent Hansen2009-10-011-0/+2
| | | | | | | | | | | | | | | | When the timeout-checker was not reset, it could take a while (e.g. 1-2 seconds) before the next timeout occurred, depending on what the tick counter happened to be after the previous evaluate(). When a processEventsInterval of e.g. 100 milliseconds has been specified, we want the timeout to happen much sooner, thus we need to reset the checker. This will cause the first timeout to happen quickly, and then at steady intervals (processEventsInterval ms) after that. The tst_QScriptEngine::processEventsWhileRunning() test was sporadically failing due to this issue. Reviewed-by: Olivier Goffart
* Fix column number provided to QScriptEngineAgentKent Hansen2009-10-013-65/+81
| | | | | | | | Introduced a helper function in our custom source provider, columnNumberFromOffset(), that maps an absolute offset in the source input to a relative column number. Reviewed-by: Jedrzej Nowacki
* Prospective solaris-g++-sparc build fixSimon Hausmann2009-09-301-0/+5
| | | | | | | | | | g++ on sparc appears to have problems inlining functions when Qt is compiled in debug. ("sorry: unimplemented blah blah") We're not entirely sure, but we suspect that removing -g might help avoid this compiler bug. Reviewed-by: Kent Hansen
* avoid JavaScriptCore C API functions being exported from QtScript libraryKent Hansen2009-09-301-0/+3
| | | | Reviewed-by: Simon Hausmann
* Fix linking on windows, building qt in namespaceJarek Kobus2009-09-301-1/+3
| | | | RevBy: Thiago Macieira <thiago.macieira@trolltech.com>
* Remove "inline" keyword from unused constructorsHarald Fernengel2009-09-291-2/+2
| | | | | | | Found during API review, make the private safety constructors follow the pattern of our Q_DISABLE_COPY macro. Reviewed-by: Robert Griebl
generated by cgit v0.12 at 2024-10-25 02:30:36 (GMT)