1.1 --- a/test.py Mon Sep 01 01:32:32 2008 +0200
1.2 +++ b/test.py Thu Sep 04 19:44:39 2008 +0200
1.3 @@ -27,15 +27,17 @@
1.4 print "%6d" % (len(table_slice) - table_slice.count(None)), \
1.5 "".join(entry and "#" or "_" for entry in table_slice)
1.6
1.7 -def machine(importer):
1.8 +def machine(importer, with_builtins=0, optimisations=None):
1.9 print "Making the image..."
1.10 - make(importer)
1.11 - rc = raw(importer.get_image())
1.12 - print "Getting raw tables..."
1.13 - objtable = importer.get_object_table().as_raw()
1.14 - paramtable = importer.get_parameter_table().as_raw()
1.15 + make(importer, with_builtins, optimisations)
1.16 + print "Getting raw structures..."
1.17 + ot = importer.get_object_table()
1.18 + pt = importer.get_parameter_table()
1.19 + objlist = ot.as_raw()
1.20 + paramlist = pt.as_raw()
1.21 + rc = raw(importer.get_image(), ot, pt)
1.22 print "Initialising the machine..."
1.23 - rm = rsvp.RSVPMachine(rc, objtable, paramtable)
1.24 + rm = rsvp.RSVPMachine(rc, objlist, paramlist)
1.25 rm.pc = importer.code_location
1.26 return rm
1.27