Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/lisp

Pascal J. Bourguignon [2014-05-28 16:00]
Merge branch 'master' of ssh://git.informatimago.com/srv/git/public/lisp
Filename
common-lisp/lisp/stepper-functions.lisp
small-cl-pgms/Makefile
small-cl-pgms/wang.html.in
diff --git a/common-lisp/lisp/stepper-functions.lisp b/common-lisp/lisp/stepper-functions.lisp
index 31f684b..cdbc574 100644
--- a/common-lisp/lisp/stepper-functions.lisp
+++ b/common-lisp/lisp/stepper-functions.lisp
@@ -380,7 +380,7 @@ RETURN: VALUE
                 "Trace (t)" "Function (f)" "Run (r)"
                 "List (l)" "Eval (e)"  "Debugger (d)"
                 "Abort (a, q)")))
-  (let ((answer (string-trim " " (read-line *query-io*))))
+  (let ((answer (string-trim " " (progn (finish-output *query-io*) (read-line *query-io*)))))
     (cond
       ((member answer '("" "s" "si") :test (function string-equal))
        :step-into)
diff --git a/small-cl-pgms/Makefile b/small-cl-pgms/Makefile
index 8cc9e51..d81f25d 100644
--- a/small-cl-pgms/Makefile
+++ b/small-cl-pgms/Makefile
@@ -33,7 +33,7 @@
 ####****************************************************************************

 PREFIX=/usr/local
-TARGETS=index.html what-implementation
+TARGETS=index.html wang.html what-implementation
 HELPFORMAT="make %-20s \# %s\n"

 all::help
@@ -76,6 +76,8 @@ index.html.in:init.lisp index.lisp Makefile
 index.html:index.html.in
 	find . \( -name index.html.in -o -name aim-8.html.in \) -print | while read file ; do cp -v "$$file" "$$(echo $$file | sed -e 's/\.in$$//')" ; done

+wang.html:wang.html.in
+	@cp -av wang.html.in wang.html

 #(with-open-file (*STANDARD-OUTPUT* "index.html" :direction :output :if-exists :supersede :if-does-not-exist :create)

diff --git a/small-cl-pgms/wang.html.in b/small-cl-pgms/wang.html.in
index d4d1a02..23df366 100644
--- a/small-cl-pgms/wang.html.in
+++ b/small-cl-pgms/wang.html.in
@@ -28,7 +28,7 @@ all Lisp material from any time, thanks to the concensual approach of
 the Common Lisp standard.</p>

 <p>For example, here is how you can run a lisp program written in 1960
-in a Common Lisp of 2006.  Rendez-vous in 36 years to see how you can
+in a Common Lisp of 2014.  Rendez-vous in 28 years to see how you can
 run a 1996 perl program in perl 2042...</p>

 <p>This Wang's algorithm has been popularized by John McCarthy as an
@@ -233,7 +233,7 @@ T

 <p>Note, the output obviously differ in the form, but the semantics are
 the same, notably the result of the theorem function calls is "true"
-both in 2006 Common Lisp and in 1966 LISP 1.5. </p>
+both in 2014 Common Lisp and in 1966 LISP 1.5. </p>

 <p>You may also download the sources here:
 <ul>
ViewGit