Changeset 846 for trunk/src/script/api/qscriptcontextinfo.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/script/api/qscriptcontextinfo.cpp (modified) (6 diffs)

trunk/src/script/api/qscriptcontextinfo.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -54 +54 @@
 
   If the called function is executing Qt Script code, you can obtain
-  the script location with the functions fileName(), lineNumber() and
-  columnNumber().
+  the script location with the functions fileName() and lineNumber().
 
   You can obtain the starting line number and ending line number of a
@@ -159 +158 @@
             JSC::Instruction *returnPC = rewindContext->returnPC();
             JSC::CodeBlock *codeBlock = frame->codeBlock();
-            if (returnPC && codeBlock) {
+            if (returnPC && codeBlock) {
 #if ENABLE(JIT)
                 unsigned bytecodeOffset = codeBlock->getBytecodeIndex(frame, JSC::ReturnAddressPtr(returnPC));
@@ -173 +172 @@
     // Get the filename and the scriptId:
     JSC::CodeBlock *codeBlock = frame->codeBlock();
-    if (codeBlock) {
+    if (codeBlock) {
            JSC::SourceProvider *source = codeBlock->source();
            scriptId = source->asID();
@@ -179 +178 @@
     }
 
-    // Get the others informations:
+    // Get the others information:
     JSC::JSObject *callee = frame->callee();
     if (callee && callee->inherits(&JSC::InternalFunction::info))
-        functionName = JSC::asInternalFunction(callee)->name(&frame->globalData());
-    if (callee && callee->inherits(&JSC::JSFunction::info)) {
+        functionName = JSC::asInternalFunction(callee)->name(frame);
+    if (callee && callee->inherits(&JSC::JSFunction::info)
+        && !JSC::asFunction(callee)->isHostFunction()) {
         functionType = QScriptContextInfo::ScriptFunction;
         JSC::FunctionExecutable *body = JSC::asFunction(callee)->jsExecutable();
@@ -318 +318 @@
 
 /*!
-  Returns the column number corresponding to the statement being
-  executed, or -1 if the column number is not available.
-
-  The column number is only available if Qt Script code is being
-  executed.
-
-  \sa lineNumber(), fileName()
+  \obsolete
 */
 int QScriptContextInfo::columnNumber() const