spidermonkey/pyiter.c spidermonkey/pyiter.h @@ -1,3 +1,3 @@ #! /bin/bash -python setup.py build -gdb --command=go.comm --batch python2.5 +#python setup.py build +gdb --command=go.comm --batch python go @@ -12,35 +12,39 @@ jsval py2js_integer(Context* cx, PyObject* obj) { long pyval; - jsval ret = JSVAL_VOID; if(PyInt_Check(obj)) { pyval = PyInt_AsLong(obj); - if(PyErr_Occurred()) goto error; + if(PyErr_Occurred()) return JSVAL_VOID; } else { pyval = PyLong_AsLong(obj); - if(PyErr_Occurred()) goto error; + if(PyErr_Occurred()) return JSVAL_VOID; } - + + return long2js_integer(cx, pyval); +} + +jsval +long2js_integer(Context* cx, long pyval) +{ + jsval ret = JSVAL_VOID; + if(INT_FITS_IN_JSVAL(pyval)) { ret = INT_TO_JSVAL(pyval); - goto success; + goto done; } if(!JS_NewNumberValue(cx->cx, pyval, &ret)) { PyErr_SetString(PyExc_ValueError, "Failed to convert number."); - goto error; + goto done; } - goto success; - -error: -success: +done: return ret; } spidermonkey/integer.c @@ -10,6 +10,7 @@ #define PYSM_INTEGER_H jsval py2js_integer(Context* cx, PyObject* obj); +jsval long2js_integer(Context* cx, long val); PyObject* js2py_integer(Context* cx, jsval val); #endif spidermonkey/integer.h @@ -7,6 +7,7 @@ */ #include "spidermonkey.h" +#include "libjs/jsobj.h" /* This is a fairly unsafe operation in so much as @@ -82,21 +83,43 @@ js_get_prop(JSContext* jscx, JSObject* jsobj, jsval key, jsval* val) Context* pycx = NULL; PyObject* pyobj = NULL; PyObject* pykey = NULL; + PyObject* utf8 = NULL; PyObject* pyval = NULL; JSBool ret = JS_FALSE; - + const char* data; + pycx = (Context*) JS_GetContextPrivate(jscx); if(pycx == NULL) { PyErr_SetString(PyExc_RuntimeError, "Failed to get JS Context."); - goto error; + goto done; } pyobj = get_py_obj(jscx, jsobj); - if(pyobj == NULL) goto error; + if(pyobj == NULL) goto done; pykey = js2py(pycx, key); - if(pykey == NULL) goto error; + if(pykey == NULL) goto done; + + utf8 = PyUnicode_AsUTF8String(pykey); + if(utf8 == NULL) goto done; + + // Yeah. It's ugly as sin. + if(PyString_Check(utf8)) + { + data = PyString_AsString(utf8); + if(data == NULL) goto done; + + if(strcmp("__iterator__", data) == 0) + { + if(!new_py_iter(pycx, pyobj, val)) goto done; + if(*val != JSVAL_VOID) + { + ret = JS_TRUE; + goto done; + } + } + } pyval = PyObject_GetItem(pyobj, pykey); if(pyval == NULL) @@ -108,20 +131,19 @@ js_get_prop(JSContext* jscx, JSObject* jsobj, jsval key, jsval* val) PyErr_Clear(); ret = JS_TRUE; *val = JSVAL_VOID; - goto success; + goto done; } } *val = py2js(pycx, pyval); - if(*val == JSVAL_VOID) goto error; + if(*val == JSVAL_VOID) goto done; ret = JS_TRUE; - goto success; -error: -success: +done: Py_XDECREF(pykey); Py_XDECREF(pyval); - + Py_XDECREF(utf8); + return ret; } @@ -178,18 +200,6 @@ success: return ret; } -JSBool -js_enumerate(JSContext* jscx, JSObject* jsobj) -{ - return JS_TRUE; -} - -JSBool -js_resolve(JSContext* cx, JSObject* obj, jsval key) -{ - return JS_TRUE; -} - void js_finalize(JSContext* jscx, JSObject* jsobj) { @@ -355,14 +365,15 @@ success: } JSClass* -create_class(Context* cx, PyTypeObject* type) +create_class(Context* cx, PyObject* pyobj) { PyObject* curr = NULL; JSClass* jsclass = NULL; JSClass* ret = NULL; char* classname = NULL; - - curr = Context_get_class(cx, type->tp_name); + int flags = JSCLASS_HAS_RESERVED_SLOTS(1); + + curr = Context_get_class(cx, pyobj->ob_type->tp_name); if(curr != NULL) return (JSClass*) HashCObj_AsVoidPtr(curr); jsclass = (JSClass*) malloc(sizeof(JSClass)); @@ -372,29 +383,28 @@ create_class(Context* cx, PyTypeObject* type) goto error; } - classname = (char*) malloc(strlen(type->tp_name)*sizeof(char)); + classname = (char*) malloc(strlen(pyobj->ob_type->tp_name)*sizeof(char)); if(classname == NULL) { PyErr_NoMemory(); goto error; } - strcpy((char*) classname, type->tp_name); + strcpy((char*) classname, pyobj->ob_type->tp_name); jsclass->name = classname; - jsclass->flags = JSCLASS_HAS_RESERVED_SLOTS(1); + jsclass->flags = flags; jsclass->addProperty = js_add_prop; jsclass->delProperty = js_del_prop; jsclass->getProperty = js_get_prop; jsclass->setProperty = js_set_prop; - jsclass->enumerate = js_enumerate; - jsclass->resolve = js_resolve; + jsclass->enumerate = JS_EnumerateStub; + jsclass->resolve = JS_ResolveStub; jsclass->convert = JS_ConvertStub; jsclass->finalize = js_finalize; jsclass->getObjectOps = NULL; jsclass->checkAccess = NULL; jsclass->call = js_call; - //jsclass->construct = NULL; jsclass->construct = js_ctor; jsclass->xdrObject = NULL; jsclass->hasInstance = NULL; @@ -403,7 +413,7 @@ create_class(Context* cx, PyTypeObject* type) curr = HashCObj_FromVoidPtr(jsclass); if(curr == NULL) goto error; - if(Context_add_class(cx, type->tp_name, curr) < 0) goto error; + if(Context_add_class(cx, pyobj->ob_type->tp_name, curr) < 0) goto error; ret = jsclass; goto success; @@ -425,7 +435,7 @@ py2js_object(Context* cx, PyObject* pyobj) jsval pyval; jsval ret = JSVAL_VOID; - klass = create_class(cx, pyobj->ob_type); + klass = create_class(cx, pyobj); if(klass == NULL) goto error; jsobj = JS_NewObject(cx->cx, klass, NULL, NULL); @@ -434,7 +444,8 @@ py2js_object(Context* cx, PyObject* pyobj) PyErr_SetString(PyExc_RuntimeError, "Failed to create JS object."); goto error; } - + + // do the attached = pyobj dance to only DECREF if we get passed INCREF attached = pyobj; // INCREF for the value stored in JS Py_INCREF(attached); spidermonkey/pyobject.c @@ -22,6 +22,7 @@ #include "double.h" #include "pyobject.h" +#include "pyiter.h" #include "jsobject.h" #include "jsarray.h" spidermonkey/spidermonkey.h @@ -4,26 +4,33 @@ # under the MIT license. import t -class Foo(object): - def __init__(self): - self.blam = 8 - self.zing = "yessiree" - -@t.glbl("zip", Foo()) -def test_iter_py(cx, glbl): - js = """ - var ret = []; - for(var v in zip) { - ret.push(v) - } - ret; - """ - t.eq(cx.execute(js), ["blam", "zing"]) - -@t.cx() -def test_iter_js(cx): - ret = cx.execute('var f = {"foo": 1, "domino": "daily"}; f;') - keys = [k for k in ret] - keys.sort() - t.eq(keys, ["domino", "foo"]) +@t.rt() +def test_iter_py(rt): + pairs = [ + ({"foo": "bar", "baz": "bam"}, ["foo", "baz"]), + (["a", "b", "c"], [0, 1, 2]) + ] + def check(a, b): + cx = rt.new_context() + cx.add_global("zip", a) + js = """ + var ret = []; + for(var v in zip) {ret.push(v);} + ret; + """ + t.eq(cx.execute(js), b) + map(lambda x: check(*x), pairs) +@t.rt() +def test_iter_js(rt): + pairs = [ + ('var f = {"foo": 1, "domino": "daily"}; f;', ["domino", "foo"]), + ('["foo", 1, "bing"]', [0, 1, 2]) + ] + def check(a, b): + cx = rt.new_context() + ret = cx.execute(a) + data = [k for k in ret] + data.sort() + t.eq(data, b) + map(lambda x: check(*x), pairs) tests/test-iterate.py 1a1300a296f7562e6ddbd9194487b5f15a5fb67a Paul Davis davisp@puny.(none) http://github.com/davisp/python-spidermonkey/commit/0d2d6d1435f0a5f1f1faf03be70f78eb32359d00 0d2d6d1435f0a5f1f1faf03be70f78eb32359d00 2009-05-09T18:17:12-07:00 2009-05-09T09:44:45-07:00 Initial JS iteration of Python objects. This passes the basic tests. I need to add a check to detect if we're doing 'for v in obj' vs 'for each (v in obj)' iteration as they behave differently in JavaScript. 6633b5761584f3b716b75a3b6e1994ac9e2256d2 Paul Davis davisp@davis-2318.local