Fix line number and arguments in QScriptContext::toString

For arguments, we always need to skip the implicit 'this' argument

For line number, we walk thought the stack frames from the top to find
the one above the requested one, which contains the returnPC we need.

Also fixed a crash because QScriptContext::parentContext would have
returned a pointer with flags inside.

Reviewed-by: Kent Hansen

2 files changed, 0 insertions, 2 deletions

diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index a278d2c..be0b2b7 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -791,7 +791,6 @@ void tst_QScriptContext::toString()
                                     "    return parentContextToString();\n"
                                     "}; foo(1, 2, 3)", "script.qs");
     QVERIFY(ret.isString());
-    QEXPECT_FAIL("", "", Continue);
     QCOMPARE(ret.toString(), QString::fromLatin1("foo (first=1, second=2, third=3) at script.qs:2"));
 }
 
diff --git a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
index 0877717..921cbd8 100644
--- a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
+++ b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
@@ -185,7 +185,6 @@ void tst_QScriptContextInfo::scriptFunction()
         QCOMPARE(info.functionType(), QScriptContextInfo::ScriptFunction);
         QVERIFY(info.scriptId() != -1);
         QCOMPARE(info.fileName(), fileName);
-        QEXPECT_FAIL("", "lineNumber doesn't work", Continue);
         QCOMPARE(info.lineNumber(), lineNumber + 1);
         QEXPECT_FAIL("", "columnNumber doesn't work", Continue);
         QCOMPARE(info.columnNumber(), 2);