Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes evalString, error checking in runScript

This commit is contained in:
Rolando Abarca 2012-05-08 16:44:17 -07:00
parent 856ce0757c
commit 2692de7de8
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
testjs/JSBindings/ScriptingCore.cpp
View File

@ -119,19 +119,22 @@ ScriptingCore::ScriptingCore()
JS_DefineFunction(this->cx, cocos, "forceGC", ScriptingCore::forceGC, 0, JSPROP_READONLY | JSPROP_PERMANENT);
}
void ScriptingCore::evalString(const char *string)
bool ScriptingCore::evalString(const char *string, jsval *outVal)
{
jsval rval;
JSString *str;
JSBool ok;
const char *filename = "noname";
uint32_t lineno = 0;
ok = JS_EvaluateScript(cx, global, string, strlen(string), filename, lineno, &rval);
if (JSVAL_IS_NULL(rval) || rval == JSVAL_FALSE) {
if (outVal == NULL) {
outVal = &rval;
}
ok = JS_EvaluateScript(cx, global, string, strlen(string), filename, lineno, outVal);
if (ok == JS_FALSE) {
CCLog("error evaluating script:\n%s", string);
}
str = JS_ValueToString(cx, rval);
printf("js result: %s\n", JS_EncodeString(cx, str));
return ok;
}
void ScriptingCore::runScript(const char *path)
@ -157,7 +160,7 @@ void ScriptingCore::runScript(const char *path)
JSBool ok;
jsval rval;
ok = JS_EvaluateScript(this->cx, this->global, (char *)content, contentSize, path, 1, &rval);
if (JSVAL_IS_NULL(rval) || rval == JSVAL_FALSE) {
if (ok == JS_FALSE) {
CCLog("error evaluating script:\n%s", content);
}
free(content);

4
testjs/JSBindings/ScriptingCore.h
View File

@ -30,8 +30,10 @@ public:
/**
* will eval the specified string
* @param string The string with the javascript code to be evaluated
* @param outVal The jsval that will hold the return value of the evaluation.
* Can be NULL.
*/
void evalString(const char *string);
bool evalString(const char *string, jsval *outVal);
/**
* will run the specified string