Add support for proper lexical scoping

This is still to some extend work in progress as
lexically scoped for loops won't yet do the right
thing.

let and const variables are still accessible before
they are declared, and the global scope doesn't yet
have a proper context for lexically declared variables.

Change-Id: Ie39f74a8fccdaead437fbf07f9fc228a444c26ed
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 2 insertions, 5 deletions

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index a57e0b2c79..4945a23302 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -3209,9 +3209,7 @@ void tst_QJSEngine::threadedEngine()
 
 void tst_QJSEngine::functionDeclarationsInConditionals()
 {
-    // Even though this is bad practice (and test262 covers it with best practices test cases),
-    // we do allow for function declarations in if and while statements, as unfortunately that's
-    // real world JavaScript. (QTBUG-33064 for example)
+    // Visibility of function declarations inside blocks is limited to the block
     QJSEngine eng;
     QJSValue result = eng.evaluate("if (true) {\n"
                                    "    function blah() { return false; }\n"
@@ -3219,8 +3217,7 @@ void tst_QJSEngine::functionDeclarationsInConditionals()
                                    "    function blah() { return true; }\n"
                                    "}\n"
                                    "blah();");
-    QVERIFY(result.isBool());
-    QCOMPARE(result.toBool(), true);
+    QVERIFY(result.isError());
 }
 
 void tst_QJSEngine::arrayPop_QTBUG_35979()