Commit 5762a988fbcd95c9c44e58993c25f5cd1d53f897

khansen
Thu Feb 04 16:08:47 CET 2010

Tree SHA1: 893a427
Parent SHA1: 17ba81e (Fix QtScript debugger hang/crash issue with updating locals model)
raw diff | raw patch

Use a shared QScriptEngine for debugger console command scripts

A single engine was used for each script (i.e. command), which was
just ridiculous. Use one engine with multiple global objects to
isolate each script's state.

Task-number: QTBUG-7227

Diff rendering mode:
inline
side by side


44	44	#include "qscriptdebuggerconsolecommandmanager_p.h"
45	45	#include "qscriptdebuggerscriptedconsolecommand_p.h"
46	46	#include "qscriptmessagehandlerinterface_p.h"
	47	#include "qscriptbreakpointdata_p.h"
	48	#include "qscriptdebuggerresponse_p.h"
	49	#include "qscriptdebuggervalueproperty_p.h"
	50	#include "qscriptscriptdata_p.h"
47	51
48	52	#include <QtCore/qdir.h>
49	53	#include <QtCore/qfileinfo.h>
50	54	#include <QtCore/qstring.h>
51	55	#include <QtCore/qstringlist.h>
52	56	#include <QtCore/qdebug.h>
	57	#include <QtScript/qscriptcontextinfo.h>
53	58	#include <QtScript/qscriptengine.h>
54	59
	60	Q_DECLARE_METATYPE(QScriptDebuggerResponse)
	61	Q_DECLARE_METATYPE(QScriptBreakpointData)
	62	Q_DECLARE_METATYPE(QScriptBreakpointMap)
	63	Q_DECLARE_METATYPE(QScriptScriptData)
	64	Q_DECLARE_METATYPE(QScriptScriptMap)
	65	Q_DECLARE_METATYPE(QScriptContextInfo)
	66	Q_DECLARE_METATYPE(QScriptDebuggerValue)
	67	Q_DECLARE_METATYPE(QScriptDebuggerValueProperty)
	68	Q_DECLARE_METATYPE(QScriptDebuggerValuePropertyList)
	69	Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommand*)
	70	Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommandList)
	71	Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommandGroupData)
	72	Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommandGroupMap)
	73
