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
30const QString STACK_TRACE_FORMAT = "\n[Stacktrace]%1%2";30const QString STACK_TRACE_FORMAT = "\n[Stacktrace]%1%2";
31QList<QString> ConsoleScriptingInterface::_groupDetails = QList<QString>();31QList<QString> ConsoleScriptingInterface::_groupDetails = QList<QString>();
32 32
33ScriptValuePointer ConsoleScriptingInterface::info(ScriptContext* context, ScriptEngine* engine) {33ScriptValue ConsoleScriptingInterface::info(ScriptContext* context, ScriptEngine* engine) {
34 if (ScriptManager* scriptManager = engine->manager()) {34 if (ScriptManager* scriptManager = engine->manager()) {
35 scriptManager->scriptInfoMessage(appendArguments(context));35 scriptManager->scriptInfoMessage(appendArguments(context));
36 }36 }
37 return engine->nullValue();37 return engine->nullValue();
38}38}
39 39
40ScriptValuePointer ConsoleScriptingInterface::log(ScriptContext* context, ScriptEngine* engine) {40ScriptValue ConsoleScriptingInterface::log(ScriptContext* context, ScriptEngine* engine) {
41 QString message = appendArguments(context);41 QString message = appendArguments(context);
42 if (_groupDetails.count() == 0) {42 if (_groupDetails.count() == 0) {
43 if (ScriptManager* scriptManager = engine->manager()) {43 if (ScriptManager* scriptManager = engine->manager()) {
@@ -49,28 +49,28 @@ ScriptValuePointer ConsoleScriptingInterface::log(ScriptContext* context, Script · 5 unmodified lines
49 return engine->nullValue();49 return engine->nullValue();
50}50}
51 51
52ScriptValuePointer ConsoleScriptingInterface::debug(ScriptContext* context, ScriptEngine* engine) {52ScriptValue ConsoleScriptingInterface::debug(ScriptContext* context, ScriptEngine* engine) {
53 if (ScriptManager* scriptManager = engine->manager()) {53 if (ScriptManager* scriptManager = engine->manager()) {
54 scriptManager->scriptPrintedMessage(appendArguments(context));54 scriptManager->scriptPrintedMessage(appendArguments(context));
55 }55 }
56 return engine->nullValue();56 return engine->nullValue();
57}57}
58 58
59ScriptValuePointer ConsoleScriptingInterface::warn(ScriptContext* context, ScriptEngine* engine) {59ScriptValue ConsoleScriptingInterface::warn(ScriptContext* context, ScriptEngine* engine) {
60 if (ScriptManager* scriptManager = engine->manager()) {60 if (ScriptManager* scriptManager = engine->manager()) {
61 scriptManager->scriptWarningMessage(appendArguments(context));61 scriptManager->scriptWarningMessage(appendArguments(context));
62 }62 }
63 return engine->nullValue();63 return engine->nullValue();
64}64}
65 65
66ScriptValuePointer ConsoleScriptingInterface::error(ScriptContext* context, ScriptEngine* engine) {66ScriptValue ConsoleScriptingInterface::error(ScriptContext* context, ScriptEngine* engine) {
67 if (ScriptManager* scriptManager = engine->manager()) {67 if (ScriptManager* scriptManager = engine->manager()) {
68 scriptManager->scriptErrorMessage(appendArguments(context));68 scriptManager->scriptErrorMessage(appendArguments(context));
69 }69 }
70 return engine->nullValue();70 return engine->nullValue();
71}71}
72 72
73ScriptValuePointer ConsoleScriptingInterface::exception(ScriptContext* context, ScriptEngine* engine) {73ScriptValue ConsoleScriptingInterface::exception(ScriptContext* context, ScriptEngine* engine) {
74 if (ScriptManager* scriptManager = engine->manager()) {74 if (ScriptManager* scriptManager = engine->manager()) {
75 scriptManager->scriptErrorMessage(appendArguments(context));75 scriptManager->scriptErrorMessage(appendArguments(context));
76 }76 }
@@ -108,14 +108,14 @@ void ConsoleScriptingInterface::timeEnd(QString labelName) { · 31 unmodified lines
108 }108 }
109}109}
110 110
111ScriptValuePointer ConsoleScriptingInterface::assertion(ScriptContext* context, ScriptEngine* engine) {111ScriptValue ConsoleScriptingInterface::assertion(ScriptContext* context, ScriptEngine* engine) {
112 QString message;112 QString message;
113 bool condition = false;113 bool condition = false;
114 for (int i = 0; i < context->argumentCount(); i++) {114 for (int i = 0; i < context->argumentCount(); i++) {
115 if (i == 0) {115 if (i == 0) {
116 condition = context->argument(i)->toBool(); // accept first value as condition116 condition = context->argument(i).toBool(); // accept first value as condition
117 } else {117 } else {
118 message += SPACE_SEPARATOR + context->argument(i)->toString(); // accept other parameters as message118 message += SPACE_SEPARATOR + context->argument(i).toString(); // accept other parameters as message
119 }119 }
120 }120 }
121 121
@@ -148,19 +148,19 @@ void ConsoleScriptingInterface::clear() { · 26 unmodified lines
148 }148 }
149}149}
150 150
151ScriptValuePointer ConsoleScriptingInterface::group(ScriptContext* context, ScriptEngine* engine) {151ScriptValue ConsoleScriptingInterface::group(ScriptContext* context, ScriptEngine* engine) {
152 logGroupMessage(context->argument(0)->toString(), engine); // accept first parameter as label152 logGroupMessage(context->argument(0).toString(), engine); // accept first parameter as label
153 _groupDetails.push_back(context->argument(0)->toString());153 _groupDetails.push_back(context->argument(0).toString());
154 return engine->nullValue();154 return engine->nullValue();
155}155}
156 156
157ScriptValuePointer ConsoleScriptingInterface::groupCollapsed(ScriptContext* context, ScriptEngine* engine) {157ScriptValue ConsoleScriptingInterface::groupCollapsed(ScriptContext* context, ScriptEngine* engine) {
158 logGroupMessage(context->argument(0)->toString(), engine); // accept first parameter as label158 logGroupMessage(context->argument(0).toString(), engine); // accept first parameter as label
159 _groupDetails.push_back(context->argument(0)->toString());159 _groupDetails.push_back(context->argument(0).toString());
160 return engine->nullValue();160 return engine->nullValue();
161}161}
162 162
163ScriptValuePointer ConsoleScriptingInterface::groupEnd(ScriptContext* context, ScriptEngine* engine) {163ScriptValue ConsoleScriptingInterface::groupEnd(ScriptContext* context, ScriptEngine* engine) {
164 ConsoleScriptingInterface::_groupDetails.removeLast();164 ConsoleScriptingInterface::_groupDetails.removeLast();
165 return engine->nullValue();165 return engine->nullValue();
166}166}
@@ -171,7 +171,7 @@ QString ConsoleScriptingInterface::appendArguments(ScriptContext* context) { · 4 unmodified lines
171 if (i > 0) {171 if (i > 0) {
172 message += SPACE_SEPARATOR;172 message += SPACE_SEPARATOR;
173 }173 }
174 message += context->argument(i)->toString();174 message += context->argument(i).toString();
175 }175 }
176 return message;176 return message;
177}177}