[pypy-svn] r44913 - in pypy/dist/pypy/lang/js: . test

[santagada at codespeak.net]

Author: santagada
Date: Tue Jul 10 18:00:10 2007
New Revision: 44913

Modified:
   pypy/dist/pypy/lang/js/js_interactive.py
   pypy/dist/pypy/lang/js/test/test_interactive.py
Log:


Modified: pypy/dist/pypy/lang/js/js_interactive.py
==============================================================================
--- pypy/dist/pypy/lang/js/js_interactive.py	(original)
+++ pypy/dist/pypy/lang/js/js_interactive.py	Tue Jul 10 18:00:10 2007
@@ -12,13 +12,6 @@
 from pypy.lang.js.jsobj import W_Builtin, W_String, ThrowException, w_Undefined
 from pypy.rlib.streamio import open_file_as_stream
 
-help_message = """
-PyPy's JavaScript Interpreter:
- -f filename - Loads a file
- -n to not be interactive
- -h show this help message
- -d jump to a pdb in case of failure
-"""
 import code
 sys.ps1 = 'js> '
 sys.ps2 = '... '
@@ -126,25 +119,26 @@
             banner = 'PyPy JavaScript Interpreter'
         code.InteractiveConsole.interact(self, banner)
 
-def main(inspect=False, filename=None, args=[]):
+def main(inspect=False, files=[]):
     jsi = JSInterpreter()
-    if filename is not None:
+    for filename in files:
         jsi.runcodefromfile(filename)
     if (filename is None) or inspect:
         jsi.interact()
 
 if __name__ == '__main__':
     from optparse import OptionParser
-    parser = OptionParser(usage='%prog [options] [file] [arg] ...',
+    parser = OptionParser(usage='%prog [options] [files] ...',
                           description='PyPy JavaScript Interpreter')
     parser.add_option('-i', dest='inspect',
-                      action='store_true', default=False,
-                      help='inspect interactively after running script')
+                    action='store_true', default=False,
+                    help='inspect interactively after running script')
+
     # ... (add other options)
     opts, args = parser.parse_args()
 
     if args:
-        main(inspect=opts.inspect, filename=args[0], args=args[1:])
+        main(inspect=opts.inspect, files=args)
     else:
         main(inspect=opts.inspect)
     sys.exit(0)

Modified: pypy/dist/pypy/lang/js/test/test_interactive.py
==============================================================================
--- pypy/dist/pypy/lang/js/test/test_interactive.py	(original)
+++ pypy/dist/pypy/lang/js/test/test_interactive.py	Tue Jul 10 18:00:10 2007
@@ -23,7 +23,7 @@
         return self._spawn(str(py.magic.autopath().dirpath().dirpath().join('js_interactive.py')), argv)
     
     def prompt_send(self, message):
-        self.child.expect('js-pypy>')
+        self.child.expect('js>')
         self.child.sendline(message)
     
     def expect(self, message):
@@ -33,7 +33,7 @@
         self.child.sendline(message)
     
     def continue_send(self, message):
-        self.child.expect('     ... ')
+        self.child.expect('...')
         self.child.sendline(message)
 
     def setup_method(cls, method):