55	74	QT_BEGIN_NAMESPACE
56	75
	76	static QScriptValue debuggerResponseToScriptValue(QScriptEngine *eng, const QScriptDebuggerResponse &in)
	77	{
	78	QScriptValue out = eng->newObject();
	79	out.setProperty(QString::fromLatin1("result"), qScriptValueFromValue(eng, in.result()));
	80	out.setProperty(QString::fromLatin1("error"), QScriptValue(eng, in.error()));
	81	out.setProperty(QString::fromLatin1("async"), QScriptValue(eng, in.async()));
	82	return out;
	83	}
	84
	85	static void debuggerResponseFromScriptValue(const QScriptValue &, QScriptDebuggerResponse &)
	86	{
	87	Q_ASSERT(0);
	88	}
	89
	90	static QScriptValue breakpointDataToScriptValue(QScriptEngine *eng, const QScriptBreakpointData &in)
	91	{
	92	QScriptValue out = eng->newObject();
	93	out.setProperty(QString::fromLatin1("scriptId"), QScriptValue(eng, qsreal(in.scriptId())));
	94	out.setProperty(QString::fromLatin1("fileName"), QScriptValue(eng, in.fileName()));
	95	out.setProperty(QString::fromLatin1("lineNumber"), QScriptValue(eng, in.lineNumber()));
	96	out.setProperty(QString::fromLatin1("enabled"), QScriptValue(eng, in.isEnabled()));
	97	out.setProperty(QString::fromLatin1("singleShot"), QScriptValue(eng, in.isSingleShot()));
	98	out.setProperty(QString::fromLatin1("ignoreCount"), QScriptValue(eng, in.ignoreCount()));
	99	out.setProperty(QString::fromLatin1("condition"), QScriptValue(eng, in.condition()));
	100	return out;
	101	}
	102
	103	static void breakpointDataFromScriptValue(const QScriptValue &in, QScriptBreakpointData &out)
	104	{
	105	QScriptValue scriptId = in.property(QString::fromLatin1("scriptId"));
	106	if (scriptId.isValid())
	107	out.setScriptId((qint64)scriptId.toNumber());
	108	out.setFileName(in.property(QString::fromLatin1("fileName")).toString());
	109	out.setLineNumber(in.property(QString::fromLatin1("lineNumber")).toInt32());
	110	QScriptValue enabled = in.property(QString::fromLatin1("enabled"));
	111	if (enabled.isValid())
	112	out.setEnabled(enabled.toBoolean());
	113	QScriptValue singleShot = in.property(QString::fromLatin1("singleShot"));
	114	if (singleShot.isValid())
	115	out.setSingleShot(singleShot.toBoolean());
	116	out.setIgnoreCount(in.property(QString::fromLatin1("ignoreCount")).toInt32());
	117	out.setCondition(in.property(QString::fromLatin1("condition")).toString());
	118	}
	119
	120	static QScriptValue breakpointMapToScriptValue(QScriptEngine *eng, const QScriptBreakpointMap &in)
	121	{
	122	QScriptValue out = eng->newObject();
	123	QScriptBreakpointMap::const_iterator it;
	124	for (it = in.constBegin(); it != in.constEnd(); ++it) {
	125	out.setProperty(QString::number(it.key()), qScriptValueFromValue(eng, it.value()));
	126	}
	127	return out;
	128	}
	129
	130	static void breakpointMapFromScriptValue(const QScriptValue &, QScriptBreakpointMap &)
	131	{
	132	Q_ASSERT(0);
	133	}
	134
	135	static QScriptValue scriptDataToScriptValue(QScriptEngine *eng, const QScriptScriptData &in)
	136	{
	137	QScriptValue out = eng->newObject();
	138	out.setProperty(QString::fromLatin1("contents"), QScriptValue(eng, in.contents()));
	139	out.setProperty(QString::fromLatin1("fileName"), QScriptValue(eng, in.fileName()));
	140	out.setProperty(QString::fromLatin1("baseLineNumber"), QScriptValue(eng, in.baseLineNumber()));
	141	return out;
	142	}
	143
	144	static void scriptDataFromScriptValue(const QScriptValue &in, QScriptScriptData &out)
	145	{
	146	QString contents = in.property(QString::fromLatin1("contents")).toString();
	147	QString fileName = in.property(QString::fromLatin1("fileName")).toString();
	148	int baseLineNumber = in.property(QString::fromLatin1("baseLineNumber")).toInt32();
	149	QScriptScriptData tmp(contents, fileName, baseLineNumber);
	150	out = tmp;
	151	}
	152
	153	static QScriptValue scriptMapToScriptValue(QScriptEngine *eng, const QScriptScriptMap &in)
	154	{
	155	QScriptValue out = eng->newObject();
	156	QScriptScriptMap::const_iterator it;
	157	for (it = in.constBegin(); it != in.constEnd(); ++it) {
	158	out.setProperty(QString::number(it.key()), qScriptValueFromValue(eng, it.value()));
	159	}
	160	return out;
	161	}
	162
	163	static void scriptMapFromScriptValue(const QScriptValue &, QScriptScriptMap &)
	164	{
	165	Q_ASSERT(0);
	166	}
	167
	168	static QScriptValue consoleCommandToScriptValue(
	169	QScriptEngine eng, QScriptDebuggerConsoleCommand const &in)
	170	{
	171	if (!in)
	172	return eng->undefinedValue();
	173	QScriptValue out = eng->newObject();
	174	out.setProperty(QString::fromLatin1("name"), QScriptValue(eng, in->name()));
	175	out.setProperty(QString::fromLatin1("group"), QScriptValue(eng, in->group()));
	176	out.setProperty(QString::fromLatin1("shortDescription"), QScriptValue(eng, in->shortDescription()));
	177	out.setProperty(QString::fromLatin1("longDescription"), QScriptValue(eng, in->longDescription()));
	178	out.setProperty(QString::fromLatin1("aliases"), qScriptValueFromValue(eng, in->aliases()));
	179	out.setProperty(QString::fromLatin1("seeAlso"), qScriptValueFromValue(eng, in->seeAlso()));
	180	return out;
	181	}
	182
	183	static void consoleCommandFromScriptValue(
	184	const QScriptValue &, QScriptDebuggerConsoleCommand* &)
	185	{
	186	Q_ASSERT(0);
	187	}
	188
	189	static QScriptValue consoleCommandGroupDataToScriptValue(
	190	QScriptEngine *eng, const QScriptDebuggerConsoleCommandGroupData &in)
	191	{
	192	QScriptValue out = eng->newObject();
	193	out.setProperty(QString::fromLatin1("longDescription"), QScriptValue(eng, in.longDescription()));
	194	out.setProperty(QString::fromLatin1("shortDescription"), QScriptValue(eng, in.shortDescription()));
	195	return out;
	196	}
	197
	198	static void consoleCommandGroupDataFromScriptValue(
	199	const QScriptValue &, QScriptDebuggerConsoleCommandGroupData &)
	200	{
	201	Q_ASSERT(0);
	202	}
	203
	204	static QScriptValue consoleCommandGroupMapToScriptValue(
	205	QScriptEngine *eng, const QScriptDebuggerConsoleCommandGroupMap &in)
	206	{
	207	QScriptValue out = eng->newObject();
	208	QScriptDebuggerConsoleCommandGroupMap::const_iterator it;
	209	for (it = in.constBegin(); it != in.constEnd(); ++it) {
	210	out.setProperty(it.key(), qScriptValueFromValue(eng, it.value()));
	211	}
	212	return out;
	213	}
	214
	215	static void consoleCommandGroupMapFromScriptValue(
	216	const QScriptValue &, QScriptDebuggerConsoleCommandGroupMap &)
	217	{
	218	Q_ASSERT(0);
	219	}
	220
	221	static QScriptValue contextInfoToScriptValue(QScriptEngine *eng, const QScriptContextInfo &in)
	222	{
	223	QScriptValue out = eng->newObject();
	224	out.setProperty(QString::fromLatin1("scriptId"), QScriptValue(eng, qsreal(in.scriptId())));
	225	out.setProperty(QString::fromLatin1("fileName"), QScriptValue(eng, in.fileName()));
	226	out.setProperty(QString::fromLatin1("lineNumber"), QScriptValue(eng, in.lineNumber()));
	227	out.setProperty(QString::fromLatin1("columnNumber"), QScriptValue(eng, in.columnNumber()));
	228	out.setProperty(QString::fromLatin1("functionName"), QScriptValue(eng, in.functionName()));
	229	return out;
	230	}
	231
	232	static void contextInfoFromScriptValue(const QScriptValue &, QScriptContextInfo &)
	233	{
	234	Q_ASSERT(0);
	235	}
	236
	237	static QScriptValue debuggerScriptValuePropertyToScriptValue(QScriptEngine *eng, const QScriptDebuggerValueProperty &in)
	238	{
	239	QScriptValue out = eng->newObject();
	240	out.setProperty(QString::fromLatin1("name"), QScriptValue(eng, in.name()));
	241	out.setProperty(QString::fromLatin1("value"), qScriptValueFromValue(eng, in.value()));
	242	out.setProperty(QString::fromLatin1("valueAsString"), QScriptValue(eng, in.valueAsString()));
	243	out.setProperty(QString::fromLatin1("flags"), QScriptValue(eng, static_cast<int>(in.flags())));
	244	return out;
	245	}
	246
	247	static void debuggerScriptValuePropertyFromScriptValue(const QScriptValue &in, QScriptDebuggerValueProperty &out)
	248	{
	249	QString name = in.property(QString::fromLatin1("name")).toString();
	250	QScriptDebuggerValue value = qscriptvalue_cast<QScriptDebuggerValue>(in.property(QString::fromLatin1("value")));
	251	QString valueAsString = in.property(QString::fromLatin1("valueAsString")).toString();
	252	int flags = in.property(QString::fromLatin1("flags")).toInt32();
	253	QScriptDebuggerValueProperty tmp(name, value, valueAsString, QScriptValue::PropertyFlags(flags));
	254	out = tmp;
	255	}
	256
