1.1 --- a/test.py Mon Jun 09 21:09:37 2008 +0200
1.2 +++ b/test.py Mon Jun 16 01:56:46 2008 +0200
1.3 @@ -20,10 +20,10 @@
1.4 for i, x in enumerate(code):
1.5 print i, x
1.6
1.7 -def machine(code, code_location):
1.8 - rc = raw(code)
1.9 +def machine(importer):
1.10 + rc = raw(importer.code)
1.11 rm = rsvp.RSVPMachine(rc)
1.12 - rm.pc = code_location
1.13 + rm.pc = importer.code_location
1.14 return rm
1.15
1.16 def attrs(obj):
1.17 @@ -40,7 +40,8 @@
1.18 requested_optimisations = []
1.19 for arg in args:
1.20 if arg.startswith("-o"):
1.21 - requested_optimisations.append(arg[2:])
1.22 + for arg_part in arg[2:].split(","):
1.23 + requested_optimisations.append(arg_part)
1.24
1.25 try:
1.26 builtins = i.load_from_file("lib/builtins.py", "__builtins__")