Mercurial > pymonkey
changeset 44:0b9a316ce4ef
Changed function signature of PYM_pyObjectToJsval() to be consistent w/ the rest of the API.
| author | Atul Varma <varmaa@toolness.com> |
|---|---|
| date | Sun, 05 Jul 2009 23:55:42 -0700 |
| parents | 5727675b1bcb |
| children | 03aec8572461 |
| files | context.c function.c utils.c utils.h |
| diffstat | 4 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/context.c Sun Jul 05 23:52:14 2009 -0700 +++ b/context.c Sun Jul 05 23:55:42 2009 -0700 @@ -135,7 +135,7 @@ jsval jsValue; - if (PYM_pyObjectToJsval(self->cx, value, &jsValue) == -1) + if (PYM_pyObjectToJsval(self, value, &jsValue) == -1) return NULL; // TODO: Support unicode naming. @@ -169,7 +169,7 @@ for (unsigned int i = 0; i < argc; i++) { PyObject *item = PyTuple_GET_ITEM(funcArgs, i); if (item == NULL || - PYM_pyObjectToJsval(self->cx, item, currArg) == -1) + PYM_pyObjectToJsval(self, item, currArg) == -1) return NULL; currArg++; }
--- a/function.c Sun Jul 05 23:52:14 2009 -0700 +++ b/function.c Sun Jul 05 23:55:42 2009 -0700 @@ -47,7 +47,7 @@ return JS_FALSE; } - int error = PYM_pyObjectToJsval(cx, result, rval); + int error = PYM_pyObjectToJsval(context, result, rval); Py_DECREF(result); if (error) {
--- a/utils.c Sun Jul 05 23:52:14 2009 -0700 +++ b/utils.c Sun Jul 05 23:55:42 2009 -0700 @@ -5,11 +5,11 @@ PyObject *PYM_error; static int -PYM_doubleToJsval(JSContext *cx, +PYM_doubleToJsval(PYM_JSContextObject *context, double number, jsval *rval) { - jsdouble *numberAsJsdouble = JS_NewDouble(cx, number); + jsdouble *numberAsJsdouble = JS_NewDouble(context->cx, number); if (numberAsJsdouble == NULL) { PyErr_SetString(PYM_error, "JS_NewDouble() failed"); return -1; @@ -19,14 +19,14 @@ } int -PYM_pyObjectToJsval(JSContext *cx, +PYM_pyObjectToJsval(PYM_JSContextObject *context, PyObject *object, jsval *rval) { #ifndef Py_UNICODE_WIDE if (PyUnicode_Check(object)) { Py_UNICODE *string = PyUnicode_AsUnicode(object); - JSString *jsString = JS_NewUCStringCopyZ(cx, + JSString *jsString = JS_NewUCStringCopyZ(context->cx, (const jschar *) string); if (jsString == NULL) { PyErr_SetString(PYM_error, "JS_NewUCStringCopyZ() failed"); @@ -44,15 +44,15 @@ *rval = INT_TO_JSVAL(number); return 0; } else - return PYM_doubleToJsval(cx, number, rval); + return PYM_doubleToJsval(context, number, rval); } if (PyFloat_Check(object)) - return PYM_doubleToJsval(cx, PyFloat_AS_DOUBLE(object), rval); + return PYM_doubleToJsval(context, PyFloat_AS_DOUBLE(object), rval); if (PyObject_TypeCheck(object, &PYM_JSObjectType)) { PYM_JSObject *jsObject = (PYM_JSObject *) object; - JSRuntime *rt = JS_GetRuntime(cx); + JSRuntime *rt = JS_GetRuntime(context->cx); if (rt != jsObject->runtime->rt) { PyErr_SetString(PyExc_ValueError, "JS object and JS context are from different "