57	257	/*!
58	258	\since 4.5
59	259	\class QScriptDebuggerConsole
…	…
276	276	QScriptMessageHandlerInterface *messageHandler,
277	277	QScriptDebuggerCommandSchedulerInterface *commandScheduler);
278	278
	279	QScriptEngine *commandEngine;
279	280	QScriptDebuggerConsoleCommandManager *commandManager;
280	281	QString commandPrefix;
281	282	QString input;
…	…
300	300	evaluateAction = 0;
301	301	commandPrefix = QLatin1String(".");
302	302	commandManager = new QScriptDebuggerConsoleCommandManager();
	303
	304	commandEngine = new QScriptEngine;
	305	qScriptRegisterMetaType<QScriptBreakpointData>(commandEngine, breakpointDataToScriptValue, breakpointDataFromScriptValue);
	306	qScriptRegisterMetaType<QScriptBreakpointMap>(commandEngine, breakpointMapToScriptValue, breakpointMapFromScriptValue);
	307	qScriptRegisterMetaType<QScriptScriptData>(commandEngine, scriptDataToScriptValue, scriptDataFromScriptValue);
	308	qScriptRegisterMetaType<QScriptScriptMap>(commandEngine, scriptMapToScriptValue, scriptMapFromScriptValue);
	309	qScriptRegisterMetaType<QScriptContextInfo>(commandEngine, contextInfoToScriptValue, contextInfoFromScriptValue);
	310	qScriptRegisterMetaType<QScriptDebuggerValueProperty>(commandEngine, debuggerScriptValuePropertyToScriptValue, debuggerScriptValuePropertyFromScriptValue);
	311	qScriptRegisterSequenceMetaType<QScriptDebuggerValuePropertyList>(commandEngine);
	312	qScriptRegisterMetaType<QScriptDebuggerResponse>(commandEngine, debuggerResponseToScriptValue, debuggerResponseFromScriptValue);
	313	qScriptRegisterMetaType<QScriptDebuggerConsoleCommand*>(commandEngine, consoleCommandToScriptValue, consoleCommandFromScriptValue);
	314	qScriptRegisterSequenceMetaType<QScriptDebuggerConsoleCommandList>(commandEngine);
	315	qScriptRegisterMetaType<QScriptDebuggerConsoleCommandGroupData>(commandEngine, consoleCommandGroupDataToScriptValue, consoleCommandGroupDataFromScriptValue);
	316	qScriptRegisterMetaType<QScriptDebuggerConsoleCommandGroupMap>(commandEngine, consoleCommandGroupMapToScriptValue, consoleCommandGroupMapFromScriptValue);
	317	// ### can't do this, if it's an object ID the conversion will be incorrect since
	318	// ### the object ID refers to an object in a different engine!
	319	// qScriptRegisterMetaType(commandEngine, debuggerScriptValueToScriptValue, debuggerScriptValueFromScriptValue);
303	320	}
304	321
305	322	QScriptDebuggerConsolePrivate::~QScriptDebuggerConsolePrivate()
306	323	{
307	324	delete commandManager;
	325	delete commandEngine;
308	326	}
309	327
310	328	/*!
…	…
345	345	QString program = stream.readAll();
346	346	QScriptDebuggerScriptedConsoleCommand *command;
347	347	command = QScriptDebuggerScriptedConsoleCommand::parse(
348		program, fileName, messageHandler);
	348	program, fileName, commandEngine, messageHandler);
349	349	if (!command)
350	350	continue;
351	351	commandManager->addCommand(command);


46	46	#include "qscriptmessagehandlerinterface_p.h"
47	47	#include "qscriptdebuggerconsoleglobalobject_p.h"
48	48	#include "qscriptdebuggerresponse_p.h"
49		#include "qscriptdebuggervalue_p.h"
50		#include "qscriptdebuggervalueproperty_p.h"
51	49	#include "qscriptdebuggercommandschedulerinterface_p.h"
52	50
53	51	#include <QtCore/qstring.h>
…	…
57	57	#include <QtCore/qdebug.h>
58	58
59	59	Q_DECLARE_METATYPE(QScriptDebuggerResponse)
60		Q_DECLARE_METATYPE(QScriptBreakpointData)
61		Q_DECLARE_METATYPE(QScriptBreakpointMap)
62		Q_DECLARE_METATYPE(QScriptScriptData)
63		Q_DECLARE_METATYPE(QScriptScriptMap)
64		Q_DECLARE_METATYPE(QScriptContextInfo)
65		Q_DECLARE_METATYPE(QScriptDebuggerValue)
66		Q_DECLARE_METATYPE(QScriptDebuggerValueProperty)
67		Q_DECLARE_METATYPE(QScriptDebuggerValuePropertyList)
68		Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommand*)
69		Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommandList)
70		Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommandGroupData)
71		Q_DECLARE_METATYPE(QScriptDebuggerConsoleCommandGroupMap)
72	60
73	61	QT_BEGIN_NAMESPACE
74	62
75		static QScriptValue debuggerResponseToScriptValue(QScriptEngine *eng, const QScriptDebuggerResponse &in)
76		{
77		QScriptValue out = eng->newObject();
78		out.setProperty(QString::fromLatin1("result"), qScriptValueFromValue(eng, in.result()));
79		out.setProperty(QString::fromLatin1("error"), QScriptValue(eng, in.error()));
80		out.setProperty(QString::fromLatin1("async"), QScriptValue(eng, in.async()));
81		return out;
82		}
83
84		static void debuggerResponseFromScriptValue(const QScriptValue &, QScriptDebuggerResponse &)
85		{
86		Q_ASSERT(0);
87		}
88
89		static QScriptValue breakpointDataToScriptValue(QScriptEngine *eng, const QScriptBreakpointData &in)
90		{
91		QScriptValue out = eng->newObject();
92		out.setProperty(QString::fromLatin1("scriptId"), QScriptValue(eng, qsreal(in.scriptId())));
93		out.setProperty(QString::fromLatin1("fileName"), QScriptValue(eng, in.fileName()));
94		out.setProperty(QString::fromLatin1("lineNumber"), QScriptValue(eng, in.lineNumber()));
95		out.setProperty(QString::fromLatin1("enabled"), QScriptValue(eng, in.isEnabled()));
96		out.setProperty(QString::fromLatin1("singleShot"), QScriptValue(eng, in.isSingleShot()));
97		out.setProperty(QString::fromLatin1("ignoreCount"), QScriptValue(eng, in.ignoreCount()));
98		out.setProperty(QString::fromLatin1("condition"), QScriptValue(eng, in.condition()));
99		return out;
100		}
101
102		static void breakpointDataFromScriptValue(const QScriptValue &in, QScriptBreakpointData &out)
103		{
104		QScriptValue scriptId = in.property(QString::fromLatin1("scriptId"));
105		if (scriptId.isValid())
106		out.setScriptId((qint64)scriptId.toNumber());
107		out.setFileName(in.property(QString::fromLatin1("fileName")).toString());
108		out.setLineNumber(in.property(QString::fromLatin1("lineNumber")).toInt32());
109		QScriptValue enabled = in.property(QString::fromLatin1("enabled"));
110		if (enabled.isValid())
111		out.setEnabled(enabled.toBoolean());
112		QScriptValue singleShot = in.property(QString::fromLatin1("singleShot"));
113		if (singleShot.isValid())
114		out.setSingleShot(singleShot.toBoolean());
115		out.setIgnoreCount(in.property(QString::fromLatin1("ignoreCount")).toInt32());
116		out.setCondition(in.property(QString::fromLatin1("condition")).toString());
117		}
118
119		static QScriptValue breakpointMapToScriptValue(QScriptEngine *eng, const QScriptBreakpointMap &in)
120		{
121		QScriptValue out = eng->newObject();
122		QScriptBreakpointMap::const_iterator it;
123		for (it = in.constBegin(); it != in.constEnd(); ++it) {
124		out.setProperty(QString::number(it.key()), qScriptValueFromValue(eng, it.value()));
125		}
126		return out;
127		}
128
129		static void breakpointMapFromScriptValue(const QScriptValue &, QScriptBreakpointMap &)
130		{
131		Q_ASSERT(0);
132		}
133
134		static QScriptValue scriptDataToScriptValue(QScriptEngine *eng, const QScriptScriptData &in)
135		{
136		QScriptValue out = eng->newObject();
137		out.setProperty(QString::fromLatin1("contents"), QScriptValue(eng, in.contents()));
138		out.setProperty(QString::fromLatin1("fileName"), QScriptValue(eng, in.fileName()));
139		out.setProperty(QString::fromLatin1("baseLineNumber"), QScriptValue(eng, in.baseLineNumber()));
140		return out;
141		}
142
143		static void scriptDataFromScriptValue(const QScriptValue &in, QScriptScriptData &out)
144		{
145		QString contents = in.property(QString::fromLatin1("contents")).toString();
146		QString fileName = in.property(QString::fromLatin1("fileName")).toString();
147		int baseLineNumber = in.property(QString::fromLatin1("baseLineNumber")).toInt32();
148		QScriptScriptData tmp(contents, fileName, baseLineNumber);
149		out = tmp;
150		}
151
152		static QScriptValue scriptMapToScriptValue(QScriptEngine *eng, const QScriptScriptMap &in)
153		{
154		QScriptValue out = eng->newObject();
155		QScriptScriptMap::const_iterator it;
156		for (it = in.constBegin(); it != in.constEnd(); ++it) {
157		out.setProperty(QString::number(it.key()), qScriptValueFromValue(eng, it.value()));
158		}
159		return out;
160		}
161
162		static void scriptMapFromScriptValue(const QScriptValue &, QScriptScriptMap &)
163		{
164		Q_ASSERT(0);
165		}
166
167		static QScriptValue consoleCommandToScriptValue(
168		QScriptEngine eng, QScriptDebuggerConsoleCommand const &in)
169		{
170		if (!in)
171		return eng->undefinedValue();
172		QScriptValue out = eng->newObject();
173		out.setProperty(QString::fromLatin1("name"), QScriptValue(eng, in->name()));
174		out.setProperty(QString::fromLatin1("group"), QScriptValue(eng, in->group()));
175		out.setProperty(QString::fromLatin1("shortDescription"), QScriptValue(eng, in->shortDescription()));
176		out.setProperty(QString::fromLatin1("longDescription"), QScriptValue(eng, in->longDescription()));
177		out.setProperty(QString::fromLatin1("aliases"), qScriptValueFromValue(eng, in->aliases()));
178		out.setProperty(QString::fromLatin1("seeAlso"), qScriptValueFromValue(eng, in->seeAlso()));
179		return out;
180		}
181
182		static void consoleCommandFromScriptValue(
183		const QScriptValue &, QScriptDebuggerConsoleCommand* &)
184		{
185		Q_ASSERT(0);
186		}
187
188		static QScriptValue consoleCommandGroupDataToScriptValue(
189		QScriptEngine *eng, const QScriptDebuggerConsoleCommandGroupData &in)
190		{
191		QScriptValue out = eng->newObject();
192		out.setProperty(QString::fromLatin1("longDescription"), QScriptValue(eng, in.longDescription()));
193		out.setProperty(QString::fromLatin1("shortDescription"), QScriptValue(eng, in.shortDescription()));
194		return out;
195		}
196
197		static void consoleCommandGroupDataFromScriptValue(
198		const QScriptValue &, QScriptDebuggerConsoleCommandGroupData &)
199		{
200		Q_ASSERT(0);
201		}
202
203		static QScriptValue consoleCommandGroupMapToScriptValue(
204		QScriptEngine *eng, const QScriptDebuggerConsoleCommandGroupMap &in)
205		{
206		QScriptValue out = eng->newObject();
207		QScriptDebuggerConsoleCommandGroupMap::const_iterator it;
208		for (it = in.constBegin(); it != in.constEnd(); ++it) {
209		out.setProperty(it.key(), qScriptValueFromValue(eng, it.value()));
210		}
211		return out;
212		}
213
214		static void consoleCommandGroupMapFromScriptValue(
215		const QScriptValue &, QScriptDebuggerConsoleCommandGroupMap &)
216		{
217		Q_ASSERT(0);
218		}
219
220		static QScriptValue contextInfoToScriptValue(QScriptEngine *eng, const QScriptContextInfo &in)
221		{
222		QScriptValue out = eng->newObject();
223		out.setProperty(QString::fromLatin1("scriptId"), QScriptValue(eng, qsreal(in.scriptId())));
224		out.setProperty(QString::fromLatin1("fileName"), QScriptValue(eng, in.fileName()));
225		out.setProperty(QString::fromLatin1("lineNumber"), QScriptValue(eng, in.lineNumber()));
226		out.setProperty(QString::fromLatin1("columnNumber"), QScriptValue(eng, in.columnNumber()));
227		out.setProperty(QString::fromLatin1("functionName"), QScriptValue(eng, in.functionName()));
228		return out;
229		}
230
231		static void contextInfoFromScriptValue(const QScriptValue &, QScriptContextInfo &)
232		{
233		Q_ASSERT(0);
234		}
235
236		static QScriptValue debuggerScriptValuePropertyToScriptValue(QScriptEngine *eng, const QScriptDebuggerValueProperty &in)
237		{
238		QScriptValue out = eng->newObject();
239		out.setProperty(QString::fromLatin1("name"), QScriptValue(eng, in.name()));
240		out.setProperty(QString::fromLatin1("value"), qScriptValueFromValue(eng, in.value()));
241		out.setProperty(QString::fromLatin1("valueAsString"), QScriptValue(eng, in.valueAsString()));
242		out.setProperty(QString::fromLatin1("flags"), QScriptValue(eng, static_cast<int>(in.flags())));
243		return out;
244		}
245
246		static void debuggerScriptValuePropertyFromScriptValue(const QScriptValue &in, QScriptDebuggerValueProperty &out)
247		{
248		QString name = in.property(QString::fromLatin1("name")).toString();
249		QScriptDebuggerValue value = qscriptvalue_cast<QScriptDebuggerValue>(in.property(QString::fromLatin1("value")));
250		QString valueAsString = in.property(QString::fromLatin1("valueAsString")).toString();
251		int flags = in.property(QString::fromLatin1("flags")).toInt32();
252		QScriptDebuggerValueProperty tmp(name, value, valueAsString, QScriptValue::PropertyFlags(flags));
253		out = tmp;
254		}
255
256	63	/*!
257	64	\since 4.5
258	65	\class QScriptDebuggerScriptedConsoleCommand
…	…
84	84	QStringList seeAlso;
85	85	QStringList argumentTypes;
86	86	QStringList subCommands;
87		QScriptEngine *engine;
	87	QScriptValue globalObject;
88	88	QScriptValue execFunction;
89	89	QScriptValue responseFunction;
90	90	};
91	91
92	92	QScriptDebuggerScriptedConsoleCommandPrivate::QScriptDebuggerScriptedConsoleCommandPrivate()
93	93	{
94		engine = 0;
95	94	}
96	95
97	96	QScriptDebuggerScriptedConsoleCommandPrivate::~QScriptDebuggerScriptedConsoleCommandPrivate()
98	97	{
99		delete engine;
100	98	}
101	99
102	100	QScriptDebuggerScriptedConsoleCommand::QScriptDebuggerScriptedConsoleCommand(
…	…
102	102	const QString &shortDescription, const QString &longDescription,
103	103	const QStringList &aliases, const QStringList &seeAlso,
104	104	const QStringList &argumentTypes, const QStringList &subCommands,
	105	const QScriptValue &globalObject,
105	106	const QScriptValue &execFunction, const QScriptValue &responseFunction)
106	107	: QScriptDebuggerConsoleCommand(*new QScriptDebuggerScriptedConsoleCommandPrivate)
107	108	{
…	…
115	115	d->seeAlso = seeAlso;
116	116	d->argumentTypes = argumentTypes;
117	117	d->subCommands = subCommands;
	118	d->globalObject = globalObject;
118	119	d->execFunction = execFunction;
119	120	d->responseFunction = responseFunction;
120		d->engine = execFunction.engine();
121
122		qScriptRegisterMetaType<QScriptBreakpointData>(d->engine, breakpointDataToScriptValue, breakpointDataFromScriptValue);
123		qScriptRegisterMetaType<QScriptBreakpointMap>(d->engine, breakpointMapToScriptValue, breakpointMapFromScriptValue);
124		qScriptRegisterMetaType<QScriptScriptData>(d->engine, scriptDataToScriptValue, scriptDataFromScriptValue);
125		qScriptRegisterMetaType<QScriptScriptMap>(d->engine, scriptMapToScriptValue, scriptMapFromScriptValue);
126		qScriptRegisterMetaType<QScriptContextInfo>(d->engine, contextInfoToScriptValue, contextInfoFromScriptValue);
127		qScriptRegisterMetaType<QScriptDebuggerValueProperty>(d->engine, debuggerScriptValuePropertyToScriptValue, debuggerScriptValuePropertyFromScriptValue);
128		qScriptRegisterSequenceMetaType<QScriptDebuggerValuePropertyList>(d->engine);
129		qScriptRegisterMetaType<QScriptDebuggerResponse>(d->engine, debuggerResponseToScriptValue, debuggerResponseFromScriptValue);
130		qScriptRegisterMetaType<QScriptDebuggerConsoleCommand*>(d->engine, consoleCommandToScriptValue, consoleCommandFromScriptValue);
131		qScriptRegisterSequenceMetaType<QScriptDebuggerConsoleCommandList>(d->engine);
132		qScriptRegisterMetaType<QScriptDebuggerConsoleCommandGroupData>(d->engine, consoleCommandGroupDataToScriptValue, consoleCommandGroupDataFromScriptValue);
133		qScriptRegisterMetaType<QScriptDebuggerConsoleCommandGroupMap>(d->engine, consoleCommandGroupMapToScriptValue, consoleCommandGroupMapFromScriptValue);
134		// ### can't do this, if it's an object ID the conversion will be incorrect since
135		// ### the object ID refers to an object in a different engine!
136		// qScriptRegisterMetaType(d->engine, debuggerScriptValueToScriptValue, debuggerScriptValueFromScriptValue);
137	121	}
138	122
139	123	QScriptDebuggerScriptedConsoleCommand::~QScriptDebuggerScriptedConsoleCommand()
…	…
193	193	void QScriptDebuggerScriptedConsoleCommandJob::start()
194	194	{
195	195	Q_D(QScriptDebuggerScriptedConsoleCommandJob);
196		QScriptEngine *engine = d->command->engine;
	196	QScriptEngine *engine = d->command->globalObject.engine();
	197	engine->setGlobalObject(d->command->globalObject);
197	198	QScriptValueList args;
198	199	for (int i = 0; i < d->arguments.size(); ++i)
199	200	args.append(QScriptValue(engine, d->arguments.at(i)));
…	…
224	224	{
225	225	Q_D(QScriptDebuggerScriptedConsoleCommandJob);
226	226	// ### generalize
227		QScriptEngine *engine = d->command->engine;
	227	QScriptEngine *engine = d->command->globalObject.engine();
	228	engine->setGlobalObject(d->command->globalObject);
228	229	QScriptValueList args;
229	230	args.append(qScriptValueFromValue(engine, response));
230	231	args.append(QScriptValue(engine, commandId));
231	232	QScriptDebuggerConsoleGlobalObject *global;
232		global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().toQObject());
	233	global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(d->command->globalObject.toQObject());
233	234	Q_ASSERT(global != 0);
234	235	global->setScheduler(this);
235	236	global->setResponseHandler(this);
…	…
341	341	*/
342	342	QScriptDebuggerScriptedConsoleCommand *QScriptDebuggerScriptedConsoleCommand::parse(
343	343	const QString &program, const QString &fileName,
344		QScriptMessageHandlerInterface *messageHandler)
	344	QScriptEngine engine, QScriptMessageHandlerInterface messageHandler)
345	345	{
346		QScriptEngine *engine = new QScriptEngine();
347	346	// create a custom global object
348	347	QScriptDebuggerConsoleGlobalObject *cppGlobal = new QScriptDebuggerConsoleGlobalObject();
349	348	QScriptValue global = engine->newQObject(cppGlobal,
…	…
363	363	if (engine->hasUncaughtException()) {
364	364	messageHandler->message(QtCriticalMsg, ret.toString(), fileName,
365	365	engine->uncaughtExceptionLineNumber());
366		delete engine;
367	366	return 0;
368	367	}
369	368
370	369	QScriptValue name = global.property(QLatin1String("name"));
371	370	if (!name.isString()) {
372	371	messageHandler->message(QtCriticalMsg, QLatin1String("command definition lacks a name"), fileName);
373		delete engine;
374	372	return 0;
375	373	}
376	374	QString nameStr = name.toString();
…	…
377	377	if (!group.isString()) {
378	378	messageHandler->message(QtCriticalMsg, QString::fromLatin1("definition of command \"%0\" lacks a group name")
379	379	.arg(nameStr), fileName);
380		delete engine;
381	380	return 0;
382	381	}
383	382	QString groupStr = group.toString();
…	…
385	385	if (!shortDesc.isString()) {
386	386	messageHandler->message(QtCriticalMsg, QString::fromLatin1("definition of command \"%0\" lacks shortDescription")
387	387	.arg(nameStr), fileName);
388		delete engine;
389	388	return 0;
390	389	}
391	390	QString shortDescStr = shortDesc.toString();
…	…
393	393	if (!longDesc.isString()) {
394	394	messageHandler->message(QtCriticalMsg, QString::fromLatin1("definition of command \"%0\" lacks longDescription")
395	395	.arg(nameStr), fileName);
396		delete engine;
397	396	return 0;
398	397	}
399	398	QString longDescStr = longDesc.toString();
…	…
413	413	if (!execFunction.isFunction()) {
414	414	messageHandler->message(QtCriticalMsg, QString::fromLatin1("definition of command \"%0\" lacks execute() function")
415	415	.arg(nameStr), fileName);
416		delete engine;
417	416	return 0;
418	417	}
419	418
…	…
423	423	shortDescStr, longDescStr,
424	424	aliases, seeAlso,
425	425	argTypes, subCommands,
426		execFunction, responseFunction);
	426	global, execFunction, responseFunction);
427	427	return result;
428	428	}
429	429


57	57
58	58	QT_BEGIN_NAMESPACE
59	59
	60	class QScriptEngine;
60	61	class QScriptValue;
61	62
62	63	class QScriptDebuggerScriptedConsoleCommandPrivate;
…	…
73	73	const QStringList &seeAlso,
74	74	const QStringList &argumentTypes,
75	75	const QStringList &subCommands,
	76	const QScriptValue &globalObject,
76	77	const QScriptValue &execFunction,
77	78	const QScriptValue &responseFunction);
78	79	public:
…	…
81	81
82	82	static QScriptDebuggerScriptedConsoleCommand *parse(
83	83	const QString &program, const QString &fileName,
84		QScriptMessageHandlerInterface *messageHandler);
	84	QScriptEngine engine, QScriptMessageHandlerInterface messageHandler);
85	85
86	86	QString name() const;
87	87	QString group() const;

Commit 5762a988fbcd95c9c44e58993c25f5cd1d53f897

Gitorious