149 q_ptr->exceptionCatch(sourceID, value); |
149 q_ptr->exceptionCatch(sourceID, value); |
150 engine->currentFrame = oldFrame; |
150 engine->currentFrame = oldFrame; |
151 engine->clearCurrentException(); |
151 engine->clearCurrentException(); |
152 } |
152 } |
153 |
153 |
154 void QScriptEngineAgentPrivate::atStatement(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, int column) |
154 void QScriptEngineAgentPrivate::atStatement(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno/*, int column*/) |
155 { |
155 { |
156 QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); |
156 QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); |
157 if (!source) { |
157 if (!source) { |
158 // QTBUG-6108: We don't have the source for this script, so ignore. |
158 // QTBUG-6108: We don't have the source for this script, so ignore. |
159 return; |
159 return; |
160 } |
160 } |
161 column = source->columnNumberFromOffset(column); |
161 // column = source->columnNumberFromOffset(column); |
|
162 int column = 1; |
162 JSC::CallFrame *oldFrame = engine->currentFrame; |
163 JSC::CallFrame *oldFrame = engine->currentFrame; |
163 int oldAgentLineNumber = engine->agentLineNumber; |
164 int oldAgentLineNumber = engine->agentLineNumber; |
164 engine->currentFrame = frame.callFrame(); |
165 engine->currentFrame = frame.callFrame(); |
165 engine->agentLineNumber = lineno; |
166 engine->agentLineNumber = lineno; |
166 q_ptr->positionChange(sourceID, lineno, column); |
167 q_ptr->positionChange(sourceID, lineno, column); |
180 QScriptValue result = engine->scriptValueFromJSCValue(returnValue); |
181 QScriptValue result = engine->scriptValueFromJSCValue(returnValue); |
181 q_ptr->functionExit(sourceID, result); |
182 q_ptr->functionExit(sourceID, result); |
182 } |
183 } |
183 |
184 |
184 void QScriptEngineAgentPrivate::didReachBreakpoint(const JSC::DebuggerCallFrame& frame, |
185 void QScriptEngineAgentPrivate::didReachBreakpoint(const JSC::DebuggerCallFrame& frame, |
185 intptr_t sourceID, int lineno, int column) |
186 intptr_t sourceID, int lineno/*, int column*/) |
186 { |
187 { |
187 if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest)) { |
188 if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest)) { |
188 QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); |
189 QScript::UStringSourceProviderWithFeedback *source = engine->loadedScripts.value(sourceID); |
189 if (!source) { |
190 if (!source) { |
190 // QTBUG-6108: We don't have the source for this script, so ignore. |
191 // QTBUG-6108: We don't have the source for this script, so ignore. |
191 return; |
192 return; |
192 } |
193 } |
193 column = source->columnNumberFromOffset(column); |
194 // column = source->columnNumberFromOffset(column); |
|
195 int column = 1; |
194 JSC::CallFrame *oldFrame = engine->currentFrame; |
196 JSC::CallFrame *oldFrame = engine->currentFrame; |
195 int oldAgentLineNumber = engine->agentLineNumber; |
197 int oldAgentLineNumber = engine->agentLineNumber; |
196 engine->currentFrame = frame.callFrame(); |
198 engine->currentFrame = frame.callFrame(); |
197 engine->agentLineNumber = lineno; |
199 engine->agentLineNumber = lineno; |
198 QList<QVariant> args; |
200 QList<QVariant> args; |