From: Kevin Rosenberg <kevin@rosenberg.net>
Date: Mon, 12 May 2003 18:12:35 +0000 (+0000)
Subject: 0.8alpha.0.26:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=541c9393cf9d9b61271c5f087020d34547603a34;p=sbcl.git

0.8alpha.0.26:
     * sb-contrib/sb-aclrepl.asd:
         - Remove work-around for optimization notes
     * sb-contrib/{toplevel,repl}.lisp:
         - Rework fresh-line handling to accomodate that *repl-read-fun* causes
        a newline of which the output-stream is unaware.
---

diff --git a/contrib/sb-aclrepl/repl.lisp b/contrib/sb-aclrepl/repl.lisp
index 7ae4fa1..f5830db 100644
--- a/contrib/sb-aclrepl/repl.lisp
+++ b/contrib/sb-aclrepl/repl.lisp
@@ -144,7 +144,7 @@
     (maybe-return-history-cmd cmd cmd-args-string)))
 
 (defun maybe-return-history-cmd (cmd cmd-args-string)
-  (format *output* "~&~A" (user-cmd-input cmd))
+  (format *output* "~A~%" (user-cmd-input cmd))
   (let ((dont-redo
 	 (when (and (stringp cmd-args-string)
 		    (plusp (length cmd-args-string))
@@ -156,8 +156,8 @@
 		(when (string-equal line "N")
 		  t))
 	     (when line
-	       (format *output* "~&Type \"y\" for yes or \"n\" for no."))
-	     (format *output* "~&redo? [y] ")
+	       (format *output* "Type \"y\" for yes or \"n\" for no.~%"))
+	     (format *output* "redo? [y] ")
 	     (force-output *output*)))))
     (if dont-redo
 	*null-cmd*
@@ -815,7 +815,7 @@
 	  (error ()
 	    (format stream "~&Prompt error>  "))
 	  (:no-error (prompt)
-	    (format stream "~&~A" prompt))))))
+	    (format stream "~A" prompt))))))
   
 (defun process-cmd (user-cmd)
   ;; Processes a user command. Returns t if the user-cmd was a top-level
@@ -839,7 +839,7 @@
 	((functionp (user-cmd-func user-cmd))
 	 (add-to-history user-cmd)
 	 (apply (user-cmd-func user-cmd) (user-cmd-args user-cmd))
-	 (fresh-line)
+	 ;;(fresh-line)
 	 t)
 	(t
 	 (add-to-history user-cmd)
diff --git a/contrib/sb-aclrepl/sb-aclrepl.asd b/contrib/sb-aclrepl/sb-aclrepl.asd
index 0788dea..0c5b8f8 100644
--- a/contrib/sb-aclrepl/sb-aclrepl.asd
+++ b/contrib/sb-aclrepl/sb-aclrepl.asd
@@ -3,9 +3,6 @@
 (defpackage #:sb-aclrepl-system (:use #:asdf #:cl))
 (in-package #:sb-aclrepl-system)
 
-;; Work-around for optimization note from EQL specializer
-(declaim (optimize (sb-ext:inhibit-warnings 3)))
-
 (defsystem sb-aclrepl
     :author "Kevin Rosenberg <kevin@rosenberg.net>"
     :description "An AllegroCL compatible REPL"
@@ -25,5 +22,3 @@
 (defmethod perform ((o test-op) (c (eql (find-system :sb-aclrepl-tests))))
   (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
       (error "test-op failed")))
-
-(declaim (optimize (sb-ext:inhibit-warnings 0)))
diff --git a/contrib/sb-aclrepl/toplevel.lisp b/contrib/sb-aclrepl/toplevel.lisp
index 41d871c..b3f96f5 100644
--- a/contrib/sb-aclrepl/toplevel.lisp
+++ b/contrib/sb-aclrepl/toplevel.lisp
@@ -55,8 +55,10 @@
 	 (results (multiple-value-list (sb-impl::interactive-eval form))))
     (unless *noprint*
       (dolist (result results)
-	(fresh-line)
-	(prin1 result)))))
+	;; Don't fresh-line before a result, since newline was entered by user
+	;; in *repl-read-form-fun*
+	(prin1 result)
+	(fresh-line)))))
 
 (defun repl-fun (noprint)
   (repl :noprint noprint :break-level 0))
diff --git a/version.lisp-expr b/version.lisp-expr
index 25e32af..ca61423 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8alpha.0.25"
+"0.8alpha.0.26"