ps: fix self-host and runtest.py parsing issue.

- make sure readline has large enough string for steps2-A - fix keyword? so that it doesn't leave anything extra on the stack - fix argparse command line parsing so that that the second '--' on the command line is not dropped.
Aegwenia · Oct 13, 2015 · 406761e · 406761e
1 parent edda92c
commit 406761e
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -140,7 +140,7 @@ miniMAL_RUNSTEP = miniMAL ../$(2) $(3)
 nim_RUNSTEP =     ../$(2) $(3)
 perl_RUNSTEP =    perl ../$(2) $(3)
 php_RUNSTEP =     php ../$(2) $(3)
-ps_RUNSTEP =      $(4)gs -q -I./ -dNODISPLAY -- ../$(2) $(3)$(4)
+ps_RUNSTEP =      gs -q -I./ -dNODISPLAY -- ../$(2) $(3)
 python_RUNSTEP =  $(PYTHON) ../$(2) $(3)
 r_RUNSTEP =       Rscript ../$(2) $(3)
 racket_RUNSTEP =  ../$(2) $(3)

diff --git a/ps/step1_read_print.ps b/ps/step1_read_print.ps
diff --git a/ps/step2_eval.ps b/ps/step2_eval.ps
diff --git a/ps/step3_env.ps b/ps/step3_env.ps
diff --git a/ps/step4_if_fn_do.ps b/ps/step4_if_fn_do.ps
diff --git a/ps/step5_tco.ps b/ps/step5_tco.ps
diff --git a/ps/step6_file.ps b/ps/step6_file.ps
diff --git a/ps/step7_quote.ps b/ps/step7_quote.ps
diff --git a/ps/step8_macros.ps b/ps/step8_macros.ps
diff --git a/ps/step9_try.ps b/ps/step9_try.ps
diff --git a/ps/stepA_mal.ps b/ps/stepA_mal.ps
diff --git a/ps/types.ps b/ps/types.ps
diff --git a/runtest.py b/runtest.py
@@ -182,8 +182,10 @@ def next(self):
 
         return self.form
 
-
 args = parser.parse_args(sys.argv[1:])
+# Workaround argparse issue with two '--' on command line
+if sys.argv.count('--') > 0:
+    args.mal_cmd = sys.argv[sys.argv.index('--')+1:]
 
 if args.rundir: os.chdir(args.rundir)