Mercurial > pymonkey

diff object.c @ 37:d4efcbb06964

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak.
author Atul Varma <varmaa@toolness.com>
date Thu, 02 Jul 2009 22:42:31 -0700
parents 951ad1b15587
children 8a7abd0bb48d
line wrap: on
line diff
--- a/object.c	Thu Jul 02 15:29:07 2009 -0700
+++ b/object.c	Thu Jul 02 22:42:31 2009 -0700
@@ -27,6 +27,8 @@
     Py_DECREF(self->runtime);
     self->runtime = NULL;
   }
+
+  self->ob_type->tp_free((PyObject *) self);
 }
 
 PyTypeObject PYM_JSObjectType = {
@@ -51,7 +53,8 @@
   0,                           /*tp_getattro*/
   0,                           /*tp_setattro*/
   0,                           /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT,          /*tp_flags*/
+  /*tp_flags*/
+  Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
   /* tp_doc */
   "JavaScript Object.",
   0,		               /* tp_traverse */
@@ -74,7 +77,8 @@
 };
 
 PYM_JSObject *PYM_newJSObject(PYM_JSContextObject *context,
-                              JSObject *obj) {
+                              JSObject *obj,
+                              PYM_JSObject *subclass) {
   jsid uniqueId;
   if (!JS_GetObjectId(context->cx, obj, &uniqueId)) {
     PyErr_SetString(PYM_error, "JS_GetObjectId() failed");
@@ -93,8 +97,14 @@
     return (PYM_JSObject *) cached->value;
   }
 
-  PYM_JSObject *object = PyObject_New(PYM_JSObject,
-                                      &PYM_JSObjectType);
+  PYM_JSObject *object;
+
+  if (subclass)
+    object = subclass;
+  else
+    object = PyObject_New(PYM_JSObject,
+                          &PYM_JSObjectType);
+
   if (object == NULL)
     return NULL;