History

rework ScriptValue to act like a stack variable rather than a pointer

Heather Anderson committed 5 years ago

Commit 85810221 parent f209c51170 files · +2837 −2594Browse files

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

Unified · Split

libraries/script-engine/src/ConsoleScriptingInterface.cpp+17−17
@@ -30,14 +30,14 @@ const QString SPACE_SEPARATOR = " "; · 29 unmodified lines
3030 const QString STACK_TRACE_FORMAT = "\n[Stacktrace]%1%2";
3131 QList<QString> ConsoleScriptingInterface::_groupDetails = QList<QString>();
3232
33−ScriptValuePointer ConsoleScriptingInterface::info(ScriptContext* context, ScriptEngine* engine) {
33+ScriptValue ConsoleScriptingInterface::info(ScriptContext* context, ScriptEngine* engine) {
3434 if (ScriptManager* scriptManager = engine->manager()) {
3535 scriptManager->scriptInfoMessage(appendArguments(context));
3636 }
3737 return engine->nullValue();
3838 }
3939
40−ScriptValuePointer ConsoleScriptingInterface::log(ScriptContext* context, ScriptEngine* engine) {
40+ScriptValue ConsoleScriptingInterface::log(ScriptContext* context, ScriptEngine* engine) {
4141 QString message = appendArguments(context);
4242 if (_groupDetails.count() == 0) {
4343 if (ScriptManager* scriptManager = engine->manager()) {
@@ -49,28 +49,28 @@ ScriptValuePointer ConsoleScriptingInterface::log(ScriptContext* context, Script · 5 unmodified lines
4949 return engine->nullValue();
5050 }
5151
52−ScriptValuePointer ConsoleScriptingInterface::debug(ScriptContext* context, ScriptEngine* engine) {
52+ScriptValue ConsoleScriptingInterface::debug(ScriptContext* context, ScriptEngine* engine) {
5353 if (ScriptManager* scriptManager = engine->manager()) {
5454 scriptManager->scriptPrintedMessage(appendArguments(context));
5555 }
5656 return engine->nullValue();
5757 }
5858
59−ScriptValuePointer ConsoleScriptingInterface::warn(ScriptContext* context, ScriptEngine* engine) {
59+ScriptValue ConsoleScriptingInterface::warn(ScriptContext* context, ScriptEngine* engine) {
6060 if (ScriptManager* scriptManager = engine->manager()) {
6161 scriptManager->scriptWarningMessage(appendArguments(context));
6262 }
6363 return engine->nullValue();
6464 }
6565
66−ScriptValuePointer ConsoleScriptingInterface::error(ScriptContext* context, ScriptEngine* engine) {
66+ScriptValue ConsoleScriptingInterface::error(ScriptContext* context, ScriptEngine* engine) {
6767 if (ScriptManager* scriptManager = engine->manager()) {
6868 scriptManager->scriptErrorMessage(appendArguments(context));
6969 }
7070 return engine->nullValue();
7171 }
7272
73−ScriptValuePointer ConsoleScriptingInterface::exception(ScriptContext* context, ScriptEngine* engine) {
73+ScriptValue ConsoleScriptingInterface::exception(ScriptContext* context, ScriptEngine* engine) {
7474 if (ScriptManager* scriptManager = engine->manager()) {
7575 scriptManager->scriptErrorMessage(appendArguments(context));
7676 }
@@ -108,14 +108,14 @@ void ConsoleScriptingInterface::timeEnd(QString labelName) { · 31 unmodified lines
108108 }
109109 }
110110
111−ScriptValuePointer ConsoleScriptingInterface::assertion(ScriptContext* context, ScriptEngine* engine) {
111+ScriptValue ConsoleScriptingInterface::assertion(ScriptContext* context, ScriptEngine* engine) {
112112 QString message;
113113 bool condition = false;
114114 for (int i = 0; i < context->argumentCount(); i++) {
115115 if (i == 0) {
116− condition = context->argument(i)->toBool(); // accept first value as condition
116+ condition = context->argument(i).toBool(); // accept first value as condition
117117 } else {
118− message += SPACE_SEPARATOR + context->argument(i)->toString(); // accept other parameters as message
118+ message += SPACE_SEPARATOR + context->argument(i).toString(); // accept other parameters as message
119119 }
120120 }
121121
@@ -148,19 +148,19 @@ void ConsoleScriptingInterface::clear() { · 26 unmodified lines
148148 }
149149 }
150150
151−ScriptValuePointer ConsoleScriptingInterface::group(ScriptContext* context, ScriptEngine* engine) {
152− logGroupMessage(context->argument(0)->toString(), engine); // accept first parameter as label
153− _groupDetails.push_back(context->argument(0)->toString());
151+ScriptValue ConsoleScriptingInterface::group(ScriptContext* context, ScriptEngine* engine) {
152+ logGroupMessage(context->argument(0).toString(), engine); // accept first parameter as label
153+ _groupDetails.push_back(context->argument(0).toString());
154154 return engine->nullValue();
155155 }
156156
157−ScriptValuePointer ConsoleScriptingInterface::groupCollapsed(ScriptContext* context, ScriptEngine* engine) {
158− logGroupMessage(context->argument(0)->toString(), engine); // accept first parameter as label
159− _groupDetails.push_back(context->argument(0)->toString());
157+ScriptValue ConsoleScriptingInterface::groupCollapsed(ScriptContext* context, ScriptEngine* engine) {
158+ logGroupMessage(context->argument(0).toString(), engine); // accept first parameter as label
159+ _groupDetails.push_back(context->argument(0).toString());
160160 return engine->nullValue();
161161 }
162162
163−ScriptValuePointer ConsoleScriptingInterface::groupEnd(ScriptContext* context, ScriptEngine* engine) {
163+ScriptValue ConsoleScriptingInterface::groupEnd(ScriptContext* context, ScriptEngine* engine) {
164164 ConsoleScriptingInterface::_groupDetails.removeLast();
165165 return engine->nullValue();
166166 }
@@ -171,7 +171,7 @@ QString ConsoleScriptingInterface::appendArguments(ScriptContext* context) { · 4 unmodified lines
171171 if (i > 0) {
172172 message += SPACE_SEPARATOR;
173173 }
174− message += context->argument(i)->toString();
174+ message += context->argument(i).toString();
175175 }
176176 return message;
177177 }