Move JS global scope to top of the QML scope chain

QT-2787

6 files changed, 56 insertions, 38 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index a9809c0..1eea012 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -65,6 +65,7 @@
 #include "qdeclarativescriptparser_p.h"
 #include "qdeclarativebinding_p.h"
 #include "qdeclarativecompiledbindings_p.h"
+#include "qdeclarativeglobalscriptclass_p.h"
 
 #include <qfxperf_p_p.h>
 
@@ -113,32 +114,6 @@ QList<QDeclarativeError> QDeclarativeCompiler::errors() const
 }
 
 /*!
-    Returns true if \a val is a legal object id, false otherwise.
-
-    Legal ids must start with a lower-case letter or underscore, and contain only
-    letters, numbers and underscores.
-*/
-bool QDeclarativeCompiler::isValidId(const QString &val)
-{
-    if (val.isEmpty())
-        return false;
-
-    if (val.at(0).isLetter() && !val.at(0).isLower()) {
-        qWarning().nospace() << "id " << val << " is invalid: ids cannot start with uppercase letters";
-        return false;
-    }
-
-    QChar u(QLatin1Char('_'));
-    for (int ii = 0; ii < val.count(); ++ii)
-        if (val.at(ii) != u &&
-           ((ii == 0 && !val.at(ii).isLetter()) ||
-           (ii != 0 && !val.at(ii).isLetterOrNumber())) )
-            return false;
-
-    return true;
-}
-
-/*!
     Returns true if \a name refers to an attached property, false otherwise.
 
     Attached property names are those that start with a capital letter.
@@ -1140,10 +1115,11 @@ bool QDeclarativeCompiler::buildComponent(QDeclarativeParser::Object *obj,
     if (obj->properties.count())
         idProp = *obj->properties.begin();
 
-    if (idProp && (idProp->value || idProp->values.count() > 1 || !isValidId(idProp->values.first()->primitive())))
-        COMPILE_EXCEPTION(idProp, QCoreApplication::translate("QDeclarativeCompiler","Invalid component id specification"));
-
     if (idProp) {
+       if (idProp->value || idProp->values.count() > 1 || idProp->values.at(0)->object) 
+           COMPILE_EXCEPTION(idProp, QCoreApplication::translate("QDeclarativeCompiler","Invalid component id specification"));
+       COMPILE_CHECK(checkValidId(idProp->values.first(), idProp->values.first()->primitive()));
+
         QString idVal = idProp->values.first()->primitive();
 
         if (compileState.ids.contains(idVal))
@@ -1726,8 +1702,7 @@ bool QDeclarativeCompiler::buildIdProperty(QDeclarativeParser::Property *prop,
     QDeclarativeParser::Value *idValue = prop->values.at(0);
     QString val = idValue->primitive();
 
-    if (!isValidId(val))
-        COMPILE_EXCEPTION(prop, QCoreApplication::translate("QDeclarativeCompiler","\"%1\" is not a valid object id").arg(val));
+    COMPILE_CHECK(checkValidId(idValue, val));
 
     // We disallow id's that conflict with import prefixes and types
     QDeclarativeEnginePrivate::ImportedNamespace *ns = 0;
@@ -2476,6 +2451,31 @@ bool QDeclarativeCompiler::buildDynamicMeta(QDeclarativeParser::Object *obj, Dyn
     return true;
 }
 
+bool QDeclarativeCompiler::checkValidId(QDeclarativeParser::Value *v, const QString &val)
+{
+    if (val.isEmpty()) 
+        COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler", "Invalid empty ID"));
+
+    if (val.at(0).isLetter() && !val.at(0).isLower()) 
+        COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler", "IDs cannot start with an uppercase letter"));
+
+    QChar u(QLatin1Char('_'));
+    for (int ii = 0; ii < val.count(); ++ii) {
+
+        if (ii == 0 && !val.at(ii).isLetter() && val.at(ii) != u) {
+            COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler", "IDs must start with a letter or underscore"));
+        } else if (ii != 0 && !val.at(ii).isLetterOrNumber() && val.at(ii) != u)  {
+            COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler", "IDs must contain only letters, numbers, and underscores"));
+        }
+
+    }
+
+    if (QDeclarativeEnginePrivate::get(engine)->globalClass->illegalNames().contains(val))
+        COMPILE_EXCEPTION(v, QCoreApplication::translate("QDeclarativeCompiler", "ID illegally masks global JavaScript property"));
+
+    return true;
+}
+
 #include <qdeclarativejsparser_p.h>
 
 static QStringList astNodeToStringList(QDeclarativeJS::AST::Node *node)
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index 93a3f83..f8ada95 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -155,7 +155,6 @@ public:
     bool isError() const;
     QList<QDeclarativeError> errors() const;
 
-    static bool isValidId(const QString &);
     static bool isAttachedPropertyName(const QByteArray &);
     static bool isSignalPropertyName(const QByteArray &);
 
@@ -247,6 +246,7 @@ private:
                       QDeclarativeParser::Object *obj, 
                       const QDeclarativeParser::Object::DynamicProperty &);
     bool completeComponentBuild();
+    bool checkValidId(QDeclarativeParser::Value *, const QString &);
 
 
     void genObject(QDeclarativeParser::Object *obj);
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index 57ef90c..35e7a77 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -47,6 +47,7 @@
 #include "qdeclarativeengine.h"
 #include "qdeclarativecompiledbindings_p.h"
 #include "qdeclarativeinfo.h"
+#include "qdeclarativeglobalscriptclass_p.h"
 
 #include <qscriptengine.h>
 #include <QtCore/qvarlengtharray.h>
@@ -74,7 +75,9 @@ void QDeclarativeContextPrivate::addScript(const QDeclarativeParser::Object::Scr
     QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
 
     QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
+
     scriptContext->pushScope(enginePriv->contextClass->newContext(q, scopeObject));
+    scriptContext->pushScope(enginePriv->globalClass->globalObject());
     
     QScriptValue scope = scriptEngine->newObject();
     scriptContext->setActivationObject(scope);
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index ae1e790..0030615 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -46,6 +46,7 @@
 #include "qdeclarativecontext_p.h"
 #include "qdeclarativerewrite_p.h"
 #include "qdeclarativecompiler_p.h"
+#include "qdeclarativeglobalscriptclass_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtScript/qscriptprogram.h>
@@ -135,6 +136,7 @@ void QDeclarativeExpressionPrivate::init(QDeclarativeContext *ctxt, void *expr,
         if (!dd->cachedClosures.at(progIdx)) {
             QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
             scriptContext->pushScope(ep->contextClass->newSharedContext());
+            scriptContext->pushScope(ep->globalClass->globalObject());
             dd->cachedClosures[progIdx] = new QScriptValue(scriptEngine->evaluate(data->expression, data->url, data->line));
             scriptEngine->popContext();
         }
@@ -169,6 +171,7 @@ QScriptValue QDeclarativeExpressionPrivate::evalInObjectScope(QDeclarativeContex
     QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context->engine());
     QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(&ep->scriptEngine);
     scriptContext->pushScope(ep->contextClass->newContext(context, object));
+    scriptContext->pushScope(ep->globalClass->globalObject());
     QScriptValue rv = ep->scriptEngine.evaluate(program);
     ep->scriptEngine.popContext();
     return rv;
@@ -180,6 +183,7 @@ QScriptValue QDeclarativeExpressionPrivate::evalInObjectScope(QDeclarativeContex
     QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context->engine());
     QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(&ep->scriptEngine);
     scriptContext->pushScope(ep->contextClass->newContext(context, object));
+    scriptContext->pushScope(ep->globalClass->globalObject());
     QScriptValue rv = ep->scriptEngine.evaluate(program);
     ep->scriptEngine.popContext();
     return rv;
@@ -335,6 +339,7 @@ QVariant QDeclarativeExpressionPrivate::evalQtScript(QObject *secondaryScope, bo
 
         QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
         scriptContext->pushScope(ep->contextClass->newContext(data->context(), data->me));
+        scriptContext->pushScope(ep->globalClass->globalObject());
 
         if (data->expressionRewritten) {
             data->expressionFunction = scriptEngine->evaluate(data->expression, 
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
index 5b06b42..9ee2fe5 100644
--- a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp
@@ -53,15 +53,17 @@ QT_BEGIN_NAMESPACE
 QDeclarativeGlobalScriptClass::QDeclarativeGlobalScriptClass(QScriptEngine *engine)
 : QScriptClass(engine)
 {
-    QScriptValue v = engine->newObject();
-    globalObject = engine->globalObject();
+    QScriptValue globalObject = engine->globalObject();
+    m_globalObject = engine->newObject();
 
     QScriptValueIterator iter(globalObject);
     while (iter.hasNext()) {
         iter.next();
-        v.setProperty(iter.scriptName(), iter.value());
+        m_globalObject.setProperty(iter.scriptName(), iter.value());
+        m_illegalNames.insert(iter.name());
     }
 
+    QScriptValue v = engine->newObject();
     v.setScriptClass(this);
     engine->setGlobalObject(v);
 }
@@ -101,12 +103,14 @@ void QDeclarativeGlobalScriptClass::setProperty(QScriptValue &object,
     engine()->currentContext()->throwError(error);
 }
 
+/* This method is for the use of tst_qdeclarativeecmascript::callQtInvokables() only */
 void QDeclarativeGlobalScriptClass::explicitSetProperty(const QString &name, const QScriptValue &value)
 {
+    QScriptValue globalObject = engine()->globalObject();
+
     QScriptValue v = engine()->newObject();
-    globalObject = engine()->globalObject();
 
-    QScriptValueIterator iter(globalObject);
+    QScriptValueIterator iter(v);
     while (iter.hasNext()) {
         iter.next();
         v.setProperty(iter.scriptName(), iter.value());
@@ -114,6 +118,7 @@ void QDeclarativeGlobalScriptClass::explicitSetProperty(const QString &name, con
 
     v.setProperty(name, value);
     v.setScriptClass(this);
+
     engine()->setGlobalObject(v);
 }
 
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
index a33cf5e..1b34aee 100644
--- a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
+++ b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <QtScript/qscriptclass.h>
+#include <QtCore/qset.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -74,8 +75,12 @@ public:
 
     void explicitSetProperty(const QString &, const QScriptValue &);
 
+    const QScriptValue &globalObject() const { return m_globalObject; }
+    const QSet<QString> &illegalNames() const { return m_illegalNames; }
+
 private:
-    QScriptValue globalObject;
+    QSet<QString> m_illegalNames;
+    QScriptValue m_globalObject;
 };
 
 QT_END_NAMESPACE