test/test_require.py @@ -473,6 +473,10 @@ Return the JavaScriptCore library as a CDLL or equivalent.<p> <hr> <h4>Methods</h4> <div style='margin-left:4em'> +<p><code><strong><a name='api.JSContextRef.addBuiltins'>addBuiltins()</a></strong></code> +<div style='margin-left:4em'> +Adds the nitro_pie shell builtin functions to this context.<p> +</div> <p><code><strong><a name='api.JSContextRef.checkScriptSyntax'>checkScriptSyntax(script, sourceURL = None, startingLineNumber = 1)</a></strong></code> <div style='margin-left:4em'> Check the syntax of a string of JavaScript code.<p> @@ -629,6 +633,15 @@ Creates a new JavaScript number value.<p> </ul> </div> +<p><code><strong><a name='api.JSContextRef.makePythonObjectRef'>makePythonObjectRef(pythonValue)</a></strong></code> +<div style='margin-left:4em'> +Creates a new JSObjectRef which holds a Python value.<p> +<p><strong>Returns:</strong> +<ul> +<li><p><strong><code><code><a href='#api.JSValueRef'>JSValueRef</a></code></code></strong> - the value created + +</ul> +</div> <p><code><strong><a name='api.JSContextRef.makeString'>makeString(string)</a></strong></code> <div style='margin-left:4em'> Creates a new JavaScript string value.<p> doc/nitro_pie.html @@ -76,20 +76,36 @@ def _log(message="", args=None): print "%s[%4d]: %s" % (filename, lineNumber, message) -if False: - #------------------------------------------------------------------- - kJSTypeUndefined = 0 - kJSTypeNull = 1 - kJSTypeBoolean = 2 - kJSTypeNumber = 3 - kJSTypeString = 4 - kJSTypeObject = 5 +#-------------------------------------------------------------------- +class RememberedObjects(object): + + index = 1 + remembered = {} + + #---------------------------------------------------------------- + @staticmethod + def remember(obj, finalizer=None): + remembered[index] = (obj, finalizer) + + result = index + index += 1 + return result + + #---------------------------------------------------------------- + @staticmethod + def get(index): + return remembered[index][0] + + #---------------------------------------------------------------- + @staticmethod + def forget(index): + (obj, finalizer) = remembered[index] + + del remembered[index] + + if finalizer: + finalizer(obj) - #------------------------------------------------------------------- - kJSPropertyAttributeNone = 0 - kJSPropertyAttributeReadOnly = 1 << 1 - kJSPropertyAttributeDontEnum = 1 << 2 - kJSPropertyAttributeDontDelete = 1 << 3 #-------------------------------------------------------------------- class JSContextRef(ctypes.c_void_p): @@ -368,6 +384,25 @@ def callbackPrint(context, function, thisObject, args): return _JSValueMakeUndefined(self) + #---------------------------------------------------------------- + def makePythonObjectRef(self, pythonValue): + """Creates a new JSObjectRef which holds a Python value. + + @return (#[JSValueRef]) the value created + """ + JSLibrary._ensureLibrary() + _log("JSContextRef.$f(%s)", (self,)) + + return _JSValueMakeUndefined(self) + + #---------------------------------------------------------------- + def addBuiltins(self): + """Adds the nitro_pie shell builtin functions to this context. + """ + + _register_builtins(self) + + return _JSValueMakeUndefined(self) #-------------------------------------------------------------------- class JSGlobalContextRef(JSContextRef): @@ -1849,6 +1884,42 @@ def _jsfunc_python_exec(context, function, thisObject, args): #------------------------------------------------------------------------------- +require_modules = {} + +def _jsfunc_require(context, function, thisObject, args): + undefined = context.makeUndefined() + + if len(args) == 0: return undefined + + modFileName = args[0].toString(context) + if not os.path.exists(modFileName): + print "Unabled to load module '%s': not found" % modFileName + return undefined + + modFile = open(modFileName) + modFileContents = modFile.read() + modFile.close() + + if modFileName in require_modules: + return require_modules[modFileName] + + module = context.eval("({})") + require_modules[modFileName] = module + + modContext = JSGlobalContextRef.create() + modGlobal = modContext.getGlobalObject() + modGlobal.protect(modContext) + + modGlobal.setProperty(modContext, "exports", module) + + _register_builtins(modContext) + + modContext.eval(modFileContents, None, modFileName) + + return module + + +#------------------------------------------------------------------------------- def _handleJSException(e, context): type = e.value.getType(context) @@ -1883,6 +1954,22 @@ def _handleJSException(e, context): print " %s: %s" % (prop, valStr) print + +#------------------------------------------------------------------------------- +def _register_builtins(context): + globalObject = context.getGlobalObject() + globalObject.protect(context) + + function = context.makeFunction( "print", _jsfunc_print) + globalObject.setProperty(context, "print", function) + + function = context.makeFunction( "python_exec", _jsfunc_python_exec) + globalObject.setProperty(context, "python_exec", function) + + function = context.makeFunction( "require", _jsfunc_require) + globalObject.setProperty(context, "require", function) + + globalObject.unprotect(context) #------------------------------------------------------------------------------- def _main(): @@ -1901,16 +1988,11 @@ def _main(): context = JSGlobalContextRef.create() globalObject = context.getGlobalObject() - globalObject.protect(context) #--------------------------------------------------------------- # add builtins #--------------------------------------------------------------- - function = context.makeFunction( "print", _jsfunc_print) - globalObject.setProperty(context, "print", function) - - function = context.makeFunction( "python_exec", _jsfunc_python_exec) - globalObject.setProperty(context, "python_exec", function) + _register_builtins(context) #--------------------------------------------------------------- # add arguments lib/nitro_pie.py @@ -53,6 +53,7 @@ test_prototype test_tos test_iss test_shell +test_require """.split() modules = [__import__(moduleName) for moduleName in moduleNames] test/test_all.py @@ -26,8 +26,14 @@ #------------------------------------------------------------------- import os +import sys import inspect +lib_path = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "../lib")) +if lib_path not in sys.path: sys.path.insert(0, lib_path) + +from nitro_pie import * + #------------------------------------------------------------------- # logger #------------------------------------------------------------------- @@ -64,3 +70,40 @@ def get_js_props(jsObject): result[name] = val return result + +#------------------------------------------------------------------- +def dump_exception(e, context): + + type = e.value.getType(context) + if type != JSValueRef.kJSTypeObject: + print "Exception thrown: value=%s" % e.value.toString(context) + return + + e = e.value.asJSObjectRef(context) + + def getDefault(context, obj, property, default): + if not obj.hasProperty(context, property): + return default + + val = obj.getProperty(context, property) + return val.toString(context) + + name = getDefault(context, e, "name", "???") + message = getDefault(context, e, "message", "???") + sourceURL = getDefault(context, e, "sourceURL", "???") + line = getDefault(context, e, "line", "???") + + print "Exception thrown: %s: %s: at %s[%s]" % (name, message, sourceURL, line) + + props = e.getPropertyNames(context) + knownProps = "name message sourceURL line".split() + for prop in props: + if prop in knownProps: continue + + val = e.getProperty(context, prop) + valStr = val.toString(context) + + print " %s: %s" % (prop, valStr) + + print + \ No newline at end of file test/test_utils.py 1fcea9c7a4ed66a9e98d796929bdf4b78dc527aa Patrick Mueller pmuellr@yahoo.com http://github.com/pmuellr/nitro_pie/commit/489b4237b05d80013cddfbca8957c6116a4f4f82 489b4237b05d80013cddfbca8957c6116a4f4f82 2009-05-15T08:37:22-07:00 2009-05-15T08:37:22-07:00 added primordial require() with passing tests 824c320f861828b8566330f48e543e28b99759f2 Patrick Mueller pmuellr@yahoo.com