* Update per CR feedback / code standards * Cull log spam * Add tryLock to deferred processor to preempt unnecessary loadEntityContent round-trips

humbletim committed 9 years ago

Commit 417587d1 parent b1595625 files · +32 −27Browse files

Showing the changes to libraries/script-engine/src/BaseScriptEngine.cpp (1 of 5 files). Show all

Unified · Split

libraries/script-engine/src/BaseScriptEngine.cpp+8−10

     }
     if (fileName.isEmpty()) {
         // climb the stack frames looking for something useful to display
-        for(auto ctx = currentContext(); ctx && fileName.isEmpty(); ctx = ctx->parentContext()) {
+        for (auto c = currentContext(); c && fileName.isEmpty(); c = c->parentContext()) {
-            QScriptContextInfo info { ctx };
+            QScriptContextInfo info { c };
             if (!info.fileName().isEmpty()) {
                 // take fileName:lineNumber as a pair
                 fileName = info.fileName();
                 lineNumber = info.lineNumber();
                 if (backtrace.isEmpty()) {
-                    backtrace = ctx->backtrace();
+                    backtrace = c->backtrace();
                 }
                 break;
             }
         return QScriptValue();
     }
-    //_debugDump("evaluateInClosure.closure", closure);
     const auto fileName = program.fileName();
     const auto shortName = QUrl(fileName).fileName();
         setGlobalObject(global);
     }
-    auto ctx = pushContext();
+    auto context = pushContext();
     auto thiz = closure.property("this");
     if (thiz.isObject()) {
 #ifdef DEBUG_JS
         qCDebug(scriptengine) << " setting this = closure.this" << shortName;
 #endif
-        ctx->setThisObject(thiz);
+        context->setThisObject(thiz);
     }
-    ctx->pushScope(closure);
+    context->pushScope(closure);
 #ifdef DEBUG_JS
     qCDebug(scriptengine) << QString("[%1] evaluateInClosure %2").arg(isEvaluating()).arg(shortName);
 #endif
     auto lambda = new Lambda(this, operation, data);
     auto object = newQObject(lambda, ownership);
     auto call = object.property("call");
-    call.setPrototype(object); // ctx->callee().prototype() === Lambda QObject
+    call.setPrototype(object); // context->callee().prototype() === Lambda QObject
-    call.setData(data);        // ctx->callee().data() will === data param
+    call.setData(data);        // context->callee().data() will === data param
     return call;
 }
 QString Lambda::toString() const {