summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Collapse)AuthorAgeFilesLines
* compile again after mergeHarald Fernengel2009-08-218-88/+14
|
* Merge commit 'qt/master'Jason Barron2009-08-21138-34071/+12810
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| * implement registered script values as a doubly linked listKent Hansen2009-08-204-13/+33
| | | | | | | | It's faster.
| * use a list to keep track of registered script valuesKent Hansen2009-08-204-116/+41
| | | | | | | | Get rid of the hash.
| * store the engine's d-pointer in QScriptValuePrivateKent Hansen2009-08-203-150/+115
| | | | | | | | | | It's the d-pointer that we most frequently want to access, so store it to avoid having to use QScriptEnginePrivate::get() all over the place.
| * remove redundant variableKent Hansen2009-08-202-10/+3
| |
| * remove unused variableKent Hansen2009-08-201-1/+0
| |
| * add recursion guard for GC markingKent Hansen2009-08-203-4/+10
| | | | | | | | | | | | | | To achieve behavior of the old back-end. There, the recursion guard was automatic because a mark flag was set on the object as soon as marking begun, but in JSC it appears to only be set _after_ the marking is completed.
| * provide line number information for innermost call frameKent Hansen2009-08-204-0/+11
| | | | | | | | | | For the innermost frame, we don't have a returnPC, so use the line number that was last passed to the engine agent.
| * set the current frame when getting callbacks in JSC DebuggerKent Hansen2009-08-202-30/+39
| | | | | | | | | | If the debugger stops execution, we want the frame pointer to be in sync (so we get the full backtrace).
| * make QScriptEngine::objectById() workKent Hansen2009-08-201-7/+2
| | | | | | | | | | It needs to work even when there is no public QScriptValue that holds a reference to the object.
| * Fix "fixme" in QtFunction::mark()Jedrzej Nowacki2009-08-201-3/+1
| | | | | | | | | | | | QtFunction::mark() does not cause infinite recursion any more. Reviewed-by: Kent Hansen
| * Do not pass JSValue per const referenceOlivier Goffart2009-08-192-4/+4
| | | | | | | | It is a POD with the size of a pointer
| * CleanupsOlivier Goffart2009-08-193-24/+5
| | | | | | | | | | Remove useless variable. Use QBoolBlocker instread of custom QScript::InEval.
| * invalidate wrapped JSC::JSValue when script engine is deletedKent Hansen2009-08-191-2/+5
| | | | | | | | Otherwise we will crash if someone tries to do something with the value.
| * Fix QScriptValue::objectId().Jedrzej Nowacki2009-08-194-8/+12
| | | | | | | | | | | | | | QScriptValue id were made persistent. It depands on JSC:JSValue JSCell pointer not on QScriptValuePrivate attr. Reviewed-by: Kent Hansen
| * make QScriptEngine::isEvaluating() work for top-level evaluationKent Hansen2009-08-192-2/+21
| | | | | | | | | | | | Since QScriptEngine::evaluate() doesn't create a new stack frame anymore, we need to use a dedicated variable to keep track of whether the engine is currently evaluating or not.
| * Q_DISABLE_COPY were added to QScriptValuePrivate.Jedrzej Nowacki2009-08-191-0/+1
| | | | | | | | Reviewed-by: Kent Hansen
| * Clean upJedrzej Nowacki2009-08-191-1/+0
| | | | | | | | | | | | There is no point in setting class member in destructor Reviewed-by: Kent Hansen
| * Internal API clean up.Jedrzej Nowacki2009-08-193-16/+0
| | | | | | | | | | | | Static method QScriptValue::initFromJSCValue was removed. Reviewed-by: Kent Hansen
| * Clean up.Jedrzej Nowacki2009-08-193-49/+57
| | | | | | | | | | | | | | | | | | Internal API of QScriptValue were cleaned. toPublic() was removed and replaced by standard static Private::get(). All initFromXXX() methods were replaced by overload call of initFrom(). Reviewed-by: Kent Hansen
| * Fix potential building problem.Jedrzej Nowacki2009-08-191-7/+2
| | | | | | | | | | | | | | | | Comparison between pointer and int where removed. According to doc operator-> where created (class QScriptValueAutoRegister suppose to behave as pointer). Reviewed-by: Kent Hansen
| * Fix the QScriptContext::argumentsObject and QScriptContext::argument for js ↵Olivier Goffart2009-08-181-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | functions On js functions, if the number of arguments is different from the number of expected arguments, they are located in different place in the stackframe. We need to call the JSC functions that take that into account. Test is the backtrace test Reviewed-by: Kent Hansen
| * Fix the line numbers on the backtraceOlivier Goffart2009-08-181-1/+1
| | | | | | | | | | | | | | The returnPC points to the opcode after the call, but we want the opcode right before to compute the line number. Reviewed-by: Kent Hansen
| * implement getter/setter proxying for Global Object and activation objectKent Hansen2009-08-184-0/+77
| |
| * adopt same ownership relationship of scriptengine agents as in old back-endKent Hansen2009-08-183-8/+33
| | | | | | | | The engine owns its agents, and also knows when they are deleted.
| * Clean up.Jedrzej Nowacki2009-08-181-1/+1
| | | | | | | | | | | | Unused variable were commented. Reviewed-by: Kent Hansen
| * Clean up.Jedrzej Nowacki2009-08-182-6/+29
| | | | | | | | | | | | Get rid off some compilation warnings about unused variables. Reviewed-by: Kent Hansen
| * Clean upJedrzej Nowacki2009-08-183-1437/+0
| | | | | | | | | | | | Remove old unused visitors code. Reviewed-by: Kent Hansen
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-185-5/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
| * | Clean up.Jedrzej Nowacki2009-08-1811-104/+81
| | | | | | | | | | | | | | | | | | | | | Get rid of conversion functions QScript::qtStringFromJSCUString and QScript::qtStringToJSCUString. Code was moved to cast operators. Reviewed-by: Kent Hansen
| * | port commit 8fca9052e72d1dc983443c3a8065f804bebf77e7 from qt/masterKent Hansen2009-08-181-1/+1
| | | | | | | | | | | | QtScript must respect dynamic metaobjects when installed.
| * | Build on Windows CEKent Hansen2009-08-171-0/+8
| | |
| * | adopt variant-to-string conversion of the original qtscript back-endKent Hansen2009-08-171-5/+8
| | |
| * | remove unnecessary ifdefsKent Hansen2009-08-172-14/+9
| | |
| * | push the right object when the argument is the Global ObjectKent Hansen2009-08-141-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since the internal Global Object is never exposed to the public, we need to do like we do in setActivationObject(): if the object passed is the Global Object proxy, use the internal Global Object as the "real" argument. (JSC requires that the initial object pushed onto the scope chain is an instance of JSC::JSGlobalObject, and the Global Object proxy is not; hence, we can't push the proxy.)
| * | Detect evaluation context in the backtraceOlivier Goffart2009-08-141-0/+3
| | |
| * | More polishing on the backtraceOlivier Goffart2009-08-141-3/+7
| | | | | | | | | | | | | | | | | | change the coding style of function from foo (arg=text) to foo(arg = 'text')
| * | Polish the QScriptContext::backtrace()Olivier Goffart2009-08-141-21/+31
| | | | | | | | | | | | | | | | | | | | | - in QScriptContextInfo, get the filename of specials context - in QScriptContextInfo, get the right information for the global context (from the skipped fake frame) - addapt the test to the current backtrace layout.
| * | use originalGlobalObject() instead of lexicalGlobalObject() where possibleKent Hansen2009-08-142-3/+3
| | | | | | | | | | | | | | | No need to look up the global object via the scope chain since we have a direct pointer to it already.
| * | make sure QScriptContext::scopeChain() returns the right objectKent Hansen2009-08-141-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Follow-up to commit e0a86dc604b87921652b844a5f85889bb6291ed9. Just like in the activationObject() function, we need to check if the activation object is actually a proxy to another object, and return that other object if that's the case (the proxy object should not be exposed to the public).
| * | make it possible for any script object to serve as activation objectKent Hansen2009-08-143-11/+98
| | | | | | | | | | | | | | | | | | | | | This was possible in the old back-end. In JSC, activation objects have to be instances of JSC::JSVariableObject. So the way we solve it is by having our QScriptActivationObject be able to act as a proxy to any other JSObject.
| * | Fix compilation on WindowsSimon Hausmann2009-08-141-0/+3
| | | | | | | | | | | | | | | | | | Don't compile moc_qscriptqobject_p.cpp separately but compile it from qscriptqobject.cpp instead, to ensure that config.h is included. That ensures that min/max are undeffed as macros.
| * | Fix compilation on WindowsSimon Hausmann2009-08-1414-0/+14
| | | | | | | | | | | | | | | | | | In WebKit/JSC config.h needs to be included first in .cpp files, to among other things make sure that min/max are not defined as macros through windows.h.
| * | Fix compilation with MSVC.Simon Hausmann2009-08-141-0/+1
| | | | | | | | | | | | | | | A forward declaration of QScriptString is not sufficient for MSVC, include qscriptstring.h.
| * | Fix compilation with MSVCSimon Hausmann2009-08-141-10/+10
| | | | | | | | | | | | | | | Use the JSC_HOST_CALL annotation for the declaration as well as for the definition of the JSC callback functions.
| * | Fix inclusions of "utils/qscriptdate_p.h" with msvcSimon Hausmann2009-08-141-0/+2
| | | | | | | | | | | | | | | | | | Don't rely on the current working directory being src/script, as that does not appear to be the case when building with .vcproj files. Instead add src/script to the INCLUDEPATH, so that the above inclusion works.
| * | implement GC marking of qobject sender JS wrapperKent Hansen2009-08-141-5/+5
| | |
| * | Skip the fake context created by Interpreter::exucute for the backtraceOlivier Goffart2009-08-141-0/+5
| | |
| * | get rid of src/script/webkit.priKent Hansen2009-08-132-43/+44
| | | | | | | | | | | | Not needed since commit 9727a71ea077658148e963bc8510269b08095023.
generated by cgit v0.12 at 2025-02-03 16:03:58 (GMT)