[pypy-commit] lang-smalltalk stmgc-c7: passed arguments to image via own flag

Conrad Calmez noreply at buildbot.pypy.org
Thu Jul 10 17:17:26 CEST 2014


Author: Conrad Calmez <conrad at calmez.net>
Branch: stmgc-c7
Changeset: r891:ada1ec7e18d8
Date: 2014-07-10 17:17 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/ada1ec7e18d8/

Log:	passed arguments to image via own flag also fixes BSD-like argument
	parsing aka. you can put them in arbitrary order again

diff --git a/targetimageloadingsmalltalk.py b/targetimageloadingsmalltalk.py
--- a/targetimageloadingsmalltalk.py
+++ b/targetimageloadingsmalltalk.py
@@ -125,6 +125,7 @@
           -r|--run [code string]
           -b|--benchmark [code string]
           -p|--poll_events
+          -s|--smalltalk-args [argument to pass]
           [image path, default: Squeak.image]
     """ % argv[0]
 
@@ -148,9 +149,7 @@
 
     while idx < len(argv):
         arg = argv[idx]
-        if path is not None: # smalltalk args
-            smalltalk_args.append(arg)
-        elif arg in ["-h", "--help"]:
+        if arg in ["-h", "--help"]:
             _usage(argv)
             return 0
         elif arg in ["-j", "--jit"]:
@@ -184,6 +183,9 @@
             code = argv[idx + 1]
             as_benchmark = True
             idx += 1
+        elif arg in ["-s", "--smalltalk-args"]:
+            smalltalk_args.append(argv[idx + 1])
+            idx += 1
         elif path is None:
             path = argv[idx]
         else:


More information about the pypy-commit mailing list