1 files changed, 10 insertions, 69 deletions

diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index 478491f..40ffffe 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -64,12 +64,7 @@ struct ScriptInstruction {
         FetchD0Constant, // constant
         FetchD1Constant, // constant
 
-
-        Add,         // NA
-        Subtract,    // NA
-        Multiply,    // NA
         Equals,      // NA
-        And,         // NA
 
         Int,         // integer
         Bool,        // boolean
@@ -181,6 +176,9 @@ static QVariant toObjectOrVariant(const QVariant &v)
 
 static QVariant fetch_value(QObject *o, int idx, int type)
 {
+    if (!o)
+        return QVariant();
+
     switch(type) {
         case QVariant::String:
             {
@@ -291,7 +289,7 @@ struct QmlBasicScriptCompiler
 
     QmlParser::Object *context;
     QmlParser::Object *component;
-    QHash<QString, QPair<QmlParser::Object *, int> > ids;
+    QHash<QString, QmlParser::Object *> ids;
 
     bool compile(QmlJS::AST::Node *);
 
@@ -445,15 +443,6 @@ void QmlBasicScript::dump()
             qWarning().nospace() << "FETCH\t\t" << instr.fetch.idx << "\t\t" 
                                  << QByteArray(data + instr.fetch.idx);
             break;
-        case ScriptInstruction::Add:
-            qWarning().nospace() << "ADD";
-            break;
-        case ScriptInstruction::Subtract:
-            qWarning().nospace() << "SUBTRACT";
-            break;
-        case ScriptInstruction::Multiply:
-            qWarning().nospace() << "MULTIPLY";
-            break;
         case ScriptInstruction::Equals:
             qWarning().nospace() << "EQUALS";
             break;
@@ -588,10 +577,10 @@ bool QmlBasicScriptCompiler::parseName(AST::Node *node,
 
         if (ids.contains(name)) {
             instr.type = ScriptInstruction::LoadIdObject;
-            instr.fetch.idx = ids.value(name).second;
+            instr.fetch.idx = ids.value(name)->idIndex;
 
             if (type)
-                *type = ids.value(name).first;
+                *type = ids.value(name);
 
         } else {
             int d0Idx = context->metaObject()->indexOfProperty(name.toUtf8().constData());
@@ -679,11 +668,7 @@ bool QmlBasicScriptCompiler::tryBinaryExpression(AST::Node *node)
         AST::BinaryExpression *expr = 
             static_cast<AST::BinaryExpression *>(node);
 
-        if (expr->op == QSOperator::Add ||
-            expr->op == QSOperator::Sub ||
-            expr->op == QSOperator::Equal ||
-            expr->op == QSOperator::And ||
-            expr->op == QSOperator::Mul)
+        if (expr->op == QSOperator::Equal)
             return true;
     }
     return false;
@@ -700,21 +685,9 @@ bool QmlBasicScriptCompiler::compileBinaryExpression(AST::Node *node)
 
         ScriptInstruction instr;
         switch (expr->op) {
-        case QSOperator::Add:
-            instr.type = ScriptInstruction::Add;
-            break;
-        case QSOperator::Sub:
-            instr.type = ScriptInstruction::Subtract;
-            break;
         case QSOperator::Equal:
             instr.type = ScriptInstruction::Equals;
             break;
-        case QSOperator::And:
-            instr.type = ScriptInstruction::And;
-            break;
-        case QSOperator::Mul:
-            instr.type = ScriptInstruction::Multiply;
-            break;
         default:
             return false;
         }
@@ -823,7 +796,7 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c
                 QObject *obj = contextPrivate->defaultObjects.at(0);
 
                 stack.push(fetch_value(obj, instr.constant.idx, instr.constant.type));
-                if (instr.constant.notify != 0)
+                if (obj && instr.constant.notify != 0)
                     enginePrivate->capturedProperties <<
                         QmlEnginePrivate::CapturedProperty(obj, instr.constant.idx, instr.constant.notify); 
                 state = Reset;
@@ -835,7 +808,7 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c
                 QObject *obj = contextPrivate->defaultObjects.at(1);
 
                 stack.push(fetch_value(obj, instr.constant.idx, instr.constant.type));
-                if (instr.constant.notify != 0)
+                if (obj && instr.constant.notify != 0)
                     enginePrivate->capturedProperties <<
                         QmlEnginePrivate::CapturedProperty(obj, instr.constant.idx, instr.constant.notify); 
                 state = Reset;
@@ -848,7 +821,7 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c
                 QObject *obj = qvariant_cast<QObject *>(o);
 
                 stack.push(fetch_value(obj, instr.constant.idx, instr.constant.type));
-                if (instr.constant.notify != 0)
+                if (obj && instr.constant.notify != 0)
                     enginePrivate->capturedProperties <<
                         QmlEnginePrivate::CapturedProperty(obj, instr.constant.idx, instr.constant.notify); 
                 state = Reset;
@@ -913,30 +886,6 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c
             case ScriptInstruction::Bool:
                 stack.push(QVariant(instr.boolean.value));
                 break;
-            case ScriptInstruction::Add:
-                {
-                    QVariant rhs = stack.pop();
-                    QVariant lhs = stack.pop();
-
-                    stack.push(rhs.toDouble() + lhs.toDouble());
-                }
-                break;
-            case ScriptInstruction::Subtract:
-                {
-                    QVariant rhs = stack.pop();
-                    QVariant lhs = stack.pop();
-
-                    stack.push(lhs.toDouble() - rhs.toDouble());
-                }
-                break;
-            case ScriptInstruction::Multiply:
-                {
-                    QVariant rhs = stack.pop();
-                    QVariant lhs = stack.pop();
-
-                    stack.push(rhs.toDouble() * lhs.toDouble());
-                }
-                break;
             case ScriptInstruction::Equals:
                 {
                     QVariant rhs = stack.pop();
@@ -945,14 +894,6 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c
                     stack.push(rhs == lhs);
                 }
                 break;
-            case ScriptInstruction::And:
-                {
-                    QVariant rhs = stack.pop();
-                    QVariant lhs = stack.pop();
-
-                    stack.push(rhs.toBool() && lhs.toBool());
-                }
-                break;
             default:
                 break;
         }