From fijal at codespeak.net Mon Jan 1 11:51:11 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 11:51:11 +0100 (CET)
Subject: [pypy-svn] r36084 - pypy/dist/pypy/doc/js
Message-ID: <20070101105111.6C6351007E@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 11:51:09 2007
New Revision: 36084
Modified:
pypy/dist/pypy/doc/js/webapps_with_pypy.txt
Log:
* Added important sentence (what is rpython)
* Reworded CPython/Python
Modified: pypy/dist/pypy/doc/js/webapps_with_pypy.txt
==============================================================================
--- pypy/dist/pypy/doc/js/webapps_with_pypy.txt (original)
+++ pypy/dist/pypy/doc/js/webapps_with_pypy.txt Mon Jan 1 11:51:09 2007
@@ -26,7 +26,9 @@
JavaScript code. Unlike other libraries that perform similar functionality,
PyPy really interprets the code, and produces 'lower level' JavaScript code,
so it implements Python core language features like list comprehensions, and
-really behaves like Python (it's not Python syntax with JS semantics).
+really behaves like Python (it's not Python syntax with JS semantics).
+This particulary means that when a program is in RPython, you can run it
+on top of Python interpreter with the same results as translated to JS version.
However, mostly for demonstration purposes, some other interesting code is
available in the PyPy code package that may help developing web apps. The most
@@ -52,7 +54,7 @@
A quick overview of the (main) layers of code in the application we're going
to write:
- * HTTP server implementation - 'normal' (C-)Python code
+ * HTTP server implementation - 'normal' Python code
the web server code, the code that handles dealing with the HTTP API and
dispatching to application code is written in 'normal' Python code, and is
From fijal at codespeak.net Mon Jan 1 11:55:42 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 11:55:42 +0100 (CET)
Subject: [pypy-svn] r36085 - pypy/dist/pypy/doc/js
Message-ID: <20070101105542.73B061007E@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 11:55:40 2007
New Revision: 36085
Modified:
pypy/dist/pypy/doc/js/webapps_with_pypy.txt
Log:
Added link.
Modified: pypy/dist/pypy/doc/js/webapps_with_pypy.txt
==============================================================================
--- pypy/dist/pypy/doc/js/webapps_with_pypy.txt (original)
+++ pypy/dist/pypy/doc/js/webapps_with_pypy.txt Mon Jan 1 11:55:40 2007
@@ -7,7 +7,7 @@
PyPy is a platform that is very versatile, and provides almost endless
possibilities. One of the features that is currently already available is
-that of translating RPython (the 'restricted Python' subset) to JavaScript.
+that of translating `RPython`_ (the 'restricted Python' subset) to JavaScript.
This specific feature can make the life of a developer of web applications that
use client-side logic a lot easier, although there are certain hurdles to take.
@@ -89,3 +89,4 @@
XXX hands-on guide to writing guestbook or something
+.. _`RPython`: ../coding-guide.html#restricted-python
\ No newline at end of file
From fijal at codespeak.net Mon Jan 1 11:58:26 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 11:58:26 +0100 (CET)
Subject: [pypy-svn] r36086 - pypy/dist/pypy/lib/distributed/test
Message-ID: <20070101105826.190B21007E@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 11:58:24 2007
New Revision: 36086
Added:
pypy/dist/pypy/lib/distributed/test/
Log:
Added test directory
From fijal at codespeak.net Mon Jan 1 11:59:04 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 11:59:04 +0100 (CET)
Subject: [pypy-svn] r36087 - in pypy/dist/pypy/lib: distributed/test test2
Message-ID: <20070101105904.D5C7A1007E@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 11:59:03 2007
New Revision: 36087
Added:
pypy/dist/pypy/lib/distributed/test/test_distributed.py
- copied unchanged from r36076, pypy/dist/pypy/lib/test2/test_distributed.py
Removed:
pypy/dist/pypy/lib/test2/test_distributed.py
Log:
Moved tests from deprecated directory
From fijal at codespeak.net Mon Jan 1 12:51:53 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 12:51:53 +0100 (CET)
Subject: [pypy-svn] r36088 - in pypy/dist/pypy/translator/js/modules: . test
Message-ID: <20070101115153.825511007F@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 12:51:51 2007
New Revision: 36088
Removed:
pypy/dist/pypy/translator/js/modules/bltns.py
pypy/dist/pypy/translator/js/modules/test/test_xmlhttp.py
pypy/dist/pypy/translator/js/modules/xmlhttp.py
Log:
Removed deprecated files.
From fijal at codespeak.net Mon Jan 1 14:52:58 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 14:52:58 +0100 (CET)
Subject: [pypy-svn] r36091 - pypy/dist/pypy/translator/js/doc
Message-ID: <20070101135258.E2ECA1007F@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 14:52:57 2007
New Revision: 36091
Removed:
pypy/dist/pypy/translator/js/doc/
Log:
Removed unused dir.
From fijal at codespeak.net Mon Jan 1 15:27:58 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 15:27:58 +0100 (CET)
Subject: [pypy-svn] r36092 - in pypy/dist/pypy/translator/js/examples: . test
Message-ID: <20070101142758.AF94A1007F@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 15:27:57 2007
New Revision: 36092
Modified:
pypy/dist/pypy/translator/js/examples/server.py
pypy/dist/pypy/translator/js/examples/test/test_server.py
Log:
Add a test and not fork by default.
Modified: pypy/dist/pypy/translator/js/examples/server.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/server.py (original)
+++ pypy/dist/pypy/translator/js/examples/server.py Mon Jan 1 15:27:57 2007
@@ -98,10 +98,10 @@
self.end_headers()
self.wfile.write(data)
-def start_server(server_address = ('', 8000), handler=TestHandler, start_new=True):
+def start_server(server_address = ('', 8000), handler=TestHandler, fork=False):
httpd = HTTPServer(server_address, handler)
- if start_new:
+ if fork:
import thread
thread.start_new_thread(httpd.serve_forever, ())
print "Server started, listening on %s" % (server_address,)
Modified: pypy/dist/pypy/translator/js/examples/test/test_server.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/test/test_server.py (original)
+++ pypy/dist/pypy/translator/js/examples/test/test_server.py Mon Jan 1 15:27:57 2007
@@ -17,3 +17,7 @@
thread.start_new_thread(httpd.serve_forever, ())
assert URLopener().open("http://127.0.0.1:21210/index").read() == "xxx"
+def test_own_startup():
+ server.start_server(server_address=('127.0.0.1', 21211),
+ handler=Handler, fork=True)
+ assert URLopener().open("http://127.0.0.1:21210/index").read() == "xxx"
From fijal at codespeak.net Mon Jan 1 15:44:33 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 15:44:33 +0100 (CET)
Subject: [pypy-svn] r36094 - in pypy/dist/pypy/translator/js: . test
Message-ID: <20070101144433.0D5501007F@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 15:44:31 2007
New Revision: 36094
Modified:
pypy/dist/pypy/translator/js/main.py
pypy/dist/pypy/translator/js/test/test_main.py
Log:
Added possibility not to specify module (caller module) and a test.
Modified: pypy/dist/pypy/translator/js/main.py
==============================================================================
--- pypy/dist/pypy/translator/js/main.py (original)
+++ pypy/dist/pypy/translator/js/main.py Mon Jan 1 15:44:31 2007
@@ -113,6 +113,15 @@
return retval
def rpython2javascript(mod, function_names, jsconfig=None, use_pdb=True):
+ if isinstance(function_names, str):
+ function_names = [function_names]
+ # avoid confusion
+ if mod is None:
+ # this means actual module, which is quite hairy to get in python,
+ # so we cheat
+ import sys
+ mod = sys.modules[sys._getframe(1).f_globals['__name__']]
+
if jsconfig is None:
jsconfig = Config(js_optiondescr)
if use_pdb:
Modified: pypy/dist/pypy/translator/js/test/test_main.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_main.py (original)
+++ pypy/dist/pypy/translator/js/test/test_main.py Mon Jan 1 15:44:31 2007
@@ -21,6 +21,12 @@
def fun(x='3'):
return a.method({'a':x})['a']
+def fff():
+ pass
+
def test_bookkeeper_cleanup():
- rpython2javascript(sys.modules[__name__], ["fun"])
- rpython2javascript(sys.modules[__name__], ["fun"])
+ assert rpython2javascript(sys.modules[__name__], ["fun"])
+ assert rpython2javascript(sys.modules[__name__], ["fun"])
+
+def test_module_none():
+ assert rpython2javascript(None, "fff")
From fijal at codespeak.net Mon Jan 1 15:50:34 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 15:50:34 +0100 (CET)
Subject: [pypy-svn] r36095 - pypy/dist/pypy/translator/js/modules
Message-ID: <20070101145034.E9BAA1007F@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 15:50:33 2007
New Revision: 36095
Added:
pypy/dist/pypy/translator/js/modules/browser.py (contents, props changed)
Modified:
pypy/dist/pypy/translator/js/modules/dom.py
Log:
Moved some stuff (one function for now) from dom to browser.
Added: pypy/dist/pypy/translator/js/modules/browser.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/translator/js/modules/browser.py Mon Jan 1 15:50:33 2007
@@ -0,0 +1,9 @@
+
+"""
+Here are some functions which does not belong to dom, but rather
+to browser itself
+"""
+
+def alert(msg):
+ pass
+alert.suggested_primitive = True
Modified: pypy/dist/pypy/translator/js/modules/dom.py
==============================================================================
--- pypy/dist/pypy/translator/js/modules/dom.py (original)
+++ pypy/dist/pypy/translator/js/modules/dom.py Mon Jan 1 15:50:33 2007
@@ -303,9 +303,6 @@
func()
#pass
-def alert(msg):
- pass
-
# some helper functions (XXX imo these can go, but the code seems to use them
# a lot... isn't it possible to just use dom.window and dom.document instead?)
From fijal at codespeak.net Mon Jan 1 15:55:51 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 15:55:51 +0100 (CET)
Subject: [pypy-svn] r36096 - pypy/dist/pypy/translator/js/modules
Message-ID: <20070101145551.57DC01007F@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 15:55:50 2007
New Revision: 36096
Modified:
pypy/dist/pypy/translator/js/modules/dom.py
Log:
oops.
Modified: pypy/dist/pypy/translator/js/modules/dom.py
==============================================================================
--- pypy/dist/pypy/translator/js/modules/dom.py (original)
+++ pypy/dist/pypy/translator/js/modules/dom.py Mon Jan 1 15:55:50 2007
@@ -694,7 +694,6 @@
get_window.suggested_primitive = True
get_document.suggested_primitive = True
setTimeout.suggested_primitive = True
-alert.suggested_primitive = True
# the following code wraps minidom nodes with Node classes, and makes
# sure all methods on the nodes return wrapped nodes
From fijal at codespeak.net Mon Jan 1 16:06:35 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 16:06:35 +0100 (CET)
Subject: [pypy-svn] r36097 - pypy/dist/pypy/translator/js/tutorial
Message-ID: <20070101150635.DF72E1007A@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 16:06:34 2007
New Revision: 36097
Added:
pypy/dist/pypy/translator/js/tutorial/
pypy/dist/pypy/translator/js/tutorial/__init__.py (contents, props changed)
pypy/dist/pypy/translator/js/tutorial/step1.py (contents, props changed)
pypy/dist/pypy/translator/js/tutorial/step2.py (contents, props changed)
Log:
Added two simple steps how to start, this is intermediate checkin.
Added: pypy/dist/pypy/translator/js/tutorial/__init__.py
==============================================================================
Added: pypy/dist/pypy/translator/js/tutorial/step1.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/translator/js/tutorial/step1.py Mon Jan 1 16:06:34 2007
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+"""
+
+This is simple all-in-one self-containing server,
+which just shows almost-empty HTML page
+
+"""
+
+# here we import server, which is derivative of
+# BaseHTTPServer from python standard library
+from pypy.translator.js.examples import server
+
+# We create handler, which will handle all our requests
+class Handler(server.TestHandler):
+
+ def index(self):
+ # provide some html contents
+ return "Something
"
+ # this line is necessary to make server show something,
+ # otherwise method is considered private-only
+ index.exposed = True
+
+if __name__ == '__main__':
+ # let's start our server,
+ # this will create running server instance on port 8000 by default,
+ # which will run until we press Control-C
+ server.start_server(handler=Handler)
Added: pypy/dist/pypy/translator/js/tutorial/step2.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/translator/js/tutorial/step2.py Mon Jan 1 16:06:34 2007
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+"""
+In this example, we'll show how to add javascript to our simple
+server from previous example
+"""
+
+from pypy.translator.js.examples import server
+import sys
+
+# here we have virtual script "source.js" which we generate
+# on-the-fly when requested
+HTML = """
+
+
+
+ pypy.js tutorial
+
+
+
+
+"""
+
+from pypy.translator.js.main import rpython2javascript
+# here we import rpython -> javascript conversion utility
+
+from pypy.translator.js.modules import browser
+# and here we import functions from modules that we want to use
+
+# this is function which will be translated into javascript,
+# we can put it in a different module if we like so
+def show():
+ browser.alert("Alert")
+
+class Handler(server.TestHandler):
+
+ def index(self):
+ return HTML
+ index.exposed = True
+
+ # here we generate javascript, this will be accessed when
+ # asked for source.js
+ def source_js(self):
+ # this returns content-type (if not text/html)
+ # and generated javascript code
+ # None as argument means current module, while "show" is the
+ # name of function to be exported (under same name)
+ return "text/javascript", rpython2javascript(None, ["show"])
+ source_js.exposed = True
+
+# server start, same as before
+if __name__ == '__main__':
+ server.start_server(handler=Handler)
From fijal at codespeak.net Mon Jan 1 19:07:38 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Mon, 1 Jan 2007 19:07:38 +0100 (CET)
Subject: [pypy-svn] r36098 - pypy/dist/pypy/translator/js/tutorial
Message-ID: <20070101180738.3C29210078@code0.codespeak.net>
Author: fijal
Date: Mon Jan 1 19:07:36 2007
New Revision: 36098
Added:
pypy/dist/pypy/translator/js/tutorial/step3.py (contents, props changed)
Log:
Added another tutorial-like example.
Added: pypy/dist/pypy/translator/js/tutorial/step3.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/translator/js/tutorial/step3.py Mon Jan 1 19:07:36 2007
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+"""
+In this example I'll show how to manipulate DOM tree
+from inside RPython code
+
+Note that this is low-level API to manipulate it, which
+might be suitable if you don't like boilerplate on top.
+
+There is ongoing effort to provide API of somewhat higher level,
+which will be way easier to manipulate.
+"""
+
+from pypy.translator.js.examples import server
+from pypy.translator.js.main import rpython2javascript
+from pypy.translator.js.modules import dom
+# dom manipulating module
+
+HTML = """
+
+
+
+ pypy.js tutorial
+
+
+
+Add row
+Del row
+
+
+"""
+
+# these are exposed functions
+def addrow():
+ doc = dom.get_document()
+
+ # we need to call a helper, similiar to document in JS
+ tr = doc.createElement("tr")
+ td = doc.createElement("td")
+ td.appendChild(doc.createTextNode("A row"))
+ tr.appendChild(td)
+ dom.get_document().getElementById("atable").appendChild(tr)
+
+def delrow():
+ table = dom.get_document().getElementById("atable")
+ # note -1 working here like in python, this is last element in list
+ table.removeChild(table.childNodes[-1])
+
+class Handler(server.TestHandler):
+
+ def index(self):
+ return HTML
+ index.exposed = True
+
+ def source_js(self):
+ return "text/javascript", rpython2javascript(None, ["addrow", "delrow"])
+ source_js.exposed = True
+
+# server start, same as before
+if __name__ == '__main__':
+ server.start_server(handler=Handler)
From fijal at codespeak.net Tue Jan 2 00:20:45 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Tue, 2 Jan 2007 00:20:45 +0100 (CET)
Subject: [pypy-svn] r36100 - in pypy/dist/pypy/translator/js: . demo/jsdemo
test
Message-ID: <20070101232045.CDEA610072@code0.codespeak.net>
Author: fijal
Date: Tue Jan 2 00:20:43 2007
New Revision: 36100
Modified:
pypy/dist/pypy/translator/js/_class.py
pypy/dist/pypy/translator/js/asmgen.py
pypy/dist/pypy/translator/js/database.py
pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py
pypy/dist/pypy/translator/js/function.py
pypy/dist/pypy/translator/js/opcodes.py
pypy/dist/pypy/translator/js/test/runtest.py
pypy/dist/pypy/translator/js/test/test_rpython.py
Log:
A bit of refactoring regarding class attributes and such. Mostly whack whack whack here and there. Killed some skips, some stay still.
Modified: pypy/dist/pypy/translator/js/_class.py
==============================================================================
--- pypy/dist/pypy/translator/js/_class.py (original)
+++ pypy/dist/pypy/translator/js/_class.py Tue Jan 2 00:20:43 2007
@@ -44,6 +44,8 @@
self.ilasm = ilasm
ilasm.begin_function(self.name, [])
+ # we need to copy here all the arguments
+ self.copy_class_attributes(ilasm)
ilasm.end_function()
# begin to_String method
@@ -66,8 +68,13 @@
f = self.db.genoo.Function(self.db, m_meth.graph, m_name, is_method = True, _class = self.name)
f.render(ilasm)
-
self.db.record_class(self.classdef, self.name)
+ def copy_class_attributes(self, ilasm):
+ for field_name, (field_type, field_value) in self.classdef._fields.items():
+ ilasm.load_str("this")
+ self.db.load_const(field_type, field_value, ilasm)
+ ilasm.set_field(None, field_name)
+
def basename(self, name):
return name.replace('.', '_')#[-1]
Modified: pypy/dist/pypy/translator/js/asmgen.py
==============================================================================
--- pypy/dist/pypy/translator/js/asmgen.py (original)
+++ pypy/dist/pypy/translator/js/asmgen.py Tue Jan 2 00:20:43 2007
@@ -213,9 +213,12 @@
self.right_hand.append("%s.%s"%(self.right_hand.pop(), name))
def new(self, obj):
- log("New: %r"%obj)
+ #log("New: %r"%obj)
self.right_hand.append("new %s()"%obj)
+ def runtimenew(self):
+ self.right_hand.append("new %s()" % self.right_hand.pop())
+
def load_self(self):
self.right_hand.append("this")
Modified: pypy/dist/pypy/translator/js/database.py
==============================================================================
--- pypy/dist/pypy/translator/js/database.py (original)
+++ pypy/dist/pypy/translator/js/database.py Tue Jan 2 00:20:43 2007
@@ -110,6 +110,8 @@
if self.is_primitive(type_):
return None
const = AbstractConst.make(self, value)
+ if not const:
+ return None
try:
if retval == 'name':
return self.consts[const]
@@ -229,6 +231,11 @@
return DictConst(db, const)
elif isinstance(const, bltregistry._external_type):
return ExtObject(db, const)
+ elif isinstance(const, ootype._class):
+ if const._INSTANCE:
+ return ClassConst(db, const)
+ else:
+ return None
else:
assert False, 'Unknown constant: %s %r' % (const, typeOf(const))
make = staticmethod(make)
@@ -285,32 +292,28 @@
def record_fields(self):
if not self.obj:
return
- # we support only primitives, tuples, strings and lists
-
+ import pdb;pdb.set_trace()
INSTANCE = self.obj._TYPE
- while INSTANCE:
- for i, (_type, val) in INSTANCE._fields.iteritems():
- if _type is not ootype.Void and i.startswith('o'):
- name = self.db.record_const(getattr(self.obj, i), _type, 'const')
- if name is not None:
- self.depends.add(name)
- name.depends_on.add(self)
- INSTANCE = INSTANCE._superclass
+ #while INSTANCE:
+ for i, (_type, val) in INSTANCE._allfields().items():
+ if _type is not ootype.Void:
+ name = self.db.record_const(getattr(self.obj, i), _type, 'const')
+ if name is not None:
+ self.depends.add(name)
+ name.depends_on.add(self)
def init_fields(self, ilasm, const_var, name):
if not self.obj:
return
INSTANCE = self.obj._TYPE
- while INSTANCE:
- for i, (_type, el) in INSTANCE._fields.iteritems():
- if _type is not ootype.Void and i.startswith('o'):
- ilasm.load_local(const_var)
- self.db.load_const(_type, getattr(self.obj, i), ilasm)
- ilasm.set_field(None, "%s.%s"%(name, i))
- ilasm.store_void()
- INSTANCE = INSTANCE._superclass
- #raise NotImplementedError("Default fields of instances")
+ #while INSTANCE:
+ for i, (_type, el) in INSTANCE._allfields().items():
+ if _type is not ootype.Void:
+ ilasm.load_local(const_var)
+ self.db.load_const(_type, getattr(self.obj, i), ilasm)
+ ilasm.set_field(None, "%s.%s"%(name, i))
+ ilasm.store_void()
class RecordConst(AbstractConst):
def get_name(self):
@@ -400,6 +403,26 @@
def init_fields(self, ilasm, const_var, name):
pass
+class ClassConst(AbstractConst):
+ def __init__(self, db, const):
+ super(ClassConst, self).__init__(db, const)
+ self.cts.lltype_to_cts(const._INSTANCE) # force scheduling of class
+
+ def get_name(self):
+ return "const_class"
+
+ def get_key(self):
+ return self.get_name()
+
+ def get_name(self):
+ return self.const._INSTANCE._name.replace(".", "_")
+
+ def init(self, ilasm):
+ ilasm.load_const("%s" % self.get_name())
+
+ #def init_fields(self, ilasm, const_var, name):
+ # pass
+
class BuiltinConst(AbstractConst):
def __init__(self, name):
self.name = name
Modified: pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py (original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py Tue Jan 2 00:20:43 2007
@@ -177,7 +177,7 @@
self.wfile.write(data)
-def build_http_server(server_address=('', 8000)):
+def build_http_server(server_address=('', 8001)):
global httpd
httpd = Server(server_address, RequestHandler)
print 'http://127.0.0.1:%d' % (server_address[1],)
Modified: pypy/dist/pypy/translator/js/function.py
==============================================================================
--- pypy/dist/pypy/translator/js/function.py (original)
+++ pypy/dist/pypy/translator/js/function.py Tue Jan 2 00:20:43 2007
@@ -10,7 +10,7 @@
from pypy.translator.cli.option import getoption
from pypy.translator.cli.cts import CTS
from pypy.translator.cli.opcodes import opcodes
-from pypy.translator.cli.metavm import Generator,InstructionList
+from pypy.translator.oosupport.metavm import Generator,InstructionList
from pypy.translator.cli.node import Node
from pypy.translator.cli.class_ import Class
@@ -411,6 +411,12 @@
def call_external_method(self, name, arg_len):
self.ilasm.call_method(None, name, [0]*arg_len)
+
+ def instantiate(self):
+ self.ilasm.runtimenew()
+
+ def downcast(self, TYPE):
+ pass
def load(self, v):
if isinstance(v, flowmodel.Variable):
Modified: pypy/dist/pypy/translator/js/opcodes.py
==============================================================================
--- pypy/dist/pypy/translator/js/opcodes.py (original)
+++ pypy/dist/pypy/translator/js/opcodes.py Tue Jan 2 00:20:43 2007
@@ -2,7 +2,7 @@
"""
from pypy.translator.oosupport.metavm import PushArg, PushAllArgs, StoreResult,\
- InstructionList, New, SetField, GetField, MicroInstruction
+ InstructionList, New, SetField, GetField, MicroInstruction, RuntimeNew
from pypy.translator.oosupport.metavm import _GetFieldDispatcher, _SetFieldDispatcher, \
_CallDispatcher, _MethodDispatcher
@@ -110,6 +110,7 @@
'indirect_call' : [IndirectCall],
'same_as' : SameAs,
'new' : [New],
+ 'runtimenew' : [RuntimeNew],
'instanceof' : [IsInstance],
# objects
Modified: pypy/dist/pypy/translator/js/test/runtest.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/runtest.py (original)
+++ pypy/dist/pypy/translator/js/test/runtest.py Tue Jan 2 00:20:43 2007
@@ -15,6 +15,8 @@
from pypy.translator.transformer.debug import DebugTransformer
from pypy.rlib.nonconst import NonConstant
+from pypy.rpython.llinterp import LLException
+
log = log.runtest
use_browsertest = conftest.option.browser
use_tg = conftest.option.tg
@@ -119,6 +121,8 @@
res = 1e300 * 1e300
elif s == 'NaN':
res = (1e300 * 1e300) / (1e300 * 1e300)
+ elif s.startswith("uncaught exception:"):
+ raise LLException(str(s))
else:
log('javascript result:', s)
try:
@@ -169,9 +173,14 @@
#import exceptions # needed by eval
#try:
#import pdb; pdb.set_trace()
- res = self.interpret(fn, args)
- assert res.startswith('uncaught exception:')
- assert re.search(str(exception), res)
+ try:
+ res = self.interpret(fn, args)
+ except LLException, e:
+ s = e.args[0]
+ assert s.startswith('uncaught exception:')
+ assert re.search(str(exception), s)
+ else:
+ raise AssertionError("Did not raise, returned %s" % res)
#except ExceptionWrapper, ex:
# assert issubclass(eval(ex.class_name), exception)
#else:
Modified: pypy/dist/pypy/translator/js/test/test_rpython.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_rpython.py (original)
+++ pypy/dist/pypy/translator/js/test/test_rpython.py Tue Jan 2 00:20:43 2007
@@ -7,15 +7,10 @@
from pypy.rpython.test.test_rtuple import BaseTestRtuple
from pypy.rpython.test.test_rstr import BaseTestRstr
-py.test.skip("Those tests are totally broken, need deeper look")
-
class TestJsException(JsTest, BaseTestException):
pass
class TestJsClass(JsTest, BaseTestRclass):
- def test_classattr_as_defaults(self):
- py.test.skip("WIP")
-
def test_recursive_prebuilt_instance(self):
py.test.skip("WIP")
@@ -27,19 +22,13 @@
def test_mixin(self):
py.test.skip("WIP")
-
- def test_type(self):
+
+ def test_getattr_on_classes(self):
py.test.skip("WIP")
-
+
def test_hash_preservation(self):
py.test.skip("WIP")
-
- def test_ne(self):
- py.test.skip("WIP")
-
- def test_eq(self):
- py.test.skip("WIP")
-
+
def test_issubclass_type(self):
py.test.skip("WIP")
@@ -49,14 +38,14 @@
def test_recursive_prebuilt_instance_classattr(self):
py.test.skip("WIP")
-##class TestJsList(JsTest, BaseTestRlist):
-## pass
+#class TestJsList(JsTest, BaseTestRlist):
+# pass
##
-##class TestJsPBC(JsTest, BaseTestRPBC):
-## pass
+#class TestJsPBC(JsTest, BaseTestRPBC):
+# pass
##
-##class TestJsRtuple(JsTest, BaseTestRtuple):
-## pass
+#class TestJsRtuple(JsTest, BaseTestRtuple):
+# pass
##
-##class TestJsStr(JsTest, BaseTestRstr):
-## pass
+#class TestJsStr(JsTest, BaseTestRstr):
+# pass
From arigo at codespeak.net Tue Jan 2 15:18:41 2007
From: arigo at codespeak.net (arigo at codespeak.net)
Date: Tue, 2 Jan 2007 15:18:41 +0100 (CET)
Subject: [pypy-svn] r36101 - in pypy/dist/pypy/rlib/rctypes: . test
Message-ID: <20070102141841.DB41C1006F@code0.codespeak.net>
Author: arigo
Date: Tue Jan 2 15:18:37 2007
New Revision: 36101
Modified:
pypy/dist/pypy/rlib/rctypes/rctypesobject.py
pypy/dist/pypy/rlib/rctypes/test/test_rctypesobject.py
Log:
- support for rc_char_p containing None.
- a copyfrom() that is easier to support for llmemory.
Modified: pypy/dist/pypy/rlib/rctypes/rctypesobject.py
==============================================================================
--- pypy/dist/pypy/rlib/rctypes/rctypesobject.py (original)
+++ pypy/dist/pypy/rlib/rctypes/rctypesobject.py Tue Jan 2 15:18:37 2007
@@ -75,12 +75,6 @@
return cls(memblock.addr, memblock)
cls.allocate = staticmethod(allocate1)
- def copyfrom1(self, srcbox):
- assert isinstance(srcbox, cls)
- llmemory.raw_memcopy(srcbox.addr, self.addr, cls.rawsize)
- self._copykeepalives(0, srcbox)
- cls.copyfrom = copyfrom1
-
if hasattr(cls, 'llvalue2value') and not hasattr(cls, 'get_value'):
def get_value(self):
ptr = self.ll_ref(cls.CDATATYPE)
@@ -96,6 +90,18 @@
keepalive_until_here(self)
cls.set_value = set_value
+ if hasattr(cls, 'get_value') and hasattr(cls, 'set_value'):
+ def copyfrom1(self, srcbox):
+ assert isinstance(srcbox, cls)
+ self.set_value(srcbox.get_value())
+ self._copykeepalives(0, srcbox)
+ else:
+ def copyfrom1(self, srcbox):
+ assert isinstance(srcbox, cls)
+ llmemory.raw_memcopy(srcbox.addr, self.addr, cls.rawsize)
+ self._copykeepalives(0, srcbox)
+ cls.copyfrom = copyfrom1
+
def sameaddr(self, otherbox):
return self.addr == otherbox.addr
@@ -199,22 +205,29 @@
num_keepalives = 1
def llvalue2value(p):
- length = strlen(p)
- return charp2string(p, length)
+ if p:
+ length = strlen(p)
+ return charp2string(p, length)
+ else:
+ return None
llvalue2value = staticmethod(llvalue2value)
#def get_value(self): added by __initclass__() above
def set_value(self, string):
- n = len(string)
- rawsize = RCTypesCharP.ITEMOFS * (n + 1)
- targetmemblock = AllocatedRawMemBlock(0, rawsize, zero=False)
- targetaddr = targetmemblock.addr
- a = targetaddr
- for i in range(n):
- a.char[0] = string[i]
- a += RCTypesCharP.ITEMOFS
- a.char[0] = '\x00'
+ if string is not None:
+ n = len(string)
+ rawsize = RCTypesCharP.ITEMOFS * (n + 1)
+ targetmemblock = AllocatedRawMemBlock(0, rawsize, zero=False)
+ targetaddr = targetmemblock.addr
+ a = targetaddr
+ for i in range(n):
+ a.char[0] = string[i]
+ a += RCTypesCharP.ITEMOFS
+ a.char[0] = '\x00'
+ else:
+ targetmemblock = None
+ targetaddr = llmemory.NULL
ptr = self.ll_ref(RCTypesCharP.CDATATYPE)
ptr[0] = llmemory.cast_adr_to_ptr(targetaddr, RCTypesCharP.LLTYPE)
keepalive_until_here(self)
Modified: pypy/dist/pypy/rlib/rctypes/test/test_rctypesobject.py
==============================================================================
--- pypy/dist/pypy/rlib/rctypes/test/test_rctypesobject.py (original)
+++ pypy/dist/pypy/rlib/rctypes/test/test_rctypesobject.py Tue Jan 2 15:18:37 2007
@@ -158,6 +158,18 @@
res = self.do(func)
assert res == 1
+ def test_char_p_None(self):
+ def func():
+ p = rc_char_p.allocate()
+ assert p.get_value() is None
+ p.set_value("")
+ assert p.get_value() == ""
+ p.set_value("abc")
+ assert p.get_value() == "abc"
+ p.set_value(None)
+ assert p.get_value() is None
+ self.do(func)
+
def test_char_array(self):
def func():
a = RFixedArray(rc_char, 10).allocate()
From fijal at codespeak.net Tue Jan 2 15:19:19 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Tue, 2 Jan 2007 15:19:19 +0100 (CET)
Subject: [pypy-svn] r36102 - in pypy/dist/pypy: rpython/ootypesystem
translator/js/test
Message-ID: <20070102141919.E91AE10071@code0.codespeak.net>
Author: fijal
Date: Tue Jan 2 15:19:17 2007
New Revision: 36102
Added:
pypy/dist/pypy/rpython/ootypesystem/extdesc.py (contents, props changed)
Modified:
pypy/dist/pypy/rpython/ootypesystem/bltregistry.py
pypy/dist/pypy/translator/js/test/test_bltn.py
Log:
Refactored bltregistry a bit, mostly deleting unused code and splitting into two files.
Modified: pypy/dist/pypy/rpython/ootypesystem/bltregistry.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/bltregistry.py (original)
+++ pypy/dist/pypy/rpython/ootypesystem/bltregistry.py Tue Jan 2 15:19:17 2007
@@ -1,7 +1,5 @@
-""" External objects registry, defining two types of object:
-1. Those who need to be flown normally, but needs different representation in the backend
-2. Those who does not need to be flown
+""" External objects registry,
"""
from pypy.annotation import model as annmodel
@@ -11,33 +9,7 @@
from pypy.rpython.lltypesystem.lltype import frozendict, isCompatibleType
from types import MethodType
from pypy.rpython.extregistry import ExtRegistryEntry
-
-class ArgDesc(object):
- def __init__(self, name, ex_value):
- self.name = name
- self.example = ex_value
-
- def __repr__(self):
- return "" % (self.name, self.example)
-
-class MethodDesc(object):
- def __init__(self, args, retval = None):
- self.num = 0
- self.args = [self.convert_val(arg) for arg in args]
- self.retval = self.convert_val(retval)
- self.example = self
-
- def convert_val(self, val):
- if isinstance(val, ArgDesc) or isinstance(val, MethodDesc):
- return val
- elif isinstance(val, tuple):
- return ArgDesc(*val)
- else:
- self.num += 1
- return ArgDesc('v%d' % (self.num-1), val)
-
- def __repr__(self):
- return "" % (self.args,)
+from pypy.rpython.ootypesystem.extdesc import MethodDesc, ArgDesc
class CallableEntry(ExtRegistryEntry):
_type_ = MethodDesc
@@ -46,17 +18,15 @@
# because we have no good annotation
# let's cheat a little bit for a while...
bookkeeper = getbookkeeper()
- # hack, hack, hack, hack, hack, hack, hack, hack, hack, hack, hack, hack, hack, hack, hack
+ # hack, hack, hack, hack, hack, hack, hack, hack, hack, hack, hack,
values = ["v%d"%i for i in xrange(len(self.instance.args))]
lb = eval("lambda %s: None" % ",".join(values))
- s = annmodel.SomePBC([bookkeeper.getdesc(lb)])
- #bookkeeper.pbc_call(s, bookkeeper.build_args("simple_call", [bookkeeper.annotation_from_example(arg.example) for arg in self.instance.args]))
- return s
+ return annmodel.SomePBC([bookkeeper.getdesc(lb)])
class BasicMetaExternal(type):
def _is_compatible(type2):
return type(type2) is BasicMetaExternal
-
+
def __new__(self, _name, _type, _vars):
retval = type.__new__(self, _name, _type, _vars)
if not retval._methods:
@@ -108,12 +78,6 @@
class Analyzer(object):
def __init__(self, name, value, s_retval, s_args):
self.name = name
- # dirty hack
- # FIXME: to replace in future
- #if value.args[-1].name == 'callback':
- # itervalues = value.args[:-1]
- #else:
- # itervalues = value.args
self.args, self.retval = value.args, value.retval
self.s_retval = s_retval
self.s_args = s_args
@@ -131,17 +95,12 @@
__name__ = "ExternalType"
def __init__(self, _class):
- # FIXME: We want to support inheritance at some point, or maybe not
self._class_ = _class
self._name = str(_class)
self._superclass = None
self._root = True
self.updated = False
self._data = frozendict(_class._fields), frozendict(_class._methods)
- #self._methods = _class._methods
- #_methods = dict([(i,ootype._meth(ootype.Meth(*val))) for i,val in _class._methods.iteritems()])
- #ootype.Instance.__init__(self, str(_class), None, _class._fields, _methods, True)
- #self.attr = {}
def update_fields(self, _fields):
for i, val in _fields.iteritems():
@@ -195,14 +154,6 @@
def _defl(self):
return _external_type(self)
-## def _defl(self):
-## raise AttributeError()
-## return self._null
-##
-## def _example(self):
-## raise AttributeError()return new(self)
-##
-
class _external_type(object):
def __init__(self, et):
@@ -230,20 +181,13 @@
class Entry_basicexternal(ExtRegistryEntry):
_type_ = BasicExternal.__metaclass__
- #def compute_annotation(self, *args):
- # return annmodel.SomeOOInstance(ootype=BasicExternal)
-
def compute_result_annotation(self):
- #return annmodel.SomeExternalBuiltin(ExternalType.get(self.instance))
return annmodel.SomeExternalBuiltin(self.bookkeeper.getexternaldesc(self.instance))
- #Ereturn annmodel.SomeOOInstance(ExternalType.get(self.instance))
def specialize_call(self, hop):
- #assert isinstance(hop.args_s[0], annmodel.SomeOOInstance)\
- # and hop.args_s[0].ootype is Externaltype
value = hop.r_result.lowleveltype
return hop.genop('new', [Constant(value, concretetype=ootype.Void)], \
resulttype = value)
-def rebuild_basic_external():
- ExternalType.class_dict = {}
+#def rebuild_basic_external():
+# ExternalType.class_dict = {}
Added: pypy/dist/pypy/rpython/ootypesystem/extdesc.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/rpython/ootypesystem/extdesc.py Tue Jan 2 15:19:17 2007
@@ -0,0 +1,37 @@
+
+""" extdesc - some descriptions for external entries
+"""
+
+class ArgDesc(object):
+ """ Description of argument, given as name + example value
+ (used to deduce type)
+ """
+ def __init__(self, name, ex_value):
+ self.name = name
+ self.example = ex_value
+
+ def __repr__(self):
+ return "" % (self.name, self.example)
+
+class MethodDesc(object):
+ """ Description of method to be external,
+ args are taken from examples given as keyword arguments or as args,
+ return value must be specified, because this will not be flown
+ """
+ def __init__(self, args, retval = None):
+ self.num = 0
+ self.args = [self.convert_val(arg) for arg in args]
+ self.retval = self.convert_val(retval)
+ self.example = self
+
+ def convert_val(self, val):
+ if isinstance(val, ArgDesc) or isinstance(val, MethodDesc):
+ return val
+ elif isinstance(val, tuple):
+ return ArgDesc(*val)
+ else:
+ self.num += 1
+ return ArgDesc('v%d' % (self.num-1), val)
+
+ def __repr__(self):
+ return "" % (self.args,)
Modified: pypy/dist/pypy/translator/js/test/test_bltn.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_bltn.py (original)
+++ pypy/dist/pypy/translator/js/test/test_bltn.py Tue Jan 2 15:19:17 2007
@@ -3,12 +3,11 @@
import py
-from pypy.rpython.ootypesystem.bltregistry import BasicExternal, MethodDesc,\
- rebuild_basic_external
+from pypy.rpython.ootypesystem.bltregistry import BasicExternal, MethodDesc
from pypy.translator.js.test.runtest import compile_function, check_source_contains
-def setup_function(fun):
- rebuild_basic_external()
+#def setup_function(fun):
+# rebuild_basic_external()
# check rendering dom.get_document()
def test_simple_builtin():
From arigo at codespeak.net Tue Jan 2 15:31:54 2007
From: arigo at codespeak.net (arigo at codespeak.net)
Date: Tue, 2 Jan 2007 15:31:54 +0100 (CET)
Subject: [pypy-svn] r36103 - in pypy/dist/pypy/rlib/rctypes: . test
Message-ID: <20070102143154.8CD3F1006F@code0.codespeak.net>
Author: arigo
Date: Tue Jan 2 15:31:50 2007
New Revision: 36103
Added:
pypy/dist/pypy/rlib/rctypes/rchar_p.py (contents, props changed)
pypy/dist/pypy/rlib/rctypes/test/test_rchar_p.py
- copied, changed from r36079, pypy/dist/pypy/rpython/rctypes/test/test_rchar_p.py
pypy/dist/pypy/rlib/rctypes/test/test_rstruct.py
- copied, changed from r36072, pypy/dist/pypy/rpython/rctypes/test/test_rstruct.py
Modified:
pypy/dist/pypy/rlib/rctypes/implementation.py
pypy/dist/pypy/rlib/rctypes/rstruct.py
Log:
rchar_p implementation. Some more work on rstruct.
Modified: pypy/dist/pypy/rlib/rctypes/implementation.py
==============================================================================
--- pypy/dist/pypy/rlib/rctypes/implementation.py (original)
+++ pypy/dist/pypy/rlib/rctypes/implementation.py Tue Jan 2 15:31:50 2007
@@ -43,13 +43,16 @@
register_for_metatype = classmethod(register_for_metatype)
def convert(self, x):
- assert isinstance(x, self.ctype)
- key = id(x)
+ if isinstance(x, self.ctype):
+ key = "by_id", id(x)
+ else:
+ key = "by_value", x
+ x = self.ctype(x)
try:
- return self.instance_cache[key]
+ return self.instance_cache[key][0]
except KeyError:
obj = self.new()
- self.instance_cache[key] = obj
+ self.instance_cache[key] = obj, x # keep 'x' alive
self.initialize_prebuilt(obj, x)
return obj
@@ -172,3 +175,4 @@
import pypy.rlib.rctypes.rpointer
import pypy.rlib.rctypes.rstruct
import pypy.rlib.rctypes.rbuiltin
+import pypy.rlib.rctypes.rchar_p
Added: pypy/dist/pypy/rlib/rctypes/rchar_p.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/rlib/rctypes/rchar_p.py Tue Jan 2 15:31:50 2007
@@ -0,0 +1,34 @@
+from pypy.rlib.rctypes.implementation import CTypeController
+from pypy.rlib.rctypes import rctypesobject
+
+from ctypes import c_char_p
+
+
+class CCharPCTypeController(CTypeController):
+ knowntype = rctypesobject.rc_char_p
+
+ def new(self, initialvalue=None):
+ obj = rctypesobject.rc_char_p.allocate()
+ obj.set_value(initialvalue)
+ return obj
+
+ def initialize_prebuilt(self, obj, x):
+ string = x.value
+ obj.set_value(string)
+
+ def get_value(self, obj):
+ return obj.get_value()
+
+ def set_value(self, obj, string):
+ obj.set_value(string)
+
+ # ctypes automatically unwraps the c_char_p() instances when
+ # they are returned by most operations
+ return_value = get_value
+ store_value = set_value
+
+ def is_true(self, obj):
+ return obj.get_value() is not None
+
+
+CCharPCTypeController.register_for_type(c_char_p)
Modified: pypy/dist/pypy/rlib/rctypes/rstruct.py
==============================================================================
--- pypy/dist/pypy/rlib/rctypes/rstruct.py (original)
+++ pypy/dist/pypy/rlib/rctypes/rstruct.py Tue Jan 2 15:31:50 2007
@@ -1,5 +1,6 @@
from pypy.rlib.rctypes.implementation import CTypeController, getcontroller
from pypy.rlib.rctypes import rctypesobject
+from pypy.rpython.extregistry import ExtRegistryEntry
from pypy.rpython.lltypesystem import lltype
from pypy.rlib.unroll import unrolling_iterable
@@ -24,6 +25,7 @@
external = getattr(ctype, '_external_', False)
self.knowntype = rctypesobject.RStruct(ctype.__name__, fields,
c_external = external)
+ self.fieldcontrollers = controllers
# Build a custom new() method where the setting of the fields
# is unrolled
@@ -68,5 +70,33 @@
self.setattr = structsetattr
self.setboxattr = structsetboxattr
+ def initialize_prebuilt(self, obj, x):
+ for name, controller in self.fieldcontrollers:
+ fieldbox = controller.convert(getattr(x, name))
+ self.setboxattr(obj, name, fieldbox)
+
StructCTypeController.register_for_metatype(StructType)
+
+# ____________________________________________________________
+
+def offsetof(Struct, fieldname):
+ "Utility function that returns the offset of a field in a structure."
+ return getattr(Struct, fieldname).offset
+
+class OffsetOfFnEntry(ExtRegistryEntry):
+ "Annotation and rtyping of calls to offsetof()"
+ _about_ = offsetof
+
+ def compute_result_annotation(self, s_Struct, s_fieldname):
+ assert s_Struct.is_constant()
+ assert s_fieldname.is_constant()
+ ofs = offsetof(s_Struct.const, s_fieldname.const)
+ assert ofs >= 0
+ s_result = SomeInteger(nonneg=True)
+ s_result.const = ofs
+ return s_result
+
+ def specialize_call(self, hop):
+ ofs = hop.s_result.const
+ return hop.inputconst(lltype.Signed, ofs)
From fijal at codespeak.net Tue Jan 2 15:35:26 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Tue, 2 Jan 2007 15:35:26 +0100 (CET)
Subject: [pypy-svn] r36104 - pypy/dist/pypy/translator/js/test
Message-ID: <20070102143526.56AF01006F@code0.codespeak.net>
Author: fijal
Date: Tue Jan 2 15:35:25 2007
New Revision: 36104
Modified:
pypy/dist/pypy/translator/js/test/test_basicexternal.py
Log:
Added a test which (suprisingly) passes
Modified: pypy/dist/pypy/translator/js/test/test_basicexternal.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_basicexternal.py (original)
+++ pypy/dist/pypy/translator/js/test/test_basicexternal.py Tue Jan 2 15:35:25 2007
@@ -34,18 +34,32 @@
fun = compile_function(be_fun, [])
check_source_contains(fun, "\.some_code")
-def test_basicexternal_raise():
- py.test.skip("Constant BasicExternals not implemented")
- def raising_fun():
- try:
- b = B()
- except:
- pass
- else:
- return 3
+##def test_basicexternal_raise():
+## #py.test.skip("Constant BasicExternals not implemented")
+## def raising_fun():
+## try:
+## b = B()
+## except:
+## pass
+## else:
+## return 3
+##
+## fun = compile_function(raising_fun, [])
+## assert fun() == 3
+
+class EE(BasicExternal):
+ @described(retval=3)
+ def bb(self):
+ pass
- fun = compile_function(raising_fun, [])
- assert fun() == 3
+ee = EE()
+
+def test_prebuild_basicexternal():
+ def tt_fun():
+ ee.bb()
+
+ fun = compile_function(tt_fun, [])
+ check_source_contains(fun, "ee.bb\(")
class C(BasicExternal):
@described(retval=3)
From arigo at codespeak.net Tue Jan 2 15:58:08 2007
From: arigo at codespeak.net (arigo at codespeak.net)
Date: Tue, 2 Jan 2007 15:58:08 +0100 (CET)
Subject: [pypy-svn] r36105 - pypy/extradoc/planning/secprototype
Message-ID: <20070102145808.0B43E10074@code0.codespeak.net>
Author: arigo
Date: Tue Jan 2 15:58:06 2007
New Revision: 36105
Added:
pypy/extradoc/planning/secprototype/talk-outline.txt
- copied unchanged from r36104, pypy/extradoc/planning/secprototype/talk.txt
Removed:
pypy/extradoc/planning/secprototype/talk.txt
Log:
Move out of the way.
From fijal at codespeak.net Tue Jan 2 16:16:17 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Tue, 2 Jan 2007 16:16:17 +0100 (CET)
Subject: [pypy-svn] r36106 - pypy/dist/pypy/rpython/ootypesystem
Message-ID: <20070102151617.B068310077@code0.codespeak.net>
Author: fijal
Date: Tue Jan 2 16:16:16 2007
New Revision: 36106
Modified:
pypy/dist/pypy/rpython/ootypesystem/bltregistry.py
Log:
Add value storing for consts
Modified: pypy/dist/pypy/rpython/ootypesystem/bltregistry.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/bltregistry.py (original)
+++ pypy/dist/pypy/rpython/ootypesystem/bltregistry.py Tue Jan 2 16:16:16 2007
@@ -152,12 +152,13 @@
return "%s %s" % (self.__name__, self._name)
def _defl(self):
- return _external_type(self)
-
+ return _external_type(self, None)
+
class _external_type(object):
- def __init__(self, et):
+ def __init__(self, et, value):
self._TYPE = et
+ self.value = value
class Entry_basicexternalmeta(ExtRegistryEntry):
_metatype_ = BasicMetaExternal
From fijal at codespeak.net Tue Jan 2 16:16:47 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Tue, 2 Jan 2007 16:16:47 +0100 (CET)
Subject: [pypy-svn] r36107 - pypy/dist/pypy/rpython
Message-ID: <20070102151647.ABFD810078@code0.codespeak.net>
Author: fijal
Date: Tue Jan 2 16:16:45 2007
New Revision: 36107
Modified:
pypy/dist/pypy/rpython/rexternalobj.py
Log:
Forgotten to check that in
Modified: pypy/dist/pypy/rpython/rexternalobj.py
==============================================================================
--- pypy/dist/pypy/rpython/rexternalobj.py (original)
+++ pypy/dist/pypy/rpython/rexternalobj.py Tue Jan 2 16:16:45 2007
@@ -36,9 +36,7 @@
def convert_const(self, value):
from pypy.rpython.ootypesystem.bltregistry import ExternalType,_external_type
- #if value is None:
- # return lltype.Void
- return _external_type(self.knowntype)
+ return _external_type(self.knowntype, value)
def rtype_getattr(self, hop):
attr = hop.args_s[1].const
From fijal at codespeak.net Tue Jan 2 16:18:20 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Tue, 2 Jan 2007 16:18:20 +0100 (CET)
Subject: [pypy-svn] r36108 - in pypy/dist/pypy: doc/js translator/js
translator/js/demo/jsdemo
translator/js/demo/jsdemo/djangoping translator/js/examples
translator/js/modules translator/js/modules/test
translator/js/test translator/js/tutorial
Message-ID: <20070102151820.6F6B710078@code0.codespeak.net>
Author: fijal
Date: Tue Jan 2 16:18:14 2007
New Revision: 36108
Modified:
pypy/dist/pypy/doc/js/webapps_with_pypy.txt
pypy/dist/pypy/translator/js/asmgen.py
pypy/dist/pypy/translator/js/database.py
pypy/dist/pypy/translator/js/demo/jsdemo/consserv.py
pypy/dist/pypy/translator/js/demo/jsdemo/controllers.py
pypy/dist/pypy/translator/js/demo/jsdemo/djangoping/client.py
pypy/dist/pypy/translator/js/demo/jsdemo/example.py
pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py
pypy/dist/pypy/translator/js/examples/console.py
pypy/dist/pypy/translator/js/examples/start_bnb.py
pypy/dist/pypy/translator/js/helper.py
pypy/dist/pypy/translator/js/jsbuiltin.py
pypy/dist/pypy/translator/js/modules/dom.py
pypy/dist/pypy/translator/js/modules/test/test_dom.py
pypy/dist/pypy/translator/js/test/test_basicexternal.py
pypy/dist/pypy/translator/js/test/test_bltn.py
pypy/dist/pypy/translator/js/test/test_main.py
pypy/dist/pypy/translator/js/tutorial/step3.py
Log:
Factored out use of (deprecated) get_document() and get_window(), one might use document and window instead. This needed implementation of prebuilt BasicExternal rendering. Killed some dead code in between.
Modified: pypy/dist/pypy/doc/js/webapps_with_pypy.txt
==============================================================================
--- pypy/dist/pypy/doc/js/webapps_with_pypy.txt (original)
+++ pypy/dist/pypy/doc/js/webapps_with_pypy.txt Tue Jan 2 16:18:14 2007
@@ -89,4 +89,4 @@
XXX hands-on guide to writing guestbook or something
-.. _`RPython`: ../coding-guide.html#restricted-python
\ No newline at end of file
+.. _`RPython`: ../coding-guide.html#restricted-python
Modified: pypy/dist/pypy/translator/js/asmgen.py
==============================================================================
--- pypy/dist/pypy/translator/js/asmgen.py (original)
+++ pypy/dist/pypy/translator/js/asmgen.py Tue Jan 2 16:18:14 2007
@@ -226,7 +226,8 @@
if len(self.right_hand) == 0:
return
v = self.right_hand.pop()
- if v is not None:
+ # if v is not calling anything, drop it
+ if v is not None and v.find('('):
self.codegenerator.writeline(v+";")
#self.right_hand.pop()
Modified: pypy/dist/pypy/translator/js/database.py
==============================================================================
--- pypy/dist/pypy/translator/js/database.py (original)
+++ pypy/dist/pypy/translator/js/database.py Tue Jan 2 16:18:14 2007
@@ -42,18 +42,8 @@
self.name_manager = JavascriptNameManager(self)
self.pending_consts = []
self.cts = self.genoo.TypeSystem(self)
- self.prepare_builtins()
self.proxies = []
- def prepare_builtins(self):
- # Document Object Model elements
- #for module in [dom]:
- # for i in dir(module):
- # if not i.startswith('__'):
- # # FIXME: shit, strange way of doing it
- # self.consts[BuiltinConst(module[i])] = i
- return
-
def is_primitive(self, type_):
if type_ in [Void, Bool, Float, Signed, Unsigned, SignedLongLong, UnsignedLongLong, Char, UniChar, ootype.StringBuilder] or \
isinstance(type_,ootype.StaticMethod):
@@ -491,4 +481,7 @@
ilasm.new(self.get_name())
else:
# Otherwise they just exist, or it's not implemented
- ilasm.load_str("undefined")
+ if not hasattr(self.const.value, '_render_name'):
+ raise ValueError("Prebuilt constant %s has no attribute _render_name,"
+ "don't know how to render" % self.const.value)
+ ilasm.load_str(self.const.value._render_name)
Modified: pypy/dist/pypy/translator/js/demo/jsdemo/consserv.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/consserv.py (original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/consserv.py Tue Jan 2 16:18:14 2007
@@ -13,7 +13,7 @@
from pypy.translator.js.test.runtest import compile_function
-from pypy.translator.js.modules.dom import Node, get_document, setTimeout,\
+from pypy.translator.js.modules.dom import Node, setTimeout,\
alert
#from pypy.translator.js.modules.xmlhttp import XMLHttpRequest
from pypy.translator.js.modules.mochikit import logDebug, createLoggingPane, log
Modified: pypy/dist/pypy/translator/js/demo/jsdemo/controllers.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/controllers.py (original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/controllers.py Tue Jan 2 16:18:14 2007
@@ -6,6 +6,7 @@
from pypy.translator.js.test.runtest import compile_function
from pypy.translator.js.modules import dom,xmlhttp
+from pypy.translator.js.modules.dom import document
import thread
import os
@@ -14,7 +15,6 @@
pass
def js_fun():
- document = dom.get_document()
obj = document.createElement('img')
obj.id = 'gfx'
obj.setAttribute('style', 'position:absolute; top:0; left:0;')
Modified: pypy/dist/pypy/translator/js/demo/jsdemo/djangoping/client.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/djangoping/client.py (original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/djangoping/client.py Tue Jan 2 16:18:14 2007
@@ -22,7 +22,7 @@
def callback(data):
mochikit.logDebug("Got response: " + data["response"])
- log = dom.get_document().getElementById("log")
+ log = dom.document.getElementById("log")
mochikit.logDebug("got log element")
try:
s = "" + data["response"] + "
"
@@ -39,7 +39,7 @@
def ping_init():
mochikit.createLoggingPane(True)
- button = dom.get_document().getElementById("doping")
+ button = dom.document.getElementById("doping")
button.onclick = doping_onclick
mochikit.logDebug("Ping button setup")
Modified: pypy/dist/pypy/translator/js/demo/jsdemo/example.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/example.py (original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/example.py Tue Jan 2 16:18:14 2007
@@ -6,7 +6,7 @@
from pypy.translator.js.demo.jsdemo import support
-from pypy.translator.js.modules.dom import setTimeout, get_document
+from pypy.translator.js.modules.dom import setTimeout, document
from pypy.rpython.ootypesystem.bltregistry import MethodDesc, BasicExternal
from pypy.translator.js import commproxy
@@ -31,7 +31,7 @@
httpd = None
def callback(data):
- get_document().getElementById("counter").innerHTML = data['counter']
+ document.getElementById("counter").innerHTML = data['counter']
runjs()
def runjs():
Modified: pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py (original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/pythonconsole.py Tue Jan 2 16:18:14 2007
@@ -12,7 +12,7 @@
import sys, os, cStringIO
from cgi import parse_qs
-from pypy.translator.js.modules.dom import setTimeout, get_document
+from pypy.translator.js.modules.dom import setTimeout, document
from pypy.rpython.ootypesystem.bltregistry import MethodDesc, BasicExternal
from pypy.translator.js import commproxy
from pypy.translator.js.modules.mochikit import escapeHTML
@@ -46,14 +46,14 @@
httpd = None
def callback(data):
- inp_elem = get_document().getElementById("inp")
+ inp_elem = document.getElementById("inp")
inp_elem.disabled = False
answer = data.get('answer', '')
add_text(answer)
inp_elem.focus()
def add_text(text):
- data_elem = get_document().getElementById("data")
+ data_elem = document.getElementById("data")
data_elem.innerHTML += escapeHTML(text)
class Storage(object):
@@ -66,7 +66,7 @@
def keypressed(key):
kc = key.keyCode
if kc == ord("\r"):
- inp_elem = get_document().getElementById("inp")
+ inp_elem = document.getElementById("inp")
cmd = inp_elem.value
if storage.level == 0:
add_text(">>> %s\n" % (cmd,))
@@ -85,8 +85,8 @@
storage.level = 0
def setup_page():
- get_document().onkeypress = keypressed
- get_document().getElementById("inp").focus()
+ document.onkeypress = keypressed
+ document.getElementById("inp").focus()
class Server(HTTPServer, BasicExternal):
# Methods and signatures how they are rendered for JS
Modified: pypy/dist/pypy/translator/js/examples/console.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/console.py (original)
+++ pypy/dist/pypy/translator/js/examples/console.py Tue Jan 2 16:18:14 2007
@@ -12,7 +12,7 @@
conftest.option.browser = "default"
from pypy.translator.js.test.runtest import compile_function
-from pypy.translator.js.modules.dom import Node, get_document, setTimeout, \
+from pypy.translator.js.modules.dom import Node, document, setTimeout, \
alert
#from pypy.translator.js.modules.xmlhttp import XMLHttpRequest
from pypy.translator.js.modules.mochikit import logDebug, createLoggingPane, log
@@ -27,7 +27,7 @@
self.indent_level = 0
def initialise(self):
- self.elem = get_document().getElementById("data")
+ self.elem = document.getElementById("data")
def add_data(self, data):
if self.indent_level == 0 and data == "":
@@ -51,18 +51,17 @@
def onchange(key):
kc = key.keyCode
if kc == ord("\r"):
- inp_elem = get_document().getElementById("inp")
+ inp_elem = document.getElementById("inp")
inp_elem.value = console.add_data(inp_elem.value)
def test_run_console():
def some_fun():
- #cons = get_document().getElementById("data")
#write_start(cons)
createLoggingPane(True)
console.initialise()
#data_field = get_document().getElementById("data")
#console.onload(data_field)
- get_document().onkeypress = onchange
+ document.onkeypress = onchange
#get_document().onkeyup = onchangedown
print "It's not working"
Modified: pypy/dist/pypy/translator/js/examples/start_bnb.py
==============================================================================
--- pypy/dist/pypy/translator/js/examples/start_bnb.py (original)
+++ pypy/dist/pypy/translator/js/examples/start_bnb.py Tue Jan 2 16:18:14 2007
@@ -12,7 +12,7 @@
conftest.option.browser = "default"
from pypy.translator.js.test.runtest import compile_function
-from pypy.translator.js.modules.dom import get_document
+from pypy.translator.js.modules.dom import document
from pypy.translator.js.modules.xmlhttp import XMLHttpRequest
from pypy.translator.js.modules.mochikit import log, logWarning, createLoggingPane, logDebug
from pypy.translator.js.modules.bltns import date
@@ -74,10 +74,10 @@
# img = self.sprite_queues[icon_code].pop()
#except IndexError:
stats.n_sprites += 1
- img = get_document().createElement("img")
+ img = document.createElement("img")
img.setAttribute("src", self.filenames[icon_code])
img.setAttribute("style", 'position:absolute; left:'+x+'px; top:'+y+'px; visibility:visible')
- get_document().getElementById("playfield").appendChild(img)
+ document.getElementById("playfield").appendChild(img)
try:
self.sprites[s].style.visibility = "hidden"
# FIXME: We should delete it
@@ -144,23 +144,23 @@
def appendPlayfield(msg):
bgcolor = '#000000'
- get_document().body.setAttribute('bgcolor', bgcolor)
- div = get_document().createElement("div")
+ document.body.setAttribute('bgcolor', bgcolor)
+ div = document.createElement("div")
div.setAttribute("id", "playfield")
div.setAttribute('width', msg['width'])
div.setAttribute('height', msg['height'])
div.setAttribute('style', 'position:absolute; top:0px; left:0px')
- get_document().body.appendChild(div)
+ document.body.appendChild(div)
def appendPlayfieldXXX():
bgcolor = '#000000'
- get_document().body.setAttribute('bgcolor', bgcolor)
- div = get_document().createElement("div")
+ document.body.setAttribute('bgcolor', bgcolor)
+ div = document.createElement("div")
div.setAttribute("id", "playfield")
div.setAttribute('width', 500)
div.setAttribute('height', 250)
div.setAttribute('style', 'position:absolute; top:0px; left:0px')
- get_document().body.appendChild(div)
+ document.body.appendChild(div)
def process_message(msg):
if msg['type'] == 'def_playfield':
@@ -247,8 +247,8 @@
# stats.__init__()
# sm.__init__()
# sm.begin_clean_sprites()
- # playfield = get_document().getElementById("playfield")
- # get_document().body.removeChild(playfield)
+ # playfield = document.getElementById("playfield")
+ # document.body.removeChild(playfield)
# appendPlayfieldXXX()
## count = int(msgs['add_data'][0]['n'])
@@ -266,20 +266,20 @@
for msg in msgs['messages']:
process_message(msg)
stats.register_frame()
- get_document().title = str(stats.n_sprites) + " sprites " + str(stats.fps)
+ document.title = str(stats.n_sprites) + " sprites " + str(stats.fps)
def session_dispatcher(msgs):
BnbRootInstance.get_message(player.id, "", bnb_dispatcher)
def run_bnb():
def bnb():
- genjsinfo = get_document().getElementById("genjsinfo")
- get_document().body.removeChild(genjsinfo)
+ genjsinfo = document.getElementById("genjsinfo")
+ document.body.removeChild(genjsinfo)
createLoggingPane(True)
log("keys: [0-9] to select player, [wsad] to walk around")
BnbRootInstance.initialize_session(session_dispatcher)
- get_document().onkeydown = keydown
- get_document().onkeyup = keyup
+ document.onkeydown = keydown
+ document.onkeyup = keyup
from pypy.translator.js.demo.jsdemo.bnb import BnbRoot
fn = compile_function(bnb, [], root = BnbRoot, run_browser = False)
Modified: pypy/dist/pypy/translator/js/helper.py
==============================================================================
--- pypy/dist/pypy/translator/js/helper.py (original)
+++ pypy/dist/pypy/translator/js/helper.py Tue Jan 2 16:18:14 2007
@@ -2,7 +2,7 @@
""" Some helpers
"""
-from pypy.translator.js.modules.dom import get_document
+from pypy.translator.js.modules.dom import document
def escape(s):
#return s.replace("&", "&").replace("<", "<").replace(">", ">"). \
@@ -10,23 +10,23 @@
return s
def create_debug_div():
- debug_div = get_document().createElement("div")
+ debug_div = document.createElement("div")
debug_div.setAttribute("id", "debug_div")
# XXX attach it somewhere...
- #body = get_document().getElementsByTagName('body')[0]
- get_document().childNodes[0].childNodes[1].appendChild(debug_div)
+ #body = document.getElementsByTagName('body')[0]
+ document.childNodes[0].childNodes[1].appendChild(debug_div)
return debug_div
def __show_traceback(tb, exc):
- debug_div = get_document().getElementById("debug_div")
+ debug_div = document.getElementById("debug_div")
if not debug_div:
# create div here
debug_div = create_debug_div()
- pre_div = get_document().createElement("pre")
+ pre_div = document.createElement("pre")
pre_div.style.color = "#FF0000"
debug_div.appendChild(pre_div)
- txt = get_document().createTextNode("")
+ txt = document.createTextNode("")
pre_div.appendChild(txt)
for tb_entry in tb[1:]:
# list of tuples...
Modified: pypy/dist/pypy/translator/js/jsbuiltin.py
==============================================================================
--- pypy/dist/pypy/translator/js/jsbuiltin.py (original)
+++ pypy/dist/pypy/translator/js/jsbuiltin.py Tue Jan 2 16:18:14 2007
@@ -14,17 +14,12 @@
self.builtin_map = {
'll_js_jseval' : CallBuiltin('eval'),
- #'ll_newlist' : CallBuiltin('newlist'),
- #'ll_alloc_and_set' : CallBuiltin('alloc_and_set'),
- 'get_document' : lambda g,op: g.ilasm.load_const('document'),
'set_on_keydown' : SetOnEvent('onkeydown'),
'set_on_keyup' : SetOnEvent('onkeyup'),
'setTimeout' : SetTimeout,
- #'xmlSetCallback' : XmlSetCallback,
'll_int_str' : lambda g,op: Call._render_builtin_method(g, 'toString' , [op.args[2]]),
'll_strconcat' : InstructionList([PushAllArgs, '+']),
'll_int' : CallBuiltin('parseInt'),
- #'ll_int' : lambda g,op: Call._render_builtin(g, 'parseInt', [op.args[0], op.args[0]]),
'alert' : CallBuiltin('alert'),
'seval' : CallBuiltin('seval'),
'date': NewBuiltin('Date'),
Modified: pypy/dist/pypy/translator/js/modules/dom.py
==============================================================================
--- pypy/dist/pypy/translator/js/modules/dom.py (original)
+++ pypy/dist/pypy/translator/js/modules/dom.py Tue Jan 2 16:18:14 2007
@@ -87,7 +87,7 @@
def __setattr__(self, name, value):
"""set an attribute on the wrapped node"""
- if name in dir(self):
+ if name in dir(self) or name.startswith('_'):
return super(Node, self).__setattr__(name, value)
if name not in self._fields:
raise NameError, name
@@ -303,18 +303,10 @@
func()
#pass
-# some helper functions (XXX imo these can go, but the code seems to use them
-# a lot... isn't it possible to just use dom.window and dom.document instead?)
-
window = Window()
-
-def get_document():
- return window.document
-get_document.suggested_primitive = True
-
-def get_window():
- return window
-get_window.suggested_primitive = True
+document = window.document
+window._render_name = 'window'
+document._render_name = 'document'
# rtyper stuff
@@ -691,8 +683,6 @@
'charCode' : 12,
})
-get_window.suggested_primitive = True
-get_document.suggested_primitive = True
setTimeout.suggested_primitive = True
# the following code wraps minidom nodes with Node classes, and makes
Modified: pypy/dist/pypy/translator/js/modules/test/test_dom.py
==============================================================================
--- pypy/dist/pypy/translator/js/modules/test/test_dom.py (original)
+++ pypy/dist/pypy/translator/js/modules/test/test_dom.py Tue Jan 2 16:18:14 2007
@@ -19,7 +19,7 @@
def get_window():
if TRANSLATING:
- return dom.get_window()
+ return dom.window
else:
return dom.Window()
Modified: pypy/dist/pypy/translator/js/test/test_basicexternal.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_basicexternal.py (original)
+++ pypy/dist/pypy/translator/js/test/test_basicexternal.py Tue Jan 2 16:18:14 2007
@@ -14,6 +14,7 @@
pass
a = A()
+a._render_name = 'a'
class B(object):
pass
@@ -23,7 +24,7 @@
a.some_code("aa")
fun = compile_function(dec_fun, [])
- check_source_contains(fun, "\.some_code")
+ assert check_source_contains(fun, "\.some_code")
def test_basicexternal_element():
def be_fun():
@@ -32,7 +33,7 @@
b.a.some_code("aa")
fun = compile_function(be_fun, [])
- check_source_contains(fun, "\.some_code")
+ assert check_source_contains(fun, "\.some_code")
##def test_basicexternal_raise():
## #py.test.skip("Constant BasicExternals not implemented")
@@ -53,13 +54,14 @@
pass
ee = EE()
+ee._render_name = 'ee'
def test_prebuild_basicexternal():
def tt_fun():
ee.bb()
fun = compile_function(tt_fun, [])
- check_source_contains(fun, "ee.bb\(")
+ assert check_source_contains(fun, "EE = ee")
class C(BasicExternal):
@described(retval=3)
@@ -67,6 +69,7 @@
pass
c = C()
+c._render_name = 'c'
def test_basicexternal_raise_method_call():
def raising_method_call():
@@ -88,6 +91,7 @@
D._fields['c'] = [D(),D()]
d = D()
+d._render_name = 'd'
def test_basicexternal_list():
def getaa(item):
Modified: pypy/dist/pypy/translator/js/test/test_bltn.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_bltn.py (original)
+++ pypy/dist/pypy/translator/js/test/test_bltn.py Tue Jan 2 16:18:14 2007
@@ -6,14 +6,11 @@
from pypy.rpython.ootypesystem.bltregistry import BasicExternal, MethodDesc
from pypy.translator.js.test.runtest import compile_function, check_source_contains
-#def setup_function(fun):
-# rebuild_basic_external()
-
-# check rendering dom.get_document()
+# check rendering dom.document
def test_simple_builtin():
- from pypy.translator.js.modules.dom import get_document
+ from pypy.translator.js.modules.dom import document
def test_document_call():
- return get_document().getElementById("some_id")
+ return document.getElementById("some_id")
fn = compile_function(test_document_call, [])
assert check_source_contains(fn, "= document")
@@ -42,6 +39,7 @@
assert check_source_contains(fn, "loadJSONDoc\('some_method'")
SomeNodeInstance = SomeNode()
+SomeNodeInstance._render_name = 's'
# next will try out the callback
def test_callback():
@@ -58,7 +56,7 @@
from pypy.translator.js.modules import dom
def getaa(tname):
- return dom.get_document().getElementsByTagName(tname)[0].nodeValue
+ return dom.document.getElementsByTagName(tname)[0].nodeValue
def some_stuff():
one = getaa("some")
Modified: pypy/dist/pypy/translator/js/test/test_main.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_main.py (original)
+++ pypy/dist/pypy/translator/js/test/test_main.py Tue Jan 2 16:18:14 2007
@@ -17,6 +17,7 @@
method = described(retval={'a':'a'})(method)
a = A()
+a._render_name = 'a'
def fun(x='3'):
return a.method({'a':x})['a']
Modified: pypy/dist/pypy/translator/js/tutorial/step3.py
==============================================================================
--- pypy/dist/pypy/translator/js/tutorial/step3.py (original)
+++ pypy/dist/pypy/translator/js/tutorial/step3.py Tue Jan 2 16:18:14 2007
@@ -12,7 +12,7 @@
from pypy.translator.js.examples import server
from pypy.translator.js.main import rpython2javascript
-from pypy.translator.js.modules import dom
+from pypy.translator.js.modules.dom import document
# dom manipulating module
HTML = """
@@ -33,17 +33,15 @@
# these are exposed functions
def addrow():
- doc = dom.get_document()
-
# we need to call a helper, similiar to document in JS
- tr = doc.createElement("tr")
- td = doc.createElement("td")
- td.appendChild(doc.createTextNode("A row"))
+ tr = document.createElement("tr")
+ td = document.createElement("td")
+ td.appendChild(document.createTextNode("A row"))
tr.appendChild(td)
- dom.get_document().getElementById("atable").appendChild(tr)
+ document.getElementById("atable").appendChild(tr)
def delrow():
- table = dom.get_document().getElementById("atable")
+ table = document.getElementById("atable")
# note -1 working here like in python, this is last element in list
table.removeChild(table.childNodes[-1])
From fijal at codespeak.net Tue Jan 2 16:32:45 2007
From: fijal at codespeak.net (fijal at codespeak.net)
Date: Tue, 2 Jan 2007 16:32:45 +0100 (CET)
Subject: [pypy-svn] r36109 - in pypy/dist/pypy/translator/js: . modules
tutorial
Message-ID: <20070102153245.9BD1F1007F@code0.codespeak.net>
Author: fijal
Date: Tue Jan 2 16:32:43 2007
New Revision: 36109
Removed:
pypy/dist/pypy/translator/js/modules/browser.py
Modified:
pypy/dist/pypy/translator/js/asmgen.py
pypy/dist/pypy/translator/js/jsbuiltin.py
pypy/dist/pypy/translator/js/modules/dom.py
pypy/dist/pypy/translator/js/support.py
pypy/dist/pypy/translator/js/tutorial/step2.py
Log:
Kill another suggested_primitive and move back alert to dom, because alert is window.alert
Modified: pypy/dist/pypy/translator/js/asmgen.py
==============================================================================
--- pypy/dist/pypy/translator/js/asmgen.py (original)
+++ pypy/dist/pypy/translator/js/asmgen.py Tue Jan 2 16:32:43 2007
@@ -44,7 +44,6 @@
self.subst_table = subst_table
def pop(self):
- #if len(self.l) == 0:
el = self.l.pop()
return self.subst_table.get(el, el)
@@ -193,11 +192,6 @@
def set_static_field(self, _type, namespace, _class, varname):
self.codegenerator.writeline("%s.prototype.%s = %s;"%(_class, varname, self.right_hand.pop()))
- #def load_set_field(self, _type, name):
- # #self.right_hand.append("")
- # #self.codegenerator.writeline("set field %r %r"%(_type, name))
- # pass
-
def set_field(self, useless_parameter, name):
v = self.right_hand.pop()
self.codegenerator.writeline("%s.%s = %s;"%(self.right_hand.pop(), name, v))
@@ -226,10 +220,8 @@
if len(self.right_hand) == 0:
return
v = self.right_hand.pop()
- # if v is not calling anything, drop it
if v is not None and v.find('('):
self.codegenerator.writeline(v+";")
- #self.right_hand.pop()
def begin_consts(self, name):
# load consts, maybe more try to use stack-based features?
@@ -293,6 +285,3 @@
def throw_real(self, s):
self.codegenerator.writeline("throw(%s);"%s)
-
- #def finish ( self ):
- # self . outfile . write ( "%r" % self . right_hand )
Modified: pypy/dist/pypy/translator/js/jsbuiltin.py
==============================================================================
--- pypy/dist/pypy/translator/js/jsbuiltin.py (original)
+++ pypy/dist/pypy/translator/js/jsbuiltin.py Tue Jan 2 16:32:43 2007
@@ -20,7 +20,7 @@
'll_int_str' : lambda g,op: Call._render_builtin_method(g, 'toString' , [op.args[2]]),
'll_strconcat' : InstructionList([PushAllArgs, '+']),
'll_int' : CallBuiltin('parseInt'),
- 'alert' : CallBuiltin('alert'),
+ #'alert' : CallBuiltin('alert'),
'seval' : CallBuiltin('seval'),
'date': NewBuiltin('Date'),
'll_math_fmod' : InstructionList([PushAllArgs, '%']),
Modified: pypy/dist/pypy/translator/js/modules/dom.py
==============================================================================
--- pypy/dist/pypy/translator/js/modules/dom.py (original)
+++ pypy/dist/pypy/translator/js/modules/dom.py Tue Jan 2 16:32:43 2007
@@ -6,7 +6,7 @@
note that the API is not and will not be complete: more exotic features
will most probably not behave as expected, or are not implemented at all
-
+
http://www.w3.org/DOM/ - main standard
http://www.w3schools.com/dhtml/dhtml_dom.asp - more informal stuff
http://developer.mozilla.org/en/docs/Gecko_DOM_Reference - Gecko reference
@@ -764,6 +764,9 @@
raise ValueError('unsupported node type %s' % (node.nodeType,))
return ''.join(ret)
+def alert(msg):
+ window.alert(msg)
+
# initialization
# set the global 'window' instance to an empty HTML document, override using
Modified: pypy/dist/pypy/translator/js/support.py
==============================================================================
--- pypy/dist/pypy/translator/js/support.py (original)
+++ pypy/dist/pypy/translator/js/support.py Tue Jan 2 16:32:43 2007
@@ -17,7 +17,7 @@
namespace native new null package private protected
public return short static super switch synchronized
this throw throws transient true try typeof
- use var void volatile while with
+ use var void volatile while with alert
'''
for name in reserved_words.split():
self.reserved[name] = True
Modified: pypy/dist/pypy/translator/js/tutorial/step2.py
==============================================================================
--- pypy/dist/pypy/translator/js/tutorial/step2.py (original)
+++ pypy/dist/pypy/translator/js/tutorial/step2.py Tue Jan 2 16:32:43 2007
@@ -23,13 +23,13 @@
from pypy.translator.js.main import rpython2javascript
# here we import rpython -> javascript conversion utility
-from pypy.translator.js.modules import browser
+from pypy.translator.js.modules import dom
# and here we import functions from modules that we want to use
# this is function which will be translated into javascript,
# we can put it in a different module if we like so
def show():
- browser.alert("Alert")
+ dom.alert("Alert")
class Handler(server.TestHandler):
From arigo at codespeak.net Tue Jan 2 17:57:30 2007
From: arigo at codespeak.net (arigo at codespeak.net)
Date: Tue, 2 Jan 2007 17:57:30 +0100 (CET)
Subject: [pypy-svn] r36110 - in pypy/extradoc/planning/secprototype: . ui
Message-ID: <20070102165730.F028210071@code0.codespeak.net>
Author: arigo
Date: Tue Jan 2 17:57:29 2007
New Revision: 36110
Added:
pypy/extradoc/planning/secprototype/arch-pypy-basic.png
- copied unchanged from r36104, pypy/extradoc/talk/vancouver/arch-pypy-basic.png
pypy/extradoc/planning/secprototype/arch-translation.png
- copied unchanged from r36104, pypy/extradoc/talk/vancouver/arch-translation.png
pypy/extradoc/planning/secprototype/talk.txt
- copied, changed from r36104, pypy/extradoc/talk/vancouver/talk.txt
pypy/extradoc/planning/secprototype/ui/
- copied from r36104, pypy/extradoc/talk/vancouver/ui/
Log:
(pedronis, cfbolz looking, arigo)
The Zuerich workshop talk (still to be checked).
From antocuni at codespeak.net Tue Jan 2 20:33:21 2007
From: antocuni at codespeak.net (antocuni at codespeak.net)
Date: Tue, 2 Jan 2007 20:33:21 +0100 (CET)
Subject: [pypy-svn] r36111 - pypy/dist/pypy/translator/cli/test
Message-ID: <20070102193321.03B2D10063@code0.codespeak.net>
Author: antocuni
Date: Tue Jan 2 20:33:20 2007
New Revision: 36111
Modified:
pypy/dist/pypy/translator/cli/test/test_list.py
pypy/dist/pypy/translator/cli/test/test_string.py
Log:
skip these tests for now.
Modified: pypy/dist/pypy/translator/cli/test/test_list.py
==============================================================================
--- pypy/dist/pypy/translator/cli/test/test_list.py (original)
+++ pypy/dist/pypy/translator/cli/test/test_list.py Tue Jan 2 20:33:20 2007
@@ -5,3 +5,6 @@
class TestCliList(CliTest, BaseTestRlist):
def test_recursive(self):
py.test.skip("CLI doesn't support recursive lists")
+
+ def test_getitem_exc(self):
+ py.test.skip('fixme!')
Modified: pypy/dist/pypy/translator/cli/test/test_string.py
==============================================================================
--- pypy/dist/pypy/translator/cli/test/test_string.py (original)
+++ pypy/dist/pypy/translator/cli/test/test_string.py Tue Jan 2 20:33:20 2007
@@ -48,3 +48,7 @@
def fn(answer):
return 'the answer is %s' % answer
assert self.ll_to_string(self.interpret(fn, [42])) == 'the answer is 42'
+
+ def test_getitem_exc(self):
+ py.test.skip('fixme!')
+
From santagada at codespeak.net Tue Jan 2 22:03:35 2007
From: santagada at codespeak.net (santagada at codespeak.net)
Date: Tue, 2 Jan 2007 22:03:35 +0100 (CET)
Subject: [pypy-svn] r36112 - in pypy/dist/pypy/lang/js: . test
Message-ID: <20070102210335.87C131006F@code0.codespeak.net>
Author: santagada
Date: Tue Jan 2 22:03:29 2007
New Revision: 36112
Modified:
pypy/dist/pypy/lang/js/astgen.py
pypy/dist/pypy/lang/js/interpreter.py
pypy/dist/pypy/lang/js/test/test_interp.py
Log:
binary and comparison operations ready
Modified: pypy/dist/pypy/lang/js/astgen.py
==============================================================================
--- pypy/dist/pypy/lang/js/astgen.py (original)
+++ pypy/dist/pypy/lang/js/astgen.py Tue Jan 2 22:03:29 2007
@@ -14,6 +14,16 @@
self.left = left
self.right = right
+class BinaryLogicOperator(Node):
+ """super class for binary operators"""
+ def __init__(self, left, right):
+ self.left = left
+ self.right = right
+
+class Or(BinaryLogicOperator): pass
+
+class And(BinaryLogicOperator): pass
+
class Array(Node):
def __init__(self, items=()):
@@ -44,6 +54,8 @@
self.left = left
self.right = right
+class Eq(BinaryOperator): pass
+
class Function(Node):
def __init__(self, name, params, body):
self.name = name
@@ -54,6 +66,8 @@
def __init__(self, expr):
self.expr = expr
+class Ge(BinaryOperator): pass
+
class Gt(BinaryOperator): pass
class Identifier(Node):
@@ -69,6 +83,8 @@
self.thenPart = thenPart
self.elsePart = elsePart
+class In(BinaryOperator): pass
+
class Index(Node):
def __init__(self, left, expr):
self.left = left
@@ -78,8 +94,14 @@
def __init__(self, nodes):
self.nodes = nodes
+class Le(BinaryOperator): pass
+
class Lt(BinaryOperator): pass
+class Minus(BinaryOperator):pass
+
+class Ne(BinaryOperator):pass
+
class New(Node):
def __init__(self, identifier):
self.identifier = identifier
@@ -187,6 +209,12 @@
return Comma(from_dict(d['0']),from_dict(d['1']))
elif tp == 'DOT':
return Dot(from_dict(d['0']), from_dict(d['1']))
+ elif tp == 'EQ':
+ return Eq(from_dict(d['0']), from_dict(d['1']))
+ elif tp == 'OR':
+ return Or(from_dict(d['0']), from_dict(d['1']))
+ elif tp == 'AND':
+ return And(from_dict(d['0']), from_dict(d['1']))
elif tp == 'FUNCTION':
name = d.get('name', '')
body = from_dict(d['body'])
@@ -198,6 +226,8 @@
return f
elif tp == 'GROUP':
return Group(from_dict(d['0']))
+ elif tp == 'GE':
+ return Ge(from_dict(d['0']), from_dict(d['1']))
elif tp == 'GT':
return Gt(from_dict(d['0']), from_dict(d['1']))
elif tp == 'IDENTIFIER':
@@ -213,12 +243,20 @@
else:
elsePart = from_dict(d['elsePart'])
return If(condition,thenPart,elsePart)
+ elif tp == 'IN':
+ return In(from_dict(d['0']), from_dict(d['1']))
elif tp == 'INDEX':
return Index(from_dict(d['0']), from_dict(d['1']))
elif tp == 'LIST':
return List(getlist(d))
+ elif tp == 'LE':
+ return Le(from_dict(d['0']), from_dict(d['1']))
elif tp == 'LT':
return Lt(from_dict(d['0']), from_dict(d['1']))
+ elif tp == 'MINUS':
+ return Minus(from_dict(d['0']), from_dict(d['1']))
+ elif tp == 'NE':
+ return Ne(from_dict(d['0']), from_dict(d['1']))
elif tp == 'NEW':
return New(d['0']['value'])
elif tp == 'NUMBER':
Modified: pypy/dist/pypy/lang/js/interpreter.py
==============================================================================
--- pypy/dist/pypy/lang/js/interpreter.py (original)
+++ pypy/dist/pypy/lang/js/interpreter.py Tue Jan 2 22:03:29 2007
@@ -124,29 +124,88 @@
else:
pass
-class __extend__(Gt):
- def call(self, ctx = None):
+class __extend__(Or):
+ def call(self, ctx):
+ s2 = self.left.call(ctx).GetValue()
+ if s2.ToBoolean():
+ return s2
+ s4 = self.right.call(ctx).GetValue()
+ return s4
+
+class __extend__(And):
+ def call(self, ctx):
s2 = self.left.call(ctx).GetValue()
+ if not s2.ToBoolean():
+ return s2
s4 = self.right.call(ctx).GetValue()
- s5 = ARC(s4, s2)
+ return s4
+
+
+class __extend__(BinaryOperator):
+ def call(self, ctx):
+ s2 = self.left.call(ctx).GetValue()
+ s4 = self.right.call(ctx).GetValue()
+ return self.decision(s2, s4)
+
+class __extend__(Ge):
+ def decision(self, op1, op2):
+ s5 = ARC(op1, op2)
+ if s5 is None or s5:
+ return W_Boolean(False)
+ else:
+ return W_Boolean(True)
+
+class __extend__(Gt):
+ def decision(self, op1, op2):
+ s5 = ARC(op2, op1)
if s5 is None:
return W_Boolean(False)
else:
return W_Boolean(s5)
+class __extend__(Le):
+ def decision(self, op1, op2):
+ s5 = ARC(op2, op1)
+ if s5 is None or s5:
+ return W_Boolean(False)
+ else:
+ return W_Boolean(True)
+
class __extend__(Lt):
- def call(self, ctx = None):
- s2 = self.left.call(ctx).GetValue()
- s4 = self.right.call(ctx).GetValue()
- s5 = ARC(s2, s4)
- print "< ARC result = ", s5
+ def decision(self, op1, op2):
+ s5 = ARC(op1, op2)
if s5 is None:
return W_Boolean(False)
else:
return W_Boolean(s5)
+def AEC(x, y):
+ """
+ Implements the Abstract Equality Comparison x == y
+ not following the specs yet
+ """
+ r = x.ToNumber() == y.ToNumber()
+ return r
+
+class __extend__(Eq):
+ def decision(self, op1, op2):
+ return W_Boolean(AEC(op1, op2))
+
+class __extend__(Ne):
+ def decision(self, op1, op2):
+ return W_Boolean(not AEC(op1, op2))
+
+
+class __extend__(In):
+ def decision(self, op1, op2):
+ if not isinstance(op2, W_Object):
+ raise ThrowException("TypeError")
+ name = op1.ToString()
+ return W_Boolean(op2.HasProperty(name))
+
+
class __extend__(Index):
- def call(self, ctx=None):
+ def call(self, ctx):
w_obj = self.left.call(ctx).GetValue()
w_member = self.expr.call(ctx).GetValue()
w_obj = w_obj.ToObject()
@@ -158,6 +217,12 @@
print "nodes = ", self.nodes
return [node.call(ctx) for node in self.nodes]
+class __extend__(Minus):
+ def decision(self, op1, op2):
+ x = op1.ToNumber()
+ y = op2.ToNumber()
+ return W_Number(x - y)
+
class __extend__(New):
def call(self, ctx=None):
obj = W_Object()
@@ -165,10 +230,8 @@
constructor = ctx.resolve_identifier(self.identifier).GetValue()
obj.Put('prototype', constructor.Get('prototype'))
constructor.Call(ctx, this = obj)
-
return obj
-
class __extend__(Number):
def call(self, ctx):
return W_Number(self.num)
@@ -188,13 +251,9 @@
return w_obj
class __extend__(Plus):
- def call(self, ctx):
- print "left", self.left.call(ctx)
- left = self.left.call(ctx).GetValue()
- right = self.right.call(ctx).GetValue()
- prim_left = left.ToPrimitive('Number')
- prim_right = right.ToPrimitive('Number')
- # INSANE
+ def decision(self, op1, op2):
+ prim_left = op1.ToPrimitive('Number')
+ prim_right = op2.ToPrimitive('Number')
if isinstance(prim_left, W_String) or isinstance(prim_right, W_String):
str_left = prim_left.ToString()
str_right = prim_right.ToString()
@@ -202,7 +261,6 @@
else:
num_left = prim_left.ToNumber()
num_right = prim_right.ToNumber()
- # XXX: obey all the rules
return W_Number(num_left + num_right)
class __extend__(Script):
Modified: pypy/dist/pypy/lang/js/test/test_interp.py
==============================================================================
--- pypy/dist/pypy/lang/js/test/test_interp.py (original)
+++ pypy/dist/pypy/lang/js/test/test_interp.py Tue Jan 2 22:03:29 2007
@@ -52,6 +52,9 @@
self.assert_prints("x=3;print(x);", ["3"])
self.assert_prints("x=3;y=4;print(x+y);", ["7"])
+ def test_minus(self):
+ self.assert_prints("print(2-1)", ["1"])
+
def test_string_var(self):
self.assert_prints('print(\"sss\");', ["sss"])
@@ -82,7 +85,6 @@
self.assert_prints('var x = 3; print(x);', ["3"])
self.assert_prints('var x = 3; print(x+x);', ["6"])
-
def test_var_scoping(self):
self.assert_prints("""
var y;
@@ -213,8 +215,22 @@
self.assert_prints("print(1<0)",["false"])
self.assert_prints("print(0<1)",["true"])
self.assert_prints("print(0<0)",["false"])
-
-
+ self.assert_prints("print(1>=0)",["true"])
+ self.assert_prints("print(1>=1)",["true"])
+ self.assert_prints("print(1>=2)",["false"])
+ self.assert_prints("print(0<=1)",["true"])
+ self.assert_prints("print(1<=1)",["true"])
+ self.assert_prints("print(1<=0)",["false"])
+ self.assert_prints("print(0==0)",["true"])
+ self.assert_prints("print(1==1)",["true"])
+ self.assert_prints("print(0==1)",["false"])
+ self.assert_prints("print(0!=1)",["true"])
+ self.assert_prints("print(1!=1)",["false"])
+
+ def test_binary_op(self):
+ self.assert_prints("print(0||0); print(1||0)",["0", "1"])
+ self.assert_prints("print(0&&1); print(1&&1)",["0", "1"])
+
def test_while(self):
self.assert_prints("""
i = 0;
@@ -262,13 +278,13 @@
def test_vars(self):
self.assert_prints("""
var x;x=3; print(x)""", ["3"])
-
- def test_fun_decl(self):
- py.test.skip("still not ready")
+
+ def test_minus(self):
self.assert_prints("""
- function x () { print('i work')}
- x()
- """, ["i work"])
+ x = {y:3};
+ print("y" in x);
+ print("z" in x);
+ """, ["true", "false"])
-
+
From arigo at codespeak.net Wed Jan 3 10:20:47 2007
From: arigo at codespeak.net (arigo at codespeak.net)
Date: Wed, 3 Jan 2007 10:20:47 +0100 (CET)
Subject: [pypy-svn] r36115 - pypy/dist/pypy/rpython
Message-ID: <20070103092047.76A8010064@code0.codespeak.net>
Author: arigo
Date: Wed Jan 3 10:20:44 2007
New Revision: 36115
Modified:
pypy/dist/pypy/rpython/llinterp.py
Log:
Python 2.3 compatibility.
Modified: pypy/dist/pypy/rpython/llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/llinterp.py (original)
+++ pypy/dist/pypy/rpython/llinterp.py Wed Jan 3 10:20:44 2007
@@ -1,5 +1,6 @@
from pypy.objspace.flow.model import FunctionGraph, Constant, Variable, c_last_exception
-from pypy.rlib.rarithmetic import intmask, r_uint, ovfcheck, r_longlong, r_ulonglong
+from pypy.rlib.rarithmetic import intmask, r_uint, ovfcheck, r_longlong
+from pypy.rlib.rarithmetic import r_ulonglong, ovfcheck_lshift
from pypy.rpython.lltypesystem import lltype, llmemory, lloperation, llheap
from pypy.rpython.lltypesystem import rclass
from pypy.rpython.ootypesystem import ootype
@@ -786,6 +787,22 @@
except OverflowError:
self.make_llexception()
+ def op_int_lshift_ovf(self, x, y):
+ assert isinstance(x, int)
+ assert isinstance(y, int)
+ try:
+ return ovfcheck_lshift(x, y)
+ except OverflowError:
+ self.make_llexception()
+
+ def op_int_lshift_ovf_val(self, x, y):
+ assert isinstance(x, int)
+ assert isinstance(y, int)
+ try:
+ return ovfcheck_lshift(x, y)
+ except (OverflowError, ValueError):
+ self.make_llexception()
+
def _makefunc2(fn, operator, xtype, ytype=None):
import sys
d = sys._getframe(1).f_locals
@@ -816,9 +833,7 @@
_makefunc2('op_int_mod_ovf', '%', 'int')
_makefunc2('op_int_mod_zer', '%', 'int')
_makefunc2('op_int_mod_ovf_zer', '%', 'int')
- _makefunc2('op_int_lshift_ovf', '<<', 'int')
_makefunc2('op_int_lshift_val', '<<', 'int')
- _makefunc2('op_int_lshift_ovf_val', '<<', 'int')
_makefunc2('op_int_rshift_val', '>>', 'int')
_makefunc2('op_uint_floordiv_zer', '//', 'r_uint')
From mwh at codespeak.net Wed Jan 3 12:53:03 2007
From: mwh at codespeak.net (mwh at codespeak.net)
Date: Wed, 3 Jan 2007 12:53:03 +0100 (CET)
Subject: [pypy-svn] r36117 - in pypy/dist/pypy: config objspace/std
objspace/std/test
Message-ID: <20070103115303.E6F901006F@code0.codespeak.net>
Author: mwh
Date: Wed Jan 3 12:52:58 2007
New Revision: 36117
Modified:
pypy/dist/pypy/config/pypyoption.py
pypy/dist/pypy/objspace/std/objspace.py
pypy/dist/pypy/objspace/std/test/test_intobject.py
Log:
add a hopefully short-lived config option to specialize the addition of two
integers in BINARY_ADD like CPython does.
hopefully short-lived because it would be much nicer to specialize multimethod
implementations automagically...
Modified: pypy/dist/pypy/config/pypyoption.py
==============================================================================
--- pypy/dist/pypy/config/pypyoption.py (original)
+++ pypy/dist/pypy/config/pypyoption.py Wed Jan 3 12:52:58 2007
@@ -118,6 +118,10 @@
"list is mutaged",
default=False),
+ BoolOption("optimized_int_add",
+ "special case the addition of two integers in BINARY_ADD",
+ default=False),
+
BoolOption("oldstyle",
"specify whether the default metaclass should be classobj",
default=False, cmdline="--oldstyle"),
@@ -133,6 +137,7 @@
("objspace.std.withstrslice", True),
("objspace.std.withsmallint", True),
("objspace.std.withrangelist", True),
+ ("objspace.std.optimized_int_add", True),
],
cmdline="--faassen"),
Modified: pypy/dist/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/std/objspace.py (original)
+++ pypy/dist/pypy/objspace/std/objspace.py Wed Jan 3 12:52:58 2007
@@ -2,6 +2,7 @@
from pypy.interpreter.baseobjspace import ObjSpace, Wrappable
from pypy.interpreter.error import OperationError, debug_print
from pypy.interpreter.typedef import get_unique_interplevel_subclass
+from pypy.interpreter import pyframe
from pypy.rlib.objectmodel import instantiate
from pypy.interpreter.gateway import PyPyCacheDir
from pypy.tool.cache import Cache
@@ -36,39 +37,6 @@
assert issubclass(implcls, W_Object)
_registered_implementations[implcls] = True
-from pypy.interpreter import pyframe
-
-class StdObjSpaceFrame(pyframe.PyFrame):
- def CALL_LIKELY_BUILTIN(f, oparg, *ignored):
- from pypy.module.__builtin__ import OPTIMIZED_BUILTINS, Module
- from pypy.objspace.std.dictmultiobject import W_DictMultiObject
- w_globals = f.w_globals
- num = oparg >> 8
- assert isinstance(w_globals, W_DictMultiObject)
- w_value = w_globals.implementation.get_builtin_indexed(num)
- if w_value is None:
- w_builtins = f.builtin
- assert isinstance(w_builtins, Module)
- w_builtin_dict = w_builtins.w_dict
- assert isinstance(w_builtin_dict, W_DictMultiObject)
- w_value = w_builtin_dict.implementation.get_builtin_indexed(num)
-## if w_value is not None:
-## print "CALL_LIKELY_BUILTIN fast"
- if w_value is None:
- varname = OPTIMIZED_BUILTINS[num]
- message = "global name '%s' is not defined" % varname
- raise OperationError(f.space.w_NameError,
- f.space.wrap(message))
- nargs = oparg & 0xff
- w_function = w_value
- try:
- w_result = f.space.call_valuestack(w_function, nargs, f.valuestack)
- # XXX XXX fix the problem of resume points!
- #rstack.resume_point("CALL_FUNCTION", f, nargs, returns=w_result)
- finally:
- f.valuestack.drop(nargs)
- f.valuestack.push(w_result)
-
##################################################################
class StdObjSpace(ObjSpace, DescrOperation):
@@ -88,6 +56,55 @@
# Import all the object types and implementations
self.model = StdTypeModel(self.config)
+ class StdObjSpaceFrame(pyframe.PyFrame):
+ if self.config.objspace.std.optimized_int_add:
+ def BINARY_ADD(f, oparg, *ignored):
+ from pypy.objspace.std.intobject import \
+ W_IntObject, add__Int_Int
+ w_2 = f.valuestack.pop()
+ w_1 = f.valuestack.pop()
+ if isinstance(w_1, W_IntObject) and \
+ isinstance(w_2, W_IntObject):
+ try:
+ w_result = add__Int_Int(f.space, w_1, w_2)
+ except FailedToImplement:
+ w_result = f.space.add(w_1, w_2)
+ else:
+ w_result = f.space.add(w_1, w_2)
+ f.valuestack.push(w_result)
+
+ def CALL_LIKELY_BUILTIN(f, oparg, *ignored):
+ from pypy.module.__builtin__ import OPTIMIZED_BUILTINS, Module
+ from pypy.objspace.std.dictmultiobject import W_DictMultiObject
+ w_globals = f.w_globals
+ num = oparg >> 8
+ assert isinstance(w_globals, W_DictMultiObject)
+ w_value = w_globals.implementation.get_builtin_indexed(num)
+ if w_value is None:
+ w_builtins = f.builtin
+ assert isinstance(w_builtins, Module)
+ w_builtin_dict = w_builtins.w_dict
+ assert isinstance(w_builtin_dict, W_DictMultiObject)
+ w_value = w_builtin_dict.implementation.get_builtin_indexed(num)
+ ## if w_value is not None:
+ ## print "CALL_LIKELY_BUILTIN fast"
+ if w_value is None:
+ varname = OPTIMIZED_BUILTINS[num]
+ message = "global name '%s' is not defined" % varname
+ raise OperationError(f.space.w_NameError,
+ f.space.wrap(message))
+ nargs = oparg & 0xff
+ w_function = w_value
+ try:
+ w_result = f.space.call_valuestack(w_function, nargs, f.valuestack)
+ # XXX XXX fix the problem of resume points!
+ #rstack.resume_point("CALL_FUNCTION", f, nargs, returns=w_result)
+ finally:
+ f.valuestack.drop(nargs)
+ f.valuestack.push(w_result)
+
+ self.FrameClass = StdObjSpaceFrame
+
# XXX store the dict class on the space to access it in various places
if self.config.objspace.std.withstrdict:
from pypy.objspace.std import dictstrobject
@@ -265,7 +282,7 @@
if not we_are_translated() and isinstance(code, CPythonFakeCode):
return CPythonFakeFrame(self, code, w_globals)
else:
- return StdObjSpaceFrame(self, code, w_globals, closure)
+ return self.FrameClass(self, code, w_globals, closure)
def gettypefor(self, cls):
return self.gettypeobject(cls.typedef)
Modified: pypy/dist/pypy/objspace/std/test/test_intobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/test/test_intobject.py (original)
+++ pypy/dist/pypy/objspace/std/test/test_intobject.py Wed Jan 3 12:52:58 2007
@@ -375,3 +375,8 @@
def test_getnewargs(self):
assert 0 .__getnewargs__() == (0,)
+
+class AppTestIntOptimizedAdd(AppTestInt):
+ def setup_class(cls):
+ from pypy.conftest import gettestobjspace
+ cls.space = gettestobjspace(**{"objspace.std.optimized_int_add": True})
From afayolle at codespeak.net Wed Jan 3 14:04:57 2007
From: afayolle at codespeak.net (afayolle at codespeak.net)
Date: Wed, 3 Jan 2007 14:04:57 +0100 (CET)
Subject: [pypy-svn] r36118 - pypy/extradoc/sprintinfo/leysin-winter-2007
Message-ID: <20070103130457.3AF5010069@code0.codespeak.net>
Author: afayolle
Date: Wed Jan 3 14:04:55 2007
New Revision: 36118
Modified:
pypy/extradoc/sprintinfo/leysin-winter-2007/people.txt
Log:
Woops, I had forgotten to check this in
Modified: pypy/extradoc/sprintinfo/leysin-winter-2007/people.txt
==============================================================================
--- pypy/extradoc/sprintinfo/leysin-winter-2007/people.txt (original)
+++ pypy/extradoc/sprintinfo/leysin-winter-2007/people.txt Wed Jan 3 14:04:55 2007
@@ -27,6 +27,8 @@
Carl Friedrich Bolz 5th-14th Ermina
Guido Wesdorp 6th-14th Ermina
Leonardo Santagada 6th-14th Ermina
+Alexandre Fayolle 8th-12th Ermina
+Sylvain Th?nault 8th-12th Ermina
==================== ============== =====================
People on the following list were present at previous sprints:
@@ -38,8 +40,6 @@
Michael Hudson ? ?
Anders Lehmann ? ?
Niklaus Haldimann ? ?
-Aurelien Campeas ? ?
-Alexandre Fayolle ? ?
Lene Wagner ? ?
Amaury Forgeot d'Arc ? ?
Valentino Volonghi ? ?
From arigo at codespeak.net Wed Jan 3 16:16:45 2007
From: arigo at codespeak.net (arigo at codespeak.net)
Date: Wed, 3 Jan 2007 16:16:45 +0100 (CET)
Subject: [pypy-svn] r36119 - pypy/dist/pypy/rpython/memory
Message-ID: <20070103151645.25AB110068@code0.codespeak.net>
Author: arigo
Date: Wed Jan 3 16:16:43 2007
New Revision: 36119
Modified:
pypy/dist/pypy/rpython/memory/gc.py
Log:
Fix a complete bug in x_become(): replace the old object with the new one
*before* we follow a pointer... otherwise the new object can be freed!
Modified: pypy/dist/pypy/rpython/memory/gc.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gc.py (original)
+++ pypy/dist/pypy/rpython/memory/gc.py Wed Jan 3 16:16:43 2007
@@ -530,7 +530,8 @@
item = obj + itemlength * i
j = 0
while j < len(offsets):
- objects.append((item + offsets[j]).address[0])
+ pointer = item + offsets[j]
+ objects.append(pointer.address[0])
j += 1
i += 1
@@ -733,13 +734,13 @@
i = 0
while i < len(offsets):
pointer = obj + offsets[i]
- objects.append(pointer.address[0])
# -------------------------------------------------
# begin difference from collect
if pointer.address[0] == target_addr:
pointer.address[0] = source_addr
# end difference from collect
# -------------------------------------------------
+ objects.append(pointer.address[0])
i += 1
if self.is_varsize(typeid):
offset = self.varsize_offset_to_variable_part(
@@ -753,14 +754,14 @@
item = obj + itemlength * i
j = 0
while j < len(offsets):
- objects.append((item + offsets[j]).address[0])
+ pointer = item + offsets[j]
# -------------------------------------------------
# begin difference from collect
- pointer = item + offsets[j]
if pointer.address[0] == target_addr:
pointer.address[0] = source_addr
## end difference from collect
# -------------------------------------------------
+ objects.append(pointer.address[0])
j += 1
i += 1
From arigo at codespeak.net Wed Jan 3 16:26:44 2007
From: arigo at codespeak.net (arigo at codespeak.net)
Date: Wed, 3 Jan 2007 16:26:44 +0100 (CET)
Subject: [pypy-svn] r36120 - in pypy/dist/pypy: rlib/rctypes
rlib/rctypes/test rpython rpython/lltypesystem
rpython/lltypesystem/test rpython/memory
rpython/memory/gctransform rpython/memory/gctransform/test
translator/c translator/llvm
Message-ID: <20070103152644.0DAA610068@code0.codespeak.net>
Author: arigo
Date: Wed Jan 3 16:26:37 2007
New Revision: 36120
Modified:
pypy/dist/pypy/rlib/rctypes/rctypesobject.py
pypy/dist/pypy/rlib/rctypes/test/test_rctypesobject.py
pypy/dist/pypy/rpython/llinterp.py
pypy/dist/pypy/rpython/lltypesystem/llmemory.py
pypy/dist/pypy/rpython/lltypesystem/lltype.py
pypy/dist/pypy/rpython/lltypesystem/test/test_llmemory.py
pypy/dist/pypy/rpython/memory/gcheader.py
pypy/dist/pypy/rpython/memory/gctransform/framework.py
pypy/dist/pypy/rpython/memory/gctransform/test/test_framework.py
pypy/dist/pypy/translator/c/database.py
pypy/dist/pypy/translator/c/primitive.py
pypy/dist/pypy/translator/llvm/database.py
Log:
Simplification of llmemory, triggered by the fact that two addresses
would compare as different if they were obtained in different ways,
even if they pointed to the same final object.
The 'offset' field of fakeaddress is gone, and 'ob' is renamed to 'ptr'.
It's always just a pointer. With the new stuff in lltype like
direct_fieldptr() we can take pointers to fields, or array items, so no
need for anything more.
Hack a bit for arenas and address-of-length-of-array.
A new test in rctypesobject that triggered this whole thing,
and implementation of recursive data structures.
llvm/database.py updated but not tested (will do so on another machine).
gctransform/test/test_framework took ages because of the llinterpretation
of a raw_memclear() of the root stack, with 160'000 items!
Trying to do something cleaner about raw_memcopy() in llmemory.py.
Modified: pypy/dist/pypy/rlib/rctypes/rctypesobject.py
==============================================================================
--- pypy/dist/pypy/rlib/rctypes/rctypesobject.py (original)
+++ pypy/dist/pypy/rlib/rctypes/rctypesobject.py Wed Jan 3 16:26:37 2007
@@ -242,35 +242,29 @@
try:
return contentscls._ptrcls
except AttributeError:
- assert issubclass(contentscls, RCTypesObject)
- if contentscls in _abstract_classes:
- raise Exception("cannot call RPointer(%s) or "
- "pointer(x) if x degenerated to the base "
- "%s class" % (contentscls.__name__,
- contentscls.__name__,))
class RCTypesPtr(RCTypesObject):
- CONTENTS = contentscls.CDATATYPE
- LLTYPE = lltype.Ptr(CONTENTS)
+ LLTYPE = lltype.Ptr(lltype.ForwardReference())
num_keepalives = 1
+ setpointertype = classmethod(_rpointer_set_pointer_type)
def get_contents(self):
ptr = self.ll_ref(RCTypesPtr.CDATATYPE)
targetaddr = llmemory.cast_ptr_to_adr(ptr[0])
keepalive_until_here(self)
- targetkeepalives = contentscls.num_keepalives
+ targetkeepalives = RCTypesPtr.CONTENTSCLS.num_keepalives
targetmemblock = self._getmemblock(0, targetkeepalives)
- return contentscls(targetaddr, targetmemblock)
+ return RCTypesPtr.CONTENTSCLS(targetaddr, targetmemblock)
def ref(self, index):
ptr = self.ll_ref(RCTypesPtr.CDATATYPE)
targetaddr = llmemory.cast_ptr_to_adr(ptr[0])
if index:
- targetaddr += ofs_item * index
+ targetaddr += self._OFS_ITEM * index
keepalive_until_here(self)
- targetkeepalives = contentscls.num_keepalives
+ targetkeepalives = RCTypesPtr.CONTENTSCLS.num_keepalives
targetmemblock = self._getmemblock(0, targetkeepalives)
- return contentscls(targetaddr, targetmemblock)
+ return RCTypesPtr.CONTENTSCLS(targetaddr, targetmemblock)
def set_contents(self, newcontentsbox):
targetaddr = newcontentsbox.addr
@@ -293,11 +287,30 @@
keepalive_until_here(self)
self._keepalivememblock(0, None)
- ofs_item = llmemory.sizeof(contentscls.LLTYPE)
- contentscls._ptrcls = RCTypesPtr
+ if contentscls is None:
+ pass # forward pointer
+ else:
+ RCTypesPtr.setpointertype(contentscls)
return RCTypesPtr
RPointer._annspecialcase_ = 'specialize:memo'
+def _rpointer_set_pointer_type(RCTypesPtr, contentscls):
+ assert issubclass(contentscls, RCTypesObject)
+ if contentscls in _abstract_classes:
+ raise Exception("cannot call RPointer(%s) or "
+ "pointer(x) if x degenerated to the base "
+ "%s class" % (contentscls.__name__,
+ contentscls.__name__,))
+ RCTypesPtr.CONTENTSCLS = contentscls
+ RCTypesPtr.CONTENTS = contentscls.CDATATYPE
+ RCTypesPtr.LLTYPE.TO.become(RCTypesPtr.CONTENTS)
+ RCTypesPtr._OFS_ITEM = llmemory.sizeof(contentscls.LLTYPE)
+ RCTypesPtr.__name__ = 'RCTypes_%s' % (RCTypesPtr.LLTYPE,)
+ assert not hasattr(contentscls, '_ptrcls'), (
+ "the RPointer class corresponding to %r exists already" %
+ (contentscls,))
+ contentscls._ptrcls = RCTypesPtr
+
def pointer(x):
PTR = RPointer(x.__class__)
p = PTR.allocate()
Modified: pypy/dist/pypy/rlib/rctypes/test/test_rctypesobject.py
==============================================================================
--- pypy/dist/pypy/rlib/rctypes/test/test_rctypesobject.py (original)
+++ pypy/dist/pypy/rlib/rctypes/test/test_rctypesobject.py Wed Jan 3 16:26:37 2007
@@ -266,6 +266,18 @@
res = self.do(func)
assert res == 101
+ def test_recursive_structure(self):
+ P1 = RPointer(None)
+ S1 = RStruct('S1', [('next', P1)])
+ P1.setpointertype(S1)
+ def func():
+ s1 = S1.allocate()
+ s2 = S1.allocate()
+ s2.ref_next().set_contents(s1)
+ return s2.ref_next().get_contents().sameaddr(s1)
+ res = self.do(func)
+ assert res == True
+
POLICY = AnnotatorPolicy()
POLICY.allow_someobjects = False
Modified: pypy/dist/pypy/rpython/llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/llinterp.py (original)
+++ pypy/dist/pypy/rpython/llinterp.py Wed Jan 3 16:26:37 2007
@@ -571,8 +571,7 @@
def op_unsafe_call(self, TGT, f):
checkadr(f)
- assert f.offset is None
- obj = self.llinterpreter.typer.type_system.deref(f.ob)
+ obj = self.llinterpreter.typer.type_system.deref(f.ref())
assert hasattr(obj, 'graph') # don't want to think about that
graph = obj.graph
args = []
@@ -670,8 +669,8 @@
def op_gc_call_rtti_destructor(self, rtti, addr):
if hasattr(rtti._obj, 'destructor_funcptr'):
d = rtti._obj.destructor_funcptr
- ob = addr.get()
- return self.op_direct_call(d, ob)
+ obptr = addr.ref()
+ return self.op_direct_call(d, obptr)
def op_gc_deallocate(self, TYPE, addr):
raise NotImplementedError("gc_deallocate")
Modified: pypy/dist/pypy/rpython/lltypesystem/llmemory.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/llmemory.py (original)
+++ pypy/dist/pypy/rpython/lltypesystem/llmemory.py Wed Jan 3 16:26:37 2007
@@ -4,6 +4,7 @@
# sizeof, offsetof
+import weakref
from pypy.rlib.objectmodel import Symbolic
from pypy.rpython.lltypesystem import lltype
@@ -21,11 +22,12 @@
return NotImplemented
return CompositeOffset(self, other)
- def raw_malloc(self, rest):
+ def raw_malloc(self, rest, zero):
raise NotImplementedError("raw_malloc(%r, %r)" % (self, rest))
- def raw_memclear(self, adr):
- raise NotImplementedError("raw_memclear(%r, %r)" % (self, adr))
+ def raw_memcopy(self, srcadr, dstsrc):
+ raise NotImplementedError("raw_memcopy(%r)" % (self,))
+
class ItemOffset(AddressOffset):
@@ -46,56 +48,57 @@
def __neg__(self):
return ItemOffset(self.TYPE, -self.repeat)
- def ref(self, firstitemref):
- if isinstance(firstitemref, _obref):
- parent, index = lltype.parentlink(firstitemref.ob._obj)
- if parent is None:
- raise TypeError("address + itemoffset: not the address"
- " of an array")
- A = lltype.typeOf(parent)
- assert isinstance(A, (lltype.Array, lltype.FixedSizeArray))
+ def ref(self, firstitemptr):
+ A = lltype.typeOf(firstitemptr).TO
+ if A == self.TYPE:
+ # for array of containers
+ parent, index = lltype.parentlink(firstitemptr._obj)
+ assert parent, "%r is not within a container" % (firstitemptr,)
+ assert isinstance(lltype.typeOf(parent),
+ (lltype.Array, lltype.FixedSizeArray)), (
+ "%r is not within an array" % (firstitemptr,))
if isinstance(index, str):
- assert index.startswith("item")
- index = int(index[4:]) # "itemN" => N
- firstitemref = _arrayitemref(parent._as_ptr(), index)
- assert isinstance(firstitemref, _arrayitemref)
- array = firstitemref.array
- assert lltype.typeOf(array).TO.OF == self.TYPE
- index = firstitemref.index + self.repeat
- return _arrayitemref(array, index)
+ assert index.startswith('item') # itemN => N
+ index = int(index[4:])
+ return parent.getitem(index + self.repeat)._as_ptr()
+ elif isinstance(A, lltype.FixedSizeArray) and A.OF == self.TYPE:
+ # for array of primitives or pointers
+ return lltype.direct_ptradd(firstitemptr, self.repeat)
+ else:
+ raise TypeError('got %r, expected %r' % (A, self.TYPE))
- def raw_malloc(self, rest):
+ def raw_malloc(self, rest, zero):
assert not rest
if (isinstance(self.TYPE, lltype.ContainerType)
and self.TYPE._gckind == 'gc'):
assert self.repeat == 1
- p = lltype.malloc(self.TYPE, flavor='raw')
+ p = lltype.malloc(self.TYPE, flavor='raw', zero=zero)
return cast_ptr_to_adr(p)
else:
T = lltype.FixedSizeArray(self.TYPE, self.repeat)
- p = lltype.malloc(T, flavor='raw')
+ p = lltype.malloc(T, flavor='raw', zero=zero)
array_adr = cast_ptr_to_adr(p)
return array_adr + ArrayItemsOffset(T)
- def raw_memclear(self, adr):
- if (isinstance(self.TYPE, lltype.ContainerType) and self.repeat == 1):
- from pypy.rpython.rctypes.rmodel import reccopy
- fresh = lltype.malloc(self.TYPE, flavor='raw', zero=True)
- reccopy(fresh, adr.get())
- else:
- assert adr.offset is not None
- if isinstance(adr.offset, ArrayItemsOffset):
- array = adr.ob
- elif isinstance(adr.offset, CompositeOffset):
- array = (adr + -adr.offset.offsets[-1]).get()
- if isinstance(self.TYPE, lltype.ContainerType):
- fresh = lltype.malloc(self.TYPE, flavor='raw', zero=True)
- for i in range(self.repeat):
- reccopy(fresh, array[i])
- else:
- for i in range(self.repeat):
- array[i] = self.TYPE._defl()
-
+ def raw_memcopy(self, srcadr, dstadr):
+ repeat = self.repeat
+ if repeat == 0:
+ return
+ from pypy.rpython.rctypes.rmodel import reccopy
+ if isinstance(self.TYPE, lltype.ContainerType):
+ PTR = lltype.Ptr(self.TYPE)
+ else:
+ PTR = lltype.Ptr(lltype.FixedSizeArray(self.TYPE, 1))
+ while True:
+ src = cast_adr_to_ptr(srcadr, PTR)
+ dst = cast_adr_to_ptr(dstadr, PTR)
+ reccopy(src, dst)
+ repeat -= 1
+ if repeat <= 0:
+ break
+ srcadr += ItemOffset(self.TYPE)
+ dstadr += ItemOffset(self.TYPE)
+
class FieldOffset(AddressOffset):
@@ -106,33 +109,31 @@
def __repr__(self):
return "" % (self.TYPE, self.fldname)
- def ref(self, containerref):
- struct = containerref.get()
+ def ref(self, struct):
if lltype.typeOf(struct).TO != self.TYPE:
struct = lltype.cast_pointer(lltype.Ptr(self.TYPE), struct)
- return _structfieldref(struct, self.fldname)
+ FIELD = getattr(self.TYPE, self.fldname)
+ if isinstance(FIELD, lltype.ContainerType):
+ return getattr(struct, self.fldname)
+ else:
+ return lltype.direct_fieldptr(struct, self.fldname)
- def raw_malloc(self, rest, parenttype=None):
+ def raw_malloc(self, rest, parenttype=None, zero=False):
if self.fldname != self.TYPE._arrayfld:
- return AddressOffset.raw_malloc(self, rest) # for the error msg
+ # for the error msg
+ return AddressOffset.raw_malloc(self, rest, zero=zero)
assert rest
- return rest[0].raw_malloc(rest[1:], parenttype=parenttype or self.TYPE)
+ return rest[0].raw_malloc(rest[1:], parenttype=parenttype or self.TYPE,
+ zero=zero)
- def raw_memclear(self, adr):
+ def raw_memcopy(self, srcadr, dstadr):
if self.fldname != self.TYPE._arrayfld:
- return AddressOffset.raw_memclear(adr) # for the error msg
- structptr = adr.get()
- for name in self.TYPE._names[:-1]:
- FIELDTYPE = getattr(self.TYPE, name)
- if isinstance(FIELDTYPE, lltype.ContainerType):
- fresh = lltype.malloc(FIELDTYPE, raw=True, zero=True)
- from pypy.rpython.rctypes.rmodel import reccopy
- fresh = lltype.malloc(self.TYPE, flavor='raw', zero=True)
- reccopy(fresh, getattr(structptr, name)._obj)
- else:
- setattr(structptr, name, FIELDTYPE._defl())
-
-
+ return AddressOffset.raw_memcopy(srcadr, dstadr) #for the error msg
+ PTR = lltype.Ptr(self.TYPE)
+ src = cast_adr_to_ptr(srcadr, PTR)
+ dst = cast_adr_to_ptr(dstadr, PTR)
+ from pypy.rpython.rctypes.rmodel import reccopy
+ reccopy(src, dst)
class CompositeOffset(AddressOffset):
@@ -165,19 +166,21 @@
ofs.reverse()
return CompositeOffset(*ofs)
- def ref(self, ref):
+ def ref(self, ptr):
for item in self.offsets:
- ref = item.ref(ref)
- return ref
+ ptr = item.ref(ptr)
+ return ptr
- def raw_malloc(self, rest):
- return self.offsets[0].raw_malloc(self.offsets[1:] + rest)
+ def raw_malloc(self, rest, zero):
+ return self.offsets[0].raw_malloc(self.offsets[1:] + rest, zero=zero)
- def raw_memclear(self, adr):
+ def raw_memcopy(self, srcadr, dstadr):
for o in self.offsets[:-1]:
- o.raw_memclear(adr)
- adr += o
- o.raw_memclear(adr)
+ o.raw_memcopy(srcadr, dstadr)
+ srcadr += o
+ dstadr += o
+ o = self.offsets[-1]
+ o.raw_memcopy(srcadr, dstadr)
class ArrayItemsOffset(AddressOffset):
@@ -188,12 +191,14 @@
def __repr__(self):
return '< ArrayItemsOffset %r >' % (self.TYPE,)
- def ref(self, arrayref):
- array = arrayref.get()
- assert lltype.typeOf(array).TO == self.TYPE
- return _arrayitemref(array, index=0)
+ def ref(self, arrayptr):
+ assert lltype.typeOf(arrayptr).TO == self.TYPE
+ if isinstance(self.TYPE.OF, lltype.ContainerType):
+ return arrayptr[0]
+ else:
+ return lltype.direct_arrayitems(arrayptr)
- def raw_malloc(self, rest, parenttype=None):
+ def raw_malloc(self, rest, parenttype=None, zero=False):
if rest:
assert len(rest) == 1
assert isinstance(rest[0], ItemOffset)
@@ -204,11 +209,12 @@
if self.TYPE._hints.get('isrpystring'):
count -= 1 # because malloc() will give us the extra char for free
p = lltype.malloc(parenttype or self.TYPE, count,
- immortal = self.TYPE._gckind == 'raw')
+ immortal = self.TYPE._gckind == 'raw',
+ zero = zero)
return cast_ptr_to_adr(p)
- def raw_memclear(self, adr):
- # should really zero out the length field, but we can't
+ def raw_memcopy(self, srcadr, dstadr):
+ # should really copy the length field, but we can't
pass
@@ -220,10 +226,9 @@
def __repr__(self):
return '< ArrayLengthOffset %r >' % (self.TYPE,)
- def ref(self, arrayref):
- array = arrayref.get()
- assert lltype.typeOf(array).TO == self.TYPE
- return _arraylenref(array)
+ def ref(self, arrayptr):
+ assert lltype.typeOf(arrayptr).TO == self.TYPE
+ return lltype._arraylenref._makeptr(arrayptr._obj, arrayptr._solid)
class GCHeaderOffset(AddressOffset):
@@ -236,22 +241,21 @@
def __neg__(self):
return GCHeaderAntiOffset(self.gcheaderbuilder)
- def ref(self, headerref):
- header = headerref.get()
- gcptr = self.gcheaderbuilder.object_from_header(header)
- return _obref(gcptr)
+ def ref(self, headerptr):
+ gcptr = self.gcheaderbuilder.object_from_header(headerptr)
+ return gcptr
- def raw_malloc(self, rest):
+ def raw_malloc(self, rest, zero):
assert rest
if isinstance(rest[0], GCHeaderAntiOffset):
- return rest[1].raw_malloc(rest[2:]) # just for fun
- gcobjadr = rest[0].raw_malloc(rest[1:])
- headerptr = self.gcheaderbuilder.new_header(gcobjadr.get())
+ return rest[1].raw_malloc(rest[2:], zero=zero) # just for fun
+ gcobjadr = rest[0].raw_malloc(rest[1:], zero=zero)
+ headerptr = self.gcheaderbuilder.new_header(gcobjadr.ptr)
return cast_ptr_to_adr(headerptr)
- def raw_memclear(self, adr):
- headerptr = adr.get()
- sizeof(lltype.typeOf(headerptr).TO).raw_memclear(cast_ptr_to_adr(headerptr))
+ def raw_memcopy(self, srcadr, dstadr):
+ from pypy.rpython.rctypes.rmodel import reccopy
+ reccopy(srcadr.ptr, dstadr.ptr)
class GCHeaderAntiOffset(AddressOffset):
def __init__(self, gcheaderbuilder):
@@ -263,85 +267,14 @@
def __neg__(self):
return GCHeaderOffset(self.gcheaderbuilder)
- def ref(self, gcptrref):
- gcptr = gcptrref.get()
+ def ref(self, gcptr):
headerptr = self.gcheaderbuilder.header_of_object(gcptr)
- return _obref(headerptr)
+ return headerptr
- def raw_malloc(self, rest):
+ def raw_malloc(self, rest, zero):
assert len(rest) >= 2
assert isinstance(rest[0], GCHeaderOffset)
- return rest[1].raw_malloc(rest[2:])
-
-
-class _arrayitemref(object):
- def __init__(self, array, index):
- self.array = array
- self.index = index
- def get(self):
- return self.array[self.index]
- def set(self, value):
- self.array[self.index] = value
- def __eq__(self, other):
- if self.__class__ is not other.__class__:
- return False
- return self.array._same_obj(other.array) and \
- self.index == other.index
- def __ne__(self, other):
- return not (self == other)
- def type(self):
- return lltype.typeOf(self.array).TO.OF
-
-class _arraylenref(object):
- def __init__(self, array):
- self.array = array
- def get(self):
- return len(self.array)
- def set(self, value):
- if value != len(self.array):
- raise Exception("can't change the length of an array")
- def __eq__(self, other):
- if self.__class__ is not other.__class__:
- return False
- return self.array._same_obj(other.array)
- def __ne__(self, other):
- return not (self == other)
- def type(self):
- return lltype.Signed
-
-class _structfieldref(object):
- def __init__(self, struct, fieldname):
- self.struct = struct
- self.fieldname = fieldname
- def get(self):
- return getattr(self.struct, self.fieldname)
- def set(self, value):
- setattr(self.struct, self.fieldname, value)
- def __eq__(self, other):
- if self.__class__ is not other.__class__:
- return False
- return self.struct._same_obj(other.struct) and \
- self.fieldname == other.fieldname
- def __ne__(self, other):
- return not (self == other)
- def type(self):
- return getattr(lltype.typeOf(self.struct).TO, self.fieldname)
-
-class _obref(object):
- def __init__(self, ob):
- self.ob = ob
- def get(self):
- return self.ob
- def set(self, value):
- raise Exception("can't assign to whole object")
- def __eq__(self, other):
-