LICENSE README.md spidermonkey/jsbool.pxi spidermonkey/spidermonkey.c spidermonkey/spidermonkey.dep tests/bind_test.py tests/bind_test.pyc tests/class_test.py tests/class_test.pyc tests/context_test.py tests/context_test.pyc tests/define_function_test.py tests/define_function_test.pyc tests/error_test.py tests/error_test.pyc tests/roundtrip_test.py tests/roundtrip_test.pyc tests/test.pyc tests/to_python_test.py tests/to_python_test.pyc @@ -1,9 +1,8 @@ include MANIFEST.in -include COPYING +include LICENSE include README -include ChangeLog -include *.pyx +include spidermonkey/*.c +include spidermonkey/*.pyx +include spidermonkey/*.pxi include setup.py -include test.py -include support.c -include spidermonkey.c +include tests/*.py MANIFEST.in @@ -1,10 +1,15 @@ +"""\ +Python/JavaScript bridge module, making use of Mozilla's spidermonkey +JavaScript implementation. Allows implementation of JavaScript classes, +objects and functions in Python, and evaluation and calling of JavaScript +scripts and functions respectively. Borrows heavily from Claes Jacobssen's +Javascript Perl module, in turn based on Mozilla's 'PerlConnect' Perl binding. +""", + import os -import sys -import glob -from distutils.core import setup, Extension -from distutils.command.clean import clean -from distutils.command.install import install -from distutils.file_util import copy_file +import ez_setup +ez_setup.use_setuptools() +from setuptools import setup, Extension try: import Pyrex.Compiler.Main as Compiler @@ -12,32 +17,55 @@ try: except ImportError: print "Pyrex not found: Skipping source generation." -arch = os.uname()[0].lower() -jslib = {"darin": "js", "linux": "mozjs"}.get(arch, "js") -if not jslib: - sys.stderr.write("Failed to guess what JavaScript lib you might be using.") +def get_js_lib(): + arch = os.uname()[0].lower() + jslib = { + "darwin": "js", + "linux": "mozjs" + }.get(arch, None) + if not jslib: + print "Failed to guess what JavaScript lib you might be using." + return jslib -setup(name = "spidermonkey", - version = "0.0.1a", - license = "GPL", - author = "John J. Lee", - author_email = "jjl@pobox.com", +setup( + name = "spidermonkey", + version = "0.1", + license = "MIT", + author = "Paul J. Davis", + author_email = "paul.joseph.davis@gmail.com", description = "JavaScript / Python bridge.", - url = "http://code.google.com/p/python-spidermonkey/", - long_description = """\ -Python/JavaScript bridge module, making use of Mozilla's spidermonkey -JavaScript implementation. Allows implementation of JavaScript classes, -objects and functions in Python, and evaluation and calling of JavaScript -scripts and functions respectively. Borrows heavily from Claes Jacobssen's -Javascript Perl module, in turn based on Mozilla's 'PerlConnect' Perl binding. -""", + long_description = __doc__, + url = "http://github.com/davisp/python-spidermonkey", + zip_safe = False + + classifiers = [ + 'Development Status :: 3 - Alpha', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: MIT License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Programming Lnaguage :: JavaScript', + 'Topic :: Software Development :: Libraries :: Python Modules', + ], + + setup_requires = [ + 'setuptools>=0.6c8' + ], + + install_requires = [ + 'couchdb', + 'Hypy', + 'spidermonkey', + ], + ext_modules = [ - Extension("spidermonkey", + Extension( + "spidermonkey", sources=["spidermonkey/spidermonkey.c"], extra_compile_args=["-DXP_UNIX", "-DJS_THREADSAFE"], include_dirs=["/usr/include/js", "/usr/local/include/js", "/usr/include/mozjs", "/opt/local/include/js"], library_dirs=["/usr/lib", "/usr/local/lib", "/opt/local/lib"], - libraries=["m", "pthread", jslib] + libraries=["m", "pthread", get_js_lib()] ) ] ) setup.py @@ -15,6 +15,9 @@ ELSE: ctypedef int jsval ctypedef int JSBool +cdef extern from "stdio.h": + cdef int printf(char* format, ...) + cdef extern from "string.h": cdef char* strcpy(char* restrict, char* restrict) @@ -216,6 +219,7 @@ cdef extern from "jsapi.h": ) cdef JSClass* JS_GetClass(JSContext* cx, JSObject* obj) + cdef JSObject* JS_GetPrototype(JSContext* cx, JSObject* obj) cdef JSIdArray* JS_Enumerate(JSContext* cx, JSObject* obj) cdef void* JS_GetPrivate(JSContext* cx, JSObject* obj) cdef JSBool JS_SetPrivate(JSContext* cx, JSObject* obj, void* data) @@ -223,6 +227,7 @@ cdef extern from "jsapi.h": # Property Methods cdef JSBool JS_GetProperty(JSContext* cx, JSObject* obj, char* name, jsval* vp) cdef JSBool JS_SetProperty(JSContext* cx, JSObject* obj, char* name, jsval* vp) + cdef JSBool JS_DeleteProperty(JSContext* cx, JSObject* obj, char* name) cdef JSBool JS_DefineProperty( JSContext* cx, @@ -257,6 +262,12 @@ cdef extern from "jsapi.h": cdef JSObject* JS_GetFunctionObject(JSFunction* fun) cdef JSFunction* JS_ValueToFunction(JSContext* cx, jsval v) + # Not necessarily specific to functions, but used for the undocumented + # reserved slots. + JSBool JS_GetReservedSlot(JSContext* cx, JSObject* obj, uint32 index, jsval* vp) + JSBool JS_SetReservedSlot(JSContext* cx, JSObject* obj, uint32 index, jsval v) + + # Set a list of functions on an object cdef JSBool JS_DefineFunctions(JSContext* cx, JSObject* obj, JSFunctionSpec* fs) @@ -306,8 +317,7 @@ cdef extern from "jsapi.h": cdef size_t JS_GetStringLength(JSString* str) # Double Functions - cdef jsdouble* JS_NewDouble(JSContext* cx, jsdouble d) - cdef JSBool JS_NewDoubleValue(JSContext* cx, jsdouble d, jsval* rval) + cdef JSBool JS_NewNumberValue(JSContext* cx, jsdouble d, jsval* rval) # IdArray Functions cdef JSBool JS_IdToValue(JSContext* cx, jsid id, jsval* vp) @@ -346,12 +356,19 @@ cdef extern from "jshelpers.c": cdef JSObject* js_make_global_object(JSContext *cx) cdef void js_context_attach(JSContext* cx, PyObject* obj) + cdef JSBool js_context_has_data(JSContext* cx) cdef object js_context_fetch(JSContext* cx) cdef object js_context_destroy(JSContext* cx) - cdef void js_object_attach(JSObject* js_obj, PyObject* obj) - cdef object js_object_fetch(JSObject* js_obj) - cdef object js_object_destroy(JSObject* js_obj) + cdef void js_object_attach(JSContext* cx, JSObject* js_obj, PyObject* obj) + cdef JSBool js_object_has_data(JSContext* cx, JSObject* js_obj) + cdef object js_object_fetch(JSContext* cx, JSObject* js_obj) + cdef object js_object_destroy(JSContext* cx, JSObject* js_obj) + + cdef void js_function_attach(JSContext* cx, JSObject* js_obj, PyObject* obj) + cdef JSBool js_function_has_data(JSContext* cx, JSObject* js_obj) + cdef object js_function_fetch(JSContext* cx, JSObject* js_obj) + cdef object js_function_destroy(JSContext* cx, JSObject* js_obj) cdef void *xmalloc(size_t size) except NULL: cdef void *mem @@ -370,6 +387,18 @@ cdef class Value # Python -> JavaScript cdef class ClassAdapter cdef class ObjectAdapter - -class JSError(Exception): pass +cdef class FunctionAdapter + +import inspect +import sys +import traceback +import types + +class JSError(Exception): + def __init__(self, mesg): + self.mesg = mesg + def __str__(self): + return repr(self) + def __repr__(self): + return "JavaScript Error: %s" % self.mesg spidermonkey/jsapi.pxi @@ -1,7 +1,7 @@ def js_is_array(Context cx, jsval v): cdef JSObject* obj - if not JSVAL_ISOBJECT(v): + if not JSVAL_IS_OBJECT(v): return False obj = JSVAL_TO_OBJECT(v) return JS_IsArrayObject(cx.cx, obj) @@ -17,7 +17,7 @@ cdef object js2py_array(Context cx, jsval v): cdef list ret jsobj = JSVAL_TO_OBJECT(v) - nr_elems = JS_GetArrayLength(cx.cx, jsobj, &nr_elems) + JS_GetArrayLength(cx.cx, jsobj, &nr_elems) ret = [None] * nr_elems for i from 0 <= i < nr_elems: spidermonkey/jsarray.pxi @@ -1,34 +1,42 @@ -cdef JSBool __constructor_callback__(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval): +cdef JSBool __constructor_callback__(JSContext* cx, JSObject* js_obj, uintN argc, jsval* argv, jsval* rval): cdef Context pycx cdef ClassAdapter adapter - cdef ObjectAdapter objadapter - cdef JSObject* instobj + cdef ObjectAdapter oa + cdef JSObject* proto cdef int i try: + if not js_context_has_data(cx): + raise JSError("Unknown JSContext object.") + + proto = JS_GetPrototype(cx, js_obj) + if proto == NULL: + raise JSError("Object has no prototype.") + + if not js_object_has_data(cx, proto): + raise JSError("Unknown constructor callback.") + pycx = js_context_fetch(cx) - adapter = js_object_fetch(obj) + adapter = js_object_fetch(cx, proto) args = [] for i from 0 <= i < argc: args.append(js2py(pycx, argv[i])) - if hasattr(adaptor, "__jsinit__"): - py_rval = adaptor.py_class.__jsinit__(pycx, *args) + if hasattr(adapter.py_class, "__jsinit__"): + py_rval = adapter.py_class.__jsinit__(pycx, *args) else: - py_rval = adaptor.py_class(pycx, *args) + py_rval = adapter.py_class(*args) rval[0] = py2js(pycx, py_rval, NULL) # Register after conversion so we don't keep it around # if conversion fails. if JSVAL_IS_OBJECT(rval[0]): - objadapter = ObjectAdapter(pycx, adapter, None, py_rval) - instobj = JSVAL_TO_OBJECT(rval[0]) - js_object_attach(instobj, <PyObject*> py_rval) - objadapter.js_obj = instobj - pycx.register(py_rval) + oa = ObjectAdapter(pycx, adapter, None, py_rval) + oa.js_obj = js_obj + js_object_attach(cx, js_obj, <PyObject*> oa) return JS_TRUE except: @@ -40,12 +48,19 @@ cdef JSBool __resolve_global_callback__(JSContext* cx, JSObject* js_obj, jsval j cdef object py_obj cdef object key cdef int i - + try: + if not js_context_has_data(cx): + raise JSError("Unknown JSContext object.") + pycx = js_context_fetch(cx) - adapter = js_object_fetch(js_obj) - py_obj = adapter.obj key = js2py(pycx, jsv) + + if not js_object_has_data(cx, js_obj): + return JS_TRUE; + + adapter = js_object_fetch(cx, js_obj) + py_obj = adapter.py_obj if isinstance(key, types.StringTypes) and hasattr(py_obj, key): # Bind to root object. @@ -54,6 +69,7 @@ cdef JSBool __resolve_global_callback__(JSContext* cx, JSObject* js_obj, jsval j return JS_TRUE except: + traceback.print_exc() return report_python_error(cx) cdef JSBool __get_property_callback__(JSContext* cx, JSObject* js_obj, jsval jsv, jsval* rval): @@ -64,25 +80,33 @@ cdef JSBool __get_property_callback__(JSContext* cx, JSObject* js_obj, jsval jsv cdef object attr try: + if not js_context_has_data(cx): + raise JSError("Unknown JSContext object.") + pycx = js_context_fetch(cx) - adapter = js_object_fetch(js_obj) - py_obj = adapter.obj key = js2py(pycx, jsv) + if not js_object_has_data(cx, js_obj): + return JS_TRUE + + adapter = js_object_fetch(cx, js_obj) + py_obj = adapter.py_obj + if isinstance(key, (types.IntType, types.LongType)): try: - attr = getattr(py_obj, key) - rval[0] = py2js(pycx, attr, NULL) - pycx.register_py(attr) + attr = py_obj[key] except: - rval[0] = JS_VOID - elif isinstance(key, types.StringTypes) and hasattr(py_obj, key): - try: - attr = getattr(py_obj, key) + pass + else: rval[0] = py2js(pycx, attr, NULL) - pycx.register_py(attr) - except: - rval[0] = JS_VOID + elif isinstance(key, types.StringTypes): + if key[:1] != "_": + try: + attr = getattr(py_obj, key) + except: + pass + else: + rval[0] = py2js(pycx, attr, js_obj) elif key is None: rval[0] = JS_VOID else: @@ -90,6 +114,7 @@ cdef JSBool __get_property_callback__(JSContext* cx, JSObject* js_obj, jsval jsv return JS_TRUE except: + traceback.print_exc() return report_python_error(cx) cdef JSBool __set_property_callback__(JSContext* cx, JSObject* js_obj, jsval jsv, jsval rval[0]): @@ -100,23 +125,32 @@ cdef JSBool __set_property_callback__(JSContext* cx, JSObject* js_obj, jsval jsv cdef object val try: + if not js_context_has_data(cx): + raise JSError("Unknown JSContext object.") + pycx = js_context_fetch(cx) - adapter = js_object_fetch(js_obj) - py_obj = adapter.py_obj key = js2py(pycx, jsv) value = js2py(pycx, rval[0]) + + if not js_object_has_data(cx, js_obj): + return JS_TRUE + + adapter = js_object_fetch(cx, js_obj) + py_obj = adapter.py_obj if isinstance(key, (types.IntType, types.LongType)): py_obj[key] = value - elif isinstance(key, types.StringTypes) and hasattr(py_obj, key): - attr = getattr(py_obj, key) - if not callable(attr): - setattr(py_obj, key, value) + elif isinstance(key, types.StringTypes): + if key[:1] != "_" and hasattr(py_obj, key): + attr = getattr(py_obj, key) + if not callable(attr): + setattr(py_obj, key, value) else: raise AssertionError("Invalid key: %r" % key) return JS_TRUE except: + traceback.print_exc() return report_python_error(cx) @@ -125,8 +159,14 @@ cdef void __finalize_callback__(JSContext* cx, JSObject* js_obj): cdef ObjectAdapter py_obj try: + if not js_context_has_data(cx): + raise JSError("Unknown JSContext object.") + + if not js_object_has_data(cx, js_obj): + raise JSError("Unknown JSObject.") + pycx = js_context_fetch(cx) - py_obj = js_object_destroy(js_obj) + py_obj = js_object_destroy(cx, js_obj) except: report_python_error(cx) @@ -142,20 +182,23 @@ cdef class ClassAdapter: cdef JSClass* js_class cdef object py_class - def __cinit__(ClassAdapter self, Context cx, ObjectAdapter parent, py_class, bind_constructur, is_global, flags): - cdef JSObject* obj + def __cinit__(ClassAdapter self, Context cx, ObjectAdapter parent, py_class, bind_constructor, is_global, flags): + cdef JSObject* proto self.cx = cx self.parent = parent self.py_class = py_class - name = js_classname(py_class) + if hasattr(py_class, "__jsname__"): + name = py_class.__jsname__ + else: + name = js_classname(py_class) self.js_class = <JSClass*> xmalloc(sizeof(JSClass)) self.js_class.name = <char*> xmalloc((len(name) + 1) * sizeof(char)) strcpy(self.js_class.name, name) - self.js_class.flags = flags + self.js_class.flags = flags | JSCLASS_HAS_PRIVATE self.js_class.addProperty = JS_PropertyStub self.js_class.delProperty = JS_PropertyStub self.js_class.getProperty = __get_property_callback__ @@ -178,27 +221,17 @@ cdef class ClassAdapter: self.js_class.resolve = JS_ResolveStub if bind_constructor: - if JS_InitClass(self.cx.cx, parent.js_obj, NULL, self.js_class, - __constructor_callback__, 0, NULL, NULL, NULL, NULL) == NULL: + proto = JS_InitClass(self.cx.cx, parent.js_obj, NULL, self.js_class, + __constructor_callback__, 0, NULL, NULL, NULL, NULL) + if proto == NULL: raise JSError("Failed to bind Python adapter class.") + js_object_attach(cx.cx, proto, <PyObject*> self) - js_object_attach(obj, <PyObject*> self) + def __repr__(self): + return "<spidermonkey.ClassAdapter: %r>" % self.py_class def __dealloc__(self): - free(self.js_class.name) - free(self.js_class) - - def as_value(Context self): - cdef JSObject* obj - obj = JS_GetClassObject(self.js_class) - return js_create_value(OBJECT_TO_JSVAL(obj)) - - - - - - - - - - + if self.js_class: + if self.js_class.name: + free(self.js_class.name) + free(self.js_class) spidermonkey/jsclass.pxi @@ -1,11 +1,15 @@ +class JSRootObject(object): + pass + cdef class Context: cdef JSContext* cx cdef Runtime rt cdef ObjectAdapter root cdef GC gc cdef object reg - cdef object err + cdef object classes + cdef object error def __cinit__(self, Runtime rt, root): self.rt = rt @@ -17,30 +21,29 @@ cdef class Context: raise JSError("Failed to create Context") def __init__(Context self, Runtime rt, root): - cdef JSObject* obj + cdef ClassAdapter ca + cdef JSObject* js_obj + cdef PyObject* py_obj self.gc = GC(self) - self.reg = Registry() - self.err = None - self.reg = {} + self.classes = {} + self.error = None js_context_attach(self.cx, <PyObject*> self) - if root: - ca = self.install_class(root.__class__, False, True) - self.root = ObjectAdapter(self, ca, None) - if not self.root: - raise JSError("Failed to bind global object.") - else: - obj = js_make_global_object(self.cx) - self.root = ObjectAdapter(self, None, None, None) - js_object_attach(obj, <PyObject*> None) - self.root.js_obj = obj - if not self.root: - raise JSError("Failed to create default global object.") + if not root: + root = JSRootObject() + + ca = self.install_class(root.__class__, False, True) + js_obj = JS_NewObject(self.cx, ca.js_class, NULL, NULL) + if js_obj == NULL: + raise JSError("Failed to create root object.") + self.root = ObjectAdapter(self, ca, None, root) + self.root.js_obj = js_obj + js_object_attach(self.cx, self.root.js_obj, <PyObject*> self.root) - if not JS_InitStandardClasses(self.cx, self.root.js_obj): + if not JS_InitStandardClasses(self.cx, js_obj): raise JSError("Failed to initialize standard classes.") JS_SetErrorReporter(self.cx, __report_error_callback__) @@ -52,16 +55,19 @@ cdef class Context: """\ Install a Python class into the JavaScript runtime. """ - if not inspect.isclass(klass): - raise TypeError("Unable to install %r as a class." % klass) - if not isinteger(flags): + if not inspect.isclass(py_class): + raise TypeError("Unable to install %r as a class." % py_class) + if not isinstance(flags, (types.IntType, types.LongType)): raise TypeError("Flags is not an integer.") - c = ClassAdaptor(self, python_class, bind_constructor, is_global, flags) - self.classes[c.to_value()] = c - return c + if py_class in self.classes: + return self.classes[py_class] + + ca = ClassAdapter(self, self.root, py_class, bind_constructor, is_global, flags) + self.classes[py_class] = ca + return ca - def bind(Context self, name, obj, parent=None): + def bind(Context self, name, obj): """\ Attach a Python object to the JavaScript runtime. @@ -81,12 +87,18 @@ cdef class Context: if not isinstance(name, types.StringTypes): raise TypeError("Name must be a string.") - ca = self.install_class(obj) + ca = self.install_class(obj.__class__) jsv = py2js(self, obj, self.root.js_obj) if not JS_DefineProperty(self.cx, self.root.js_obj, name, jsv, __get_property_callback__, __set_property_callback__, 0): raise JSError("Failed to bind Python object to the global object.") + def unbind(Context self, name): + ret = self.execute("%s;" % name) + if not JS_DeleteProperty(self.cx, self.root.js_obj, name): + raise JSError("Failed to unbind property: %s" % name) + return ret + def execute(Context self, object script): """\ Execute JavaScript source code. @@ -97,24 +109,13 @@ cdef class Context: raise TypeError("Script must be a string.") if not JS_EvaluateScript(self.cx, self.root.js_obj, script, len(script), "Python", 0, &rval): - raise JSError("Failed to execute script: %s" % self._error) + raise JSError(self.error) return js2py(self, rval) finally: - self._gc.maybe() + self.gc.run_maybe() - def register(Context self, object obj): - """\ - Register a Python object in the context so that it doesn't - get garbage collected. - """ - val = id(obj) - assert val not in self.reg, "Objected previously registered." - self.reg[val] = obj + def set_error(self, mesg): + self.error = mesg - def unregister(Context self, object obj): - val = id(obj) - assert val in self.reg, "Objected not registered." - del self.reg[val] - \ No newline at end of file spidermonkey/jscontext.pxi @@ -10,6 +10,6 @@ cdef object js2py_double(Context cx, jsval jsv): cdef jsval py2js_double(Context cx, double py_obj, JSObject* parent): cdef jsval ret - if not JS_NewDoubleValue(cx.cx, py_obj, &ret): - raise JSError("Failed to convert double to JavaScript") + if not JS_NewNumberValue(cx.cx, py_obj, &ret): + raise JSError("Failed to convert double.") return ret spidermonkey/jsdouble.pxi @@ -1,32 +1,30 @@ cdef JSBool report_python_error(JSContext* cx): - tb = traceback.print_exc() + tb = traceback.format_exc() JS_ReportError(cx, tb) return JS_FALSE cdef void __report_error_callback__(JSContext* cx, char* message, JSErrorReport* report): cdef Context pycx - pycx = js_context_fetch(cx) - - lines = report.linebuf - lines = lines.split("\n") - - if len(lines) == 0: - msg = ["%s:\n<no code>" % message] - else: - i = report.lineno - n = 2 # lines of context on either side of where error occurred - - start, end = max(i-n, 0), min(i+n+1, len(lines)) - - msg = [] - for ln in lines[start:i]: - msg.append(" %s" % ln) - msg.append("-> %s\n" % lines[i]) - for ln in lines[i+1:end]: - msg.append(" %s" % ln) - msg.append("") - msg.append('JavaScript error at line %d: "%s"' % (report.lineno, message)) - context.set_error("\n".join(mesg)) - + + try: + if not js_context_has_data(cx): + sys.stderr.write("Attempting to report error for an unknown JSContext.") + return + pycx = js_context_fetch(cx) + + filename = "Unknown" + lineno = "Unknown" + msg = "Unknown" + + if report != NULL: + if report.filename != NULL: + filename = report.filename + lineno = report.lineno + if message != NULL: + msg = message + + pycx.set_error("%s(%d): %s" % (filename, lineno, message)) + except: + traceback.print_exc() spidermonkey/jserror.pxi @@ -6,11 +6,6 @@ cdef class Function: def __init__(Function self, Context cx): self.cx = cx - def __hash__(self): - cdef int ret - ret = self.func - return ret - def __call__(Function self, *args): cdef jsval* argv cdef jsval rval @@ -25,56 +20,144 @@ cdef class Function: argv[i] = jsarg if not JS_CallFunctionValue(self.cx.cx, self.cx.root.js_obj, self.func, nr_args, argv, &rval): - raise JSError("Failed to execute function: %s" % self.cx._error) + raise JSError(self.cx.error) finally: free(argv) retval = js2py(self.cx, rval) - self.cx.gc.maybe() + self.cx.gc.run_maybe() return retval def __dealloc__(Function self): JS_RemoveRoot(self.cx.cx, &self.func) -cdef JSBool __function_callback__(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval): + +cdef class FunctionAdapter: + cdef Context cx + cdef JSObject* js_obj + cdef object py_obj + + def __cinit__(FunctionAdapter self, Context cx, object obj): + self.cx = cx + self.py_obj = obj + + def __repr__(self): + return "<spidermonkey.FunctionAdapter: %r>" % self.py_obj + + +cdef JSBool __bound_method_callback__(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval): cdef Context pycx - cdef jsval jsfunc + cdef ObjectAdapter oa + cdef JSFunction* jsfunc cdef int i try: + if not js_context_has_data(cx): + raise JSError("Unknown JSContext object.") + pycx = js_context_fetch(cx) - callback = pycx.get_function(js_create_value(argv[-2])) + + if not js_object_has_data(cx, obj): + return JS_FALSE + + oa = js_object_fetch(cx, obj) + + jsfunc = JS_ValueToFunction(cx, argv[-2]) + method_name = JS_GetFunctionName(jsfunc) + method = getattr(oa.py_obj, method_name) args = [None] * argc for i from 0 <= i < argc: args[i] = js2py(pycx, argv[i]) - py_rval = callback(*args) + py_rval = method(*args) rval[0] = py2js(pycx, py_rval, obj) + + return JS_TRUE except: return report_python_error(cx) - return JS_TRUE +cdef JSBool __function_callback__(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval): + cdef Context pycx + cdef FunctionAdapter fa + cdef JSFunction* jsfunc + cdef JSObject* jsobj + cdef int i + + try: + if not js_context_has_data(cx): + raise JSError("Unknown JSContext object.") + + pycx = js_context_fetch(cx) + jsfunc = JS_ValueToFunction(cx, argv[-2]) + jsobj = JS_GetFunctionObject(jsfunc) + + if not js_function_has_data(cx, jsobj): + raise JSError("Function call back without attached functor.") + + fa = js_function_fetch(cx, jsobj) + + args = [None] * argc + for i from 0 <= i < argc: + args[i] = js2py(pycx, argv[i]) + + py_rval = fa.py_obj(*args) + rval[0] = py2js(pycx, py_rval, obj) + + return JS_TRUE + except: + return report_python_error(cx) def js_is_function(Context cx, jsval jsv): return JS_TypeOfValue(cx.cx, jsv) == JSTYPE_FUNCTION def py_is_function(Context cx, object py_obj): - return callable(py_obj) + return isinstance(py_obj, (types.FunctionType, types.LambdaType)) + +def py_is_bound_method(Context cx, object py_obj): + return isinstance(py_obj, types.MethodType) cdef object js2py_function(Context cx, jsval jsv): cdef Function ret ret = Function(cx) ret.func = jsv - cx.gc.add_root(&jsv) + JS_AddRoot(cx.cx, &ret.func) return ret -cdef jsval py2js_function(Context cx, object py_obj, JSObject* parent): +cdef jsval py2js_bound_method(Context cx, object py_obj, JSObject* parent): + cdef FunctionAdapter fa cdef JSFunction* func cdef JSObject* obj - cdef jsval rval - func = JS_NewFunction(cx.cx, __function_callback__, 0, 0, parent, NULL) + if hasattr(py_obj, "func_name"): + name = py_obj.func_name + elif hasattr(py_obj, "im_fun") and hasattr(py_obj.im_fun, "func_name"): + name = py_obj.im_fun.func_name + else: + raise JSError("Failed to find function name.") + + func = JS_NewFunction(cx.cx, __bound_method_callback__, 0, 0, NULL, name) obj = JS_GetFunctionObject(func) - js_object_attach(obj, <PyObject*> py_obj) return OBJECT_TO_JSVAL(obj) + +cdef jsval py2js_function(Context cx, object py_obj, JSObject* parent): + cdef FunctionAdapter fa + cdef JSFunction* func + cdef JSObject* obj + cdef jsval slot + + if hasattr(py_obj, "func_name"): + name = py_obj.func_name + elif hasattr(py_obj, "im_fun") and hasattr(py_obj.im_fun, "func_name"): + name = py_obj.im_fun.func_name + else: + raise JSError("Failed to find function name.") + + func = JS_NewFunction(cx.cx, __function_callback__, 0, 0, NULL, name) + fa = FunctionAdapter(cx, py_obj) + fa.js_obj = JS_GetFunctionObject(func) + + js_function_attach(cx.cx, fa.js_obj, <PyObject*> fa) + + return OBJECT_TO_JSVAL(fa.js_obj) + \ No newline at end of file spidermonkey/jsfunction.pxi @@ -8,7 +8,7 @@ cdef class GC: cdef void run(GC self): JS_GC(self.cx.cx) - cdef void run_mayb(GC self): + cdef void run_maybe(GC self): JS_MaybeGC(self.cx.cx) cdef void add_root(GC self, void* rp): spidermonkey/jsgc.pxi @@ -27,11 +27,11 @@ cdef object js2py_hash(Context cx, jsval v): if not JS_IdToValue(cx.cx, (props.vector)[i], &jskey): raise JSError("Failed to convert dict to JavaScript.") - if js_is_string(jskey): + if js_is_string(cx, jskey): key = js2py_string(cx, jskey) if not JS_GetProperty(cx.cx, hash, key, &jsv): raise JSError("Faield to retrieve textual hash property.") - elif js_is_int(jskey): + elif js_is_int(cx, jskey): key = js2py_int(cx, jskey) if not JS_GetElement(cx.cx, hash, key, &jsv): raise JSError("Failed to retrive numeric hash property.") spidermonkey/jshash.pxi @@ -1,15 +1,26 @@ void js_context_attach(JSContext* cx, PyObject* obj) { - Py_INCREF(obj); + Py_XINCREF(obj); JS_SetContextPrivate(cx, (void*) obj); } +JSBool +js_context_has_data(JSContext* cx) +{ + if(JS_GetContextPrivate(cx) == NULL) + { + return JS_FALSE; + } + + return JS_TRUE; +} + PyObject* js_context_fetch(JSContext* cx) { PyObject* obj = (PyObject*) JS_GetContextPrivate(cx); - Py_INCREF(obj); + Py_XINCREF(obj); return obj; } @@ -22,16 +33,28 @@ js_context_destroy(JSContext* cx) void js_object_attach(JSContext* cx, JSObject* js_obj, PyObject* py_obj) -{ - Py_INCREF(py_obj); +{ + Py_XINCREF(py_obj); JS_SetPrivate(cx, js_obj, (void*) py_obj); } +JSBool +js_object_has_data(JSContext* cx, JSObject* js_obj) +{ + void* data = JS_GetPrivate(cx, js_obj); + if(data == NULL) + { + return JS_FALSE; + } + + return JS_TRUE; +} + PyObject* js_object_fetch(JSContext* cx, JSObject* js_obj) { PyObject* py_obj = (PyObject*) JS_GetPrivate(cx, js_obj); - Py_INCREF(py_obj); + Py_XINCREF(py_obj); return py_obj; } @@ -41,6 +64,60 @@ js_object_destroy(JSContext* cx, JSObject* js_obj) return (PyObject*) JS_GetPrivate(cx, js_obj); } +void +js_function_attach(JSContext* cx, JSObject* js_obj, PyObject* py_obj) +{ + Py_XINCREF(py_obj); + jsval slot = PRIVATE_TO_JSVAL(py_obj); + JS_SetReservedSlot(cx, js_obj, 0, slot); +} + +JSBool +js_function_has_data(JSContext* cx, JSObject* js_obj) +{ + jsval slot; + if(JS_GetReservedSlot(cx, js_obj, 0, &slot) != JS_TRUE) + { + return JS_FALSE; + } + + void* data = JSVAL_TO_PRIVATE(slot); + + if(data == NULL) + { + return JS_FALSE; + } + + return JS_TRUE; +} + +PyObject* +js_function_fetch(JSContext* cx, JSObject* js_obj) +{ + jsval slot; + if(JS_GetReservedSlot(cx, js_obj, 0, &slot) != JS_TRUE) + { + return JS_FALSE; + } + + PyObject* py_obj = (PyObject*) JSVAL_TO_PRIVATE(slot); + Py_XINCREF(py_obj); + return py_obj; +} + +PyObject* +js_function_destroy(JSContext* cx, JSObject* js_obj) +{ + jsval slot; + if(JS_GetReservedSlot(cx, js_obj, 0, &slot) != JS_TRUE) + { + return JS_FALSE; + } + + PyObject* py_obj = (PyObject*) JSVAL_TO_PRIVATE(slot); + return py_obj; +} + static JSClass js_global_class = { "RootObjectClass", @@ -59,5 +136,5 @@ static JSClass js_global_class = JSObject * js_make_global_object(JSContext *cx) { - return JS_NewObject(cx, &global_class, 0, 0); + return JS_NewObject(cx, &js_global_class, 0, 0); } spidermonkey/jshelpers.c @@ -13,4 +13,49 @@ cdef class ObjectAdapter: self.js_obj = NULL self.py_obj = obj + def __repr__(self): + return "<spidermonkey.ObjectAdapter: %r>" % self.py_obj +def js_is_object(Context cx, jsval jsv): + if not JSVAL_IS_OBJECT(jsv): + return False + if not js_object_has_data(cx.cx, JSVAL_TO_OBJECT(jsv)): + return False + return True + +def py_is_object(Context cx, object py_obj): + return not isinstance(py_obj, types.TypeType) + +cdef object js2py_object(Context cx, jsval jsv): + cdef ClassAdapter ca + cdef ObjectAdapter oa + cdef FunctionAdapter fa + + tmp = js_object_fetch(cx.cx, JSVAL_TO_OBJECT(jsv)) + if isinstance(tmp, ClassAdapter): + ca = tmp + return ca.py_obj + elif isinstance(tmp, ObjectAdapter): + oa = tmp + return oa.py_obj + elif isinstance(tmp, FunctionAdapter): + fa = tmp + return fa.py_obj + else: + raise JSError("Failed to unwrap Python object.") + +cdef jsval py2js_object(Context cx, object py_obj, JSObject* parent): + cdef ClassAdapter ca + cdef ObjectAdapter oa + cdef JSObject* js_obj + cdef jsval rval + + ca = cx.install_class(py_obj.__class__) + js_obj = JS_NewObject(cx.cx, ca.js_class, NULL, NULL) + if js_obj == NULL: + raise JSError("Failed to create object.") + oa = ObjectAdapter(cx, ca, None, py_obj) + oa.js_obj = js_obj + js_object_attach(cx.cx, oa.js_obj, <PyObject*> oa) + + return OBJECT_TO_JSVAL(js_obj) spidermonkey/jsobject.pxi @@ -8,6 +8,7 @@ cdef class Runtime: raise JSError("Failed to create JavaScript Runtime.") def __dealloc__(self): + sys.stderr.write("DESTROYING RUNTIME\n") JS_DestroyRuntime(self.rt) def create_context(self, root=None): spidermonkey/jsruntime.pxi @@ -2,6 +2,8 @@ cdef jsval py2js(Context cx, object py_obj, JSObject* parent) except 0: if py_is_void(cx, py_obj): return py2js_void(cx, py_obj, parent) + elif py_is_bool(cx, py_obj): + return py2js_bool(cx, py_obj, parent) elif py_is_int(cx, py_obj): return py2js_int(cx, py_obj, parent) elif py_is_double(cx, py_obj): @@ -12,10 +14,12 @@ cdef jsval py2js(Context cx, object py_obj, JSObject* parent) except 0: return py2js_array(cx, py_obj, parent) elif py_is_hash(cx, py_obj): return py2js_hash(cx, py_obj, parent) + elif py_is_bound_method(cx, py_obj): + return py2js_bound_method(cx, py_obj, parent) elif py_is_function(cx, py_obj): return py2js_function(cx, py_obj, parent) - #elif py_is_object(cx, py_obj): - # return py2js_object(cx, py_obj, parent) + elif py_is_object(cx, py_obj): + return py2js_object(cx, py_obj, parent) #elif py_is_class(cx, py_obj): # return py2js_class(cx, py_obj, parent) else: @@ -24,6 +28,8 @@ cdef jsval py2js(Context cx, object py_obj, JSObject* parent) except 0: cdef object js2py(Context cx, jsval jsv): if js_is_void(cx, jsv): return js2py_void(cx, jsv) + elif js_is_bool(cx, jsv): + return js2py_bool(cx, jsv) elif js_is_int(cx, jsv): return js2py_int(cx, jsv) elif js_is_double(cx, jsv): @@ -32,7 +38,7 @@ cdef object js2py(Context cx, jsval jsv): return js2py_string(cx, jsv) elif js_is_array(cx, jsv): return js2py_array(cx, jsv) - elif js_is_function(cx, jsv): + elif js_is_function(cx, jsv): return js2py_function(cx, jsv) elif js_is_object(cx, jsv): return js2py_object(cx, jsv) spidermonkey/jsvalue.pxi @@ -1,6 +1,6 @@ def js_is_void(Context cx, jsval jsv): - return JSVAL_IS_VOID(jsv) + return JSVAL_IS_VOID(jsv) or jsv == 0 def py_is_void(Context cx, object py_obj): return isinstance(py_obj, (types.NoneType)) @@ -9,4 +9,4 @@ cdef object js2py_void(Context cx, jsval jsv): return None cdef jsval py2js_void(Context cx, object py_obj, JSObject* parent): - return JS_VOID + return JSVAL_VOID spidermonkey/jsvoid.pxi @@ -17,6 +17,7 @@ include "jsfunction.pxi" # Type Conversions include "jsarray.pxi" +include "jsbool.pxi" include "jsdouble.pxi" include "jshash.pxi" include "jsint.pxi" spidermonkey/spidermonkey.pyx ChangeLog README spidermonkey.c spidermonkey.pyx support.c test.py tests/test.py ce3a39c9cf73600539e4b9e1fbca071311b35b97 davisp davisp@davis2318.l3u.neb.com http://github.com/davisp/python-spidermonkey/commit/734bb93c4e923aa5a60d2f323ecb48d87ed24d45 734bb93c4e923aa5a60d2f323ecb48d87ed24d45 2009-01-28T04:03:52-08:00 2009-01-28T04:03:52-08:00 Yeah, bad commit policy. But hey, it works now. 2561947cf9de65b930d0848ee4ee36085a98b886 davisp davisp@davis2318.l3u.neb.com