pymonkey: context.c annotate

annotate context.c @ 60:e557d84318a7

Added a gc() method to the context object which performs garbage collection.

author	Atul Varma <varmaa@toolness.com>
date	Sat, 25 Jul 2009 16:10:21 -0700
parents	bc4263c6ae82
children	fb7e11dec538

rev	line source
48 bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	1 /* *** BEGIN LICENSE BLOCK ***
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	3 *
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	4 * The contents of this file are subject to the Mozilla Public License Version
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	5 * 1.1 (the "License"); you may not use this file except in compliance with
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	6 * the License. You may obtain a copy of the License at
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	7 * http://www.mozilla.org/MPL/
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	8 *
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	9 * Software distributed under the License is distributed on an "AS IS" basis,
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	11 * for the specific language governing rights and limitations under the
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	12 * License.
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	13 *
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	14 * The Original Code is Pymonkey.
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	15 *
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	16 * The Initial Developer of the Original Code is Mozilla.
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	17 * Portions created by the Initial Developer are Copyright (C) 2007
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	18 * the Initial Developer. All Rights Reserved.
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	19 *
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	20 * Contributor(s):
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	21 * Atul Varma <atul@mozilla.com>
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	22 *
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	23 * Alternatively, the contents of this file may be used under the terms of
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	24 * either the GNU General Public License Version 2 or later (the "GPL"), or
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	25 * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	26 * in which case the provisions of the GPL or the LGPL are applicable instead
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	27 * of those above. If you wish to allow use of your version of this file only
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	28 * under the terms of either the GPL or the LGPL, and not to allow others to
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	29 * use your version of this file under the terms of the MPL, indicate your
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	30 * decision by deleting the provisions above and replace them with the notice
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	31 * and other provisions required by the GPL or the LGPL. If you do not delete
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	32 * the provisions above, a recipient may use your version of this file under
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	33 * the terms of any one of the MPL, the GPL or the LGPL.
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	34 *
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	35 * *** END LICENSE BLOCK *** */
bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	36
11 551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	37 #include "context.h"
13 ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	38 #include "object.h"
37 d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	39 #include "function.h"
13 ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	40 #include "utils.h"
11 551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	41
48 bc4263c6ae82 Added license blocks to all .c/.h files. Atul Varma <varmaa@toolness.com> parents: 47 diff changeset	42 // This is the default JSErrorReporter for pymonkey-owned JS contexts.
46 a0f677cfc679 Added basic functionality for passing useful exceptions between Python and JS code. Atul Varma <varmaa@toolness.com> parents: 44 diff changeset	43 static void
a0f677cfc679 Added basic functionality for passing useful exceptions between Python and JS code. Atul Varma <varmaa@toolness.com> parents: 44 diff changeset	44 PYM_reportError(JSContext cx, const char message, JSErrorReport *report)
a0f677cfc679 Added basic functionality for passing useful exceptions between Python and JS code. Atul Varma <varmaa@toolness.com> parents: 44 diff changeset	45 {
47 3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	46 // Convert JS warnings into Python warnings.
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	47 if (JSREPORT_IS_WARNING(report->flags)) {
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	48 if (report->filename)
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	49 PyErr_WarnExplicit(NULL, message, report->filename, report->lineno,
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	50 NULL, NULL);
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	51 else
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	52 PyErr_Warn(NULL, message);
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	53 } else
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	54 // TODO: Not sure if this will ever get called, but we should know
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	55 // if it is.
3f4982759e55 Converting JS exceptions into Python exceptions is now doable, albeit not yet implemented, thanks to the discovery of JSOPTION_DONT_REPORT_UNCAUGHT. Also, JS warnings are now converted into Python warnings. Atul Varma <varmaa@toolness.com> parents: 46 diff changeset	56 PyErr_Warn(NULL, "A JS error was reported.");
46 a0f677cfc679 Added basic functionality for passing useful exceptions between Python and JS code. Atul Varma <varmaa@toolness.com> parents: 44 diff changeset	57 }
a0f677cfc679 Added basic functionality for passing useful exceptions between Python and JS code. Atul Varma <varmaa@toolness.com> parents: 44 diff changeset	58
11 551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	59 static void
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	60 PYM_JSContextDealloc(PYM_JSContextObject *self)
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	61 {
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	62 if (self->cx) {
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	63 JS_DestroyContext(self->cx);
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	64 self->cx = NULL;
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	65 }
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	66
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	67 Py_DECREF(self->runtime);
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	68 self->runtime = NULL;
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	69
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	70 self->ob_type->tp_free((PyObject *) self);
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	71 }
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	72
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	73 static PyObject *
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	74 PYM_getRuntime(PYM_JSContextObject self, PyObject args)
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	75 {
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	76 Py_INCREF(self->runtime);
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	77 return (PyObject *) self->runtime;
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	78 }
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	79
13 ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	80 static PyObject *
ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	81 PYM_newObject(PYM_JSContextObject self, PyObject args)
ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	82 {
18 f3223debd70b Refactoring; moved PYM_JSObject creation code into a new public function in object.c. Atul Varma <varmaa@toolness.com> parents: 17 diff changeset	83 JSObject *obj = JS_NewObject(self->cx, &PYM_JS_ObjectClass, NULL, NULL);
f3223debd70b Refactoring; moved PYM_JSObject creation code into a new public function in object.c. Atul Varma <varmaa@toolness.com> parents: 17 diff changeset	84 if (obj == NULL) {
13 ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	85 PyErr_SetString(PYM_error, "JS_NewObject() failed");
ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	86 return NULL;
ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	87 }
ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	88
19 fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	89 // If this fails, we don't need to worry about cleaning up
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	90 // obj because it'll get cleaned up at the next GC.
37 d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	91 return (PyObject *) PYM_newJSObject(self, obj, NULL);
13 ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	92 }
ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	93
14 9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	94 static PyObject *
17 0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	95 PYM_getProperty(PYM_JSContextObject self, PyObject args)
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	96 {
29 608d086d12e3 Added a new PYM_pyObjectToJsval() function that only supports unicode for the moment. Also, whereever we're assuming that Py_UNICODE is UCS-2, we're surrounding such code with #ifndef Py_UNICODE_WIDE. Atul Varma <varmaa@toolness.com> parents: 27 diff changeset	97 #ifndef Py_UNICODE_WIDE
17 0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	98 PYM_JSObject *object;
27 21045074139f Based on my new understanding of JSString /jschar thanks to folks on #jsapi, I've removed the requirement that SpiderMonkey be in UTF-8 mode to translate strings between Python and SpiderMonkey. Atul Varma <varmaa@toolness.com> parents: 24 diff changeset	99 Py_UNICODE *string;
17 0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	100
27 21045074139f Based on my new understanding of JSString /jschar thanks to folks on #jsapi, I've removed the requirement that SpiderMonkey be in UTF-8 mode to translate strings between Python and SpiderMonkey. Atul Varma <varmaa@toolness.com> parents: 24 diff changeset	101 if (!PyArg_ParseTuple(args, "O!u", &PYM_JSObjectType, &object,
21045074139f Based on my new understanding of JSString /jschar thanks to folks on #jsapi, I've removed the requirement that SpiderMonkey be in UTF-8 mode to translate strings between Python and SpiderMonkey. Atul Varma <varmaa@toolness.com> parents: 24 diff changeset	102 &string))
17 0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	103 return NULL;
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	104
27 21045074139f Based on my new understanding of JSString /jschar thanks to folks on #jsapi, I've removed the requirement that SpiderMonkey be in UTF-8 mode to translate strings between Python and SpiderMonkey. Atul Varma <varmaa@toolness.com> parents: 24 diff changeset	105 JSString *jsString = JS_NewUCStringCopyZ(self->cx,
21045074139f Based on my new understanding of JSString /jschar thanks to folks on #jsapi, I've removed the requirement that SpiderMonkey be in UTF-8 mode to translate strings between Python and SpiderMonkey. Atul Varma <varmaa@toolness.com> parents: 24 diff changeset	106 (const jschar *) string);
17 0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	107 if (jsString == NULL) {
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	108 PyErr_SetString(PYM_error, "JS_NewStringCopyZ() failed");
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	109 return NULL;
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	110 }
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	111
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	112 jsval val;
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	113 if (!JS_GetUCProperty(self->cx, object->obj,
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	114 JS_GetStringChars(jsString),
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	115 JS_GetStringLength(jsString), &val)) {
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	116 // TODO: Get the actual JS exception. Any exception that exists
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	117 // here will probably still be pending on the JS context.
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	118 PyErr_SetString(PYM_error, "Getting property failed.");
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	119 return NULL;
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	120 }
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	121
21 fc04e5f1c675 Changed object constructor to take a context instead of a runtime. Atul Varma <varmaa@toolness.com> parents: 20 diff changeset	122 return PYM_jsvalToPyObject(self, val);
29 608d086d12e3 Added a new PYM_pyObjectToJsval() function that only supports unicode for the moment. Also, whereever we're assuming that Py_UNICODE is UCS-2, we're surrounding such code with #ifndef Py_UNICODE_WIDE. Atul Varma <varmaa@toolness.com> parents: 27 diff changeset	123 #else
608d086d12e3 Added a new PYM_pyObjectToJsval() function that only supports unicode for the moment. Also, whereever we're assuming that Py_UNICODE is UCS-2, we're surrounding such code with #ifndef Py_UNICODE_WIDE. Atul Varma <varmaa@toolness.com> parents: 27 diff changeset	124 PyErr_SetString(PyExc_NotImplementedError,
608d086d12e3 Added a new PYM_pyObjectToJsval() function that only supports unicode for the moment. Also, whereever we're assuming that Py_UNICODE is UCS-2, we're surrounding such code with #ifndef Py_UNICODE_WIDE. Atul Varma <varmaa@toolness.com> parents: 27 diff changeset	125 "This function is not yet implemented for wide "
608d086d12e3 Added a new PYM_pyObjectToJsval() function that only supports unicode for the moment. Also, whereever we're assuming that Py_UNICODE is UCS-2, we're surrounding such code with #ifndef Py_UNICODE_WIDE. Atul Varma <varmaa@toolness.com> parents: 27 diff changeset	126 "unicode builds of Python.");
608d086d12e3 Added a new PYM_pyObjectToJsval() function that only supports unicode for the moment. Also, whereever we're assuming that Py_UNICODE is UCS-2, we're surrounding such code with #ifndef Py_UNICODE_WIDE. Atul Varma <varmaa@toolness.com> parents: 27 diff changeset	127 return NULL;
608d086d12e3 Added a new PYM_pyObjectToJsval() function that only supports unicode for the moment. Also, whereever we're assuming that Py_UNICODE is UCS-2, we're surrounding such code with #ifndef Py_UNICODE_WIDE. Atul Varma <varmaa@toolness.com> parents: 27 diff changeset	128 #endif
17 0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	129 }
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	130
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	131 static PyObject *
60 e557d84318a7 Added a gc() method to the context object which performs garbage collection. Atul Varma <varmaa@toolness.com> parents: 48 diff changeset	132 PYM_gc(PYM_JSContextObject self, PyObject args)
e557d84318a7 Added a gc() method to the context object which performs garbage collection. Atul Varma <varmaa@toolness.com> parents: 48 diff changeset	133 {
e557d84318a7 Added a gc() method to the context object which performs garbage collection. Atul Varma <varmaa@toolness.com> parents: 48 diff changeset	134 JS_GC(self->cx);
e557d84318a7 Added a gc() method to the context object which performs garbage collection. Atul Varma <varmaa@toolness.com> parents: 48 diff changeset	135 Py_RETURN_NONE;
e557d84318a7 Added a gc() method to the context object which performs garbage collection. Atul Varma <varmaa@toolness.com> parents: 48 diff changeset	136 }
e557d84318a7 Added a gc() method to the context object which performs garbage collection. Atul Varma <varmaa@toolness.com> parents: 48 diff changeset	137
e557d84318a7 Added a gc() method to the context object which performs garbage collection. Atul Varma <varmaa@toolness.com> parents: 48 diff changeset	138 static PyObject *
14 9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	139 PYM_initStandardClasses(PYM_JSContextObject self, PyObject args)
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	140 {
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	141 PYM_JSObject *object;
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	142
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	143 if (!PyArg_ParseTuple(args, "O!", &PYM_JSObjectType, &object))
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	144 return NULL;
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	145
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	146 if (!JS_InitStandardClasses(self->cx, object->obj)) {
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	147 PyErr_SetString(PYM_error, "JS_InitStandardClasses() failed");
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	148 return NULL;
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	149 }
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	150
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	151 Py_RETURN_NONE;
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	152 }
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	153
16 532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	154 static PyObject *
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	155 PYM_evaluateScript(PYM_JSContextObject self, PyObject args)
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	156 {
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	157 PYM_JSObject *object;
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	158 const char *source;
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	159 int sourceLen;
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	160 const char *filename;
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	161 int lineNo;
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	162
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	163 if (!PyArg_ParseTuple(args, "O!s#si", &PYM_JSObjectType, &object,
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	164 &source, &sourceLen, &filename, &lineNo))
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	165 return NULL;
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	166
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	167 JS_BeginRequest(self->cx);
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	168
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	169 jsval rval;
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	170 if (!JS_EvaluateScript(self->cx, object->obj, source, sourceLen,
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	171 filename, lineNo, &rval)) {
46 a0f677cfc679 Added basic functionality for passing useful exceptions between Python and JS code. Atul Varma <varmaa@toolness.com> parents: 44 diff changeset	172 PYM_jsExceptionToPython(self);
16 532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	173 JS_EndRequest(self->cx);
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	174 return NULL;
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	175 }
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	176
21 fc04e5f1c675 Changed object constructor to take a context instead of a runtime. Atul Varma <varmaa@toolness.com> parents: 20 diff changeset	177 PyObject *pyRval = PYM_jsvalToPyObject(self, rval);
16 532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	178
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	179 JS_EndRequest(self->cx);
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	180
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	181 return pyRval;
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	182 }
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	183
37 d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	184 static PyObject *
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	185 PYM_defineProperty(PYM_JSContextObject self, PyObject args)
24 74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	186 {
37 d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	187 PYM_JSObject *object;
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	188 PyObject *value;
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	189 const char *name;
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	190
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	191 if (!PyArg_ParseTuple(args, "O!sO", &PYM_JSObjectType, &object,
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	192 &name, &value))
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	193 return NULL;
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	194
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	195 jsval jsValue;
24 74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	196
44 0b9a316ce4ef Changed function signature of PYM_pyObjectToJsval() to be consistent w/ the rest of the API. Atul Varma <varmaa@toolness.com> parents: 43 diff changeset	197 if (PYM_pyObjectToJsval(self, value, &jsValue) == -1)
37 d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	198 return NULL;
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	199
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	200 // TODO: Support unicode naming.
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	201 if (!JS_DefineProperty(self->cx, object->obj, name, jsValue,
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	202 NULL, NULL, JSPROP_ENUMERATE)) {
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	203 // TODO: There's probably an exception pending on self->cx,
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	204 // what should we do about it?
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	205 PyErr_SetString(PYM_error, "JS_DefineProperty() failed");
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	206 return NULL;
24 74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	207 }
74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	208
37 d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	209 Py_RETURN_NONE;
24 74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	210 }
74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	211
74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	212 static PyObject *
41 71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	213 PYM_callFunction(PYM_JSContextObject self, PyObject args)
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	214 {
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	215 PYM_JSObject *obj;
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	216 PYM_JSFunction *fun;
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	217 PyObject *funcArgs;
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	218
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	219 if (!PyArg_ParseTuple(args, "O!O!O!", &PYM_JSObjectType, &obj,
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	220 &PYM_JSFunctionType, &fun,
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	221 &PyTuple_Type, &funcArgs))
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	222 return NULL;
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	223
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	224 uintN argc = PyTuple_Size(funcArgs);
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	225 jsval argv[argc];
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	226 jsval *currArg = argv;
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	227
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	228 for (unsigned int i = 0; i < argc; i++) {
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	229 PyObject *item = PyTuple_GET_ITEM(funcArgs, i);
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	230 if (item == NULL \|\|
44 0b9a316ce4ef Changed function signature of PYM_pyObjectToJsval() to be consistent w/ the rest of the API. Atul Varma <varmaa@toolness.com> parents: 43 diff changeset	231 PYM_pyObjectToJsval(self, item, currArg) == -1)
41 71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	232 return NULL;
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	233 currArg++;
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	234 }
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	235
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	236 jsval rval;
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	237
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	238 // TODO: This assumes that a JSFunction * is actually a subclass of
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	239 // a JSObject *, which may or may not be regarded as an implementation
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	240 // detail.
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	241 if (!JS_CallFunction(self->cx, obj->obj, (JSFunction *) fun->base.obj,
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	242 argc, argv, &rval)) {
46 a0f677cfc679 Added basic functionality for passing useful exceptions between Python and JS code. Atul Varma <varmaa@toolness.com> parents: 44 diff changeset	243 PYM_jsExceptionToPython(self);
41 71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	244 return NULL;
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	245 }
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	246
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	247 return PYM_jsvalToPyObject(self, rval);
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	248 }
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	249
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	250 static PyObject *
37 d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	251 PYM_newFunction(PYM_JSContextObject self, PyObject args)
24 74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	252 {
74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	253 PyObject *callable;
74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	254 const char *name;
74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	255
37 d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	256 if (!PyArg_ParseTuple(args, "Os", &callable, &name))
24 74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	257 return NULL;
74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	258
40 8a7abd0bb48d Renamed PYM_newJSFunction() to PYM_newJSFunctionFromCallable(). PYM_newJSObject() now returns objects of type PYM_JSFunctionType as needed. Atul Varma <varmaa@toolness.com> parents: 38 diff changeset	259 return (PyObject *) PYM_newJSFunctionFromCallable(self, callable, name);
24 74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	260 }
74b7ad049542 Added very primitive support for calling python functions from JS. Atul Varma <varmaa@toolness.com> parents: 21 diff changeset	261
11 551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	262 static PyMethodDef PYM_JSContextMethods[] = {
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	263 {"get_runtime", (PyCFunction) PYM_getRuntime, METH_VARARGS,
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	264 "Get the JavaScript runtime associated with this context."},
13 ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	265 {"new_object", (PyCFunction) PYM_newObject, METH_VARARGS,
ca17531e8c81 Added an object class. Atul Varma <varmaa@toolness.com> parents: 12 diff changeset	266 "Create a new JavaScript object."},
14 9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	267 {"init_standard_classes",
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	268 (PyCFunction) PYM_initStandardClasses, METH_VARARGS,
9edcdb4ab12d added an init_standard_classes() method to context objects. Atul Varma <varmaa@toolness.com> parents: 13 diff changeset	269 "Add standard classes and functions to the given object."},
16 532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	270 {"evaluate_script",
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	271 (PyCFunction) PYM_evaluateScript, METH_VARARGS,
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	272 "Evaluate the given JavaScript code in the context of the given "
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	273 "global object, using the given filename"
532b7ddca616 Created a new context.evaluate_script() function, replacing pymonkey.evaluate(). Separated out one of the big unit tests into several. Atul Varma <varmaa@toolness.com> parents: 15 diff changeset	274 "and line number information."},
41 71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	275 {"call_function",
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	276 (PyCFunction) PYM_callFunction, METH_VARARGS,
71ab5e977dd3 Added a context.call_function() method. Atul Varma <varmaa@toolness.com> parents: 40 diff changeset	277 "Calls a JS function."},
37 d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	278 {"new_function",
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	279 (PyCFunction) PYM_newFunction, METH_VARARGS,
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	280 "Creates a new function callable from JS."},
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	281 {"define_property",
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	282 (PyCFunction) PYM_defineProperty, METH_VARARGS,
d4efcbb06964 Added a new PYM_JSFunction type, PYM_JSContext.define_property(), and PYM_JSContext.new_function(). Also fixed a memory leak. Atul Varma <varmaa@toolness.com> parents: 33 diff changeset	283 "Defines a property on an object."},
17 0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	284 {"get_property", (PyCFunction) PYM_getProperty, METH_VARARGS,
0812422ec99e Added a context.get_property() method. Atul Varma <varmaa@toolness.com> parents: 16 diff changeset	285 "Gets the given property for the given JavaScript object."},
60 e557d84318a7 Added a gc() method to the context object which performs garbage collection. Atul Varma <varmaa@toolness.com> parents: 48 diff changeset	286 {"gc", (PyCFunction) PYM_gc, METH_VARARGS,
e557d84318a7 Added a gc() method to the context object which performs garbage collection. Atul Varma <varmaa@toolness.com> parents: 48 diff changeset	287 "Performs garbage collection on the context's runtime."},
11 551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	288 {NULL, NULL, 0, NULL}
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	289 };
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	290
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	291 PyTypeObject PYM_JSContextType = {
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	292 PyObject_HEAD_INIT(NULL)
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	293 0, /ob_size/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	294 "pymonkey.Context", /tp_name/
12 6d95cfaa1e0b Fixed a code typo. Atul Varma <varmaa@toolness.com> parents: 11 diff changeset	295 sizeof(PYM_JSContextObject), /tp_basicsize/
11 551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	296 0, /tp_itemsize/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	297 /tp_dealloc/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	298 (destructor) PYM_JSContextDealloc,
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	299 0, /tp_print/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	300 0, /tp_getattr/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	301 0, /tp_setattr/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	302 0, /tp_compare/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	303 0, /tp_repr/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	304 0, /tp_as_number/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	305 0, /tp_as_sequence/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	306 0, /tp_as_mapping/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	307 0, /tp_hash /
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	308 0, /tp_call/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	309 0, /tp_str/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	310 0, /tp_getattro/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	311 0, /tp_setattro/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	312 0, /tp_as_buffer/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	313 Py_TPFLAGS_DEFAULT, /tp_flags/
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	314 /* tp_doc */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	315 "JavaScript Context.",
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	316 0, /* tp_traverse */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	317 0, /* tp_clear */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	318 0, /* tp_richcompare */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	319 0, /* tp_weaklistoffset */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	320 0, /* tp_iter */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	321 0, /* tp_iternext */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	322 PYM_JSContextMethods, /* tp_methods */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	323 0, /* tp_members */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	324 0, /* tp_getset */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	325 0, /* tp_base */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	326 0, /* tp_dict */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	327 0, /* tp_descr_get */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	328 0, /* tp_descr_set */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	329 0, /* tp_dictoffset */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	330 0, /* tp_init */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	331 0, /* tp_alloc */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	332 0, /* tp_new */
551ba05fe6ad factored out Runtime, Context, and utils into separate files. Atul Varma <varmaa@toolness.com> parents: diff changeset	333 };
19 fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	334
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	335 extern PYM_JSContextObject *
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	336 PYM_newJSContextObject(PYM_JSRuntimeObject runtime, JSContext cx)
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	337 {
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	338 PYM_JSContextObject *context = PyObject_New(PYM_JSContextObject,
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	339 &PYM_JSContextType);
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	340 if (context == NULL)
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	341 return NULL;
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	342
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	343 context->runtime = runtime;
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	344 Py_INCREF(runtime);
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	345
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	346 context->cx = cx;
43 5727675b1bcb JS-wrapped python functions now take a context object as their first parameter. Atul Varma <varmaa@toolness.com> parents: 42 diff changeset	347 JS_SetContextPrivate(cx, context);
46 a0f677cfc679 Added basic functionality for passing useful exceptions between Python and JS code. Atul Varma <varmaa@toolness.com> parents: 44 diff changeset	348 JS_SetErrorReporter(cx, PYM_reportError);
19 fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	349
38 6cd870a2b81e If the JS engine supports GC zeal setting, we enable it automatically to help find any memory management bugs. Atul Varma <varmaa@toolness.com> parents: 37 diff changeset	350 #ifdef JS_GC_ZEAL
6cd870a2b81e If the JS engine supports GC zeal setting, we enable it automatically to help find any memory management bugs. Atul Varma <varmaa@toolness.com> parents: 37 diff changeset	351 // TODO: Consider exposing JS_SetGCZeal() to Python instead of
6cd870a2b81e If the JS engine supports GC zeal setting, we enable it automatically to help find any memory management bugs. Atul Varma <varmaa@toolness.com> parents: 37 diff changeset	352 // hard-coding it here.
6cd870a2b81e If the JS engine supports GC zeal setting, we enable it automatically to help find any memory management bugs. Atul Varma <varmaa@toolness.com> parents: 37 diff changeset	353 JS_SetGCZeal(cx, 2);
6cd870a2b81e If the JS engine supports GC zeal setting, we enable it automatically to help find any memory management bugs. Atul Varma <varmaa@toolness.com> parents: 37 diff changeset	354 #endif
6cd870a2b81e If the JS engine supports GC zeal setting, we enable it automatically to help find any memory management bugs. Atul Varma <varmaa@toolness.com> parents: 37 diff changeset	355
19 fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	356 return context;
fbb9a61fa030 Moved context creation code into its own public function in context.c. Atul Varma <varmaa@toolness.com> parents: 18 diff changeset	357 }

Mercurial > pymonkey

annotate context.c @ 60:e557d84318a7