From 3f321528f3da20ce000bb5e0d42bf5e204b3e696 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Sun, 30 Nov 2003 15:49:04 +0000 Subject: [PATCH] 0.8.6.18: ASDF-INSTALL fix (parse *proxy* properly, as per Sean Ross sbcl-devel 2003-10-23) ... start parse-integer at the right place SHOW patchery from Nikodemus Siivola (sbcl-devel 2003-11-28) --- NEWS | 2 ++ contrib/asdf-install/installer.lisp | 2 +- src/code/linux-os.lisp | 6 +++--- src/code/target-alieneval.lisp | 6 +++--- src/code/target-signal.lisp | 2 +- version.lisp-expr | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index 40a49d0..239beb5 100644 --- a/NEWS +++ b/NEWS @@ -2202,6 +2202,8 @@ changes in sbcl-0.8.7 relative to sbcl-0.8.6: * bug fix: buffered :DIRECTION :IO streams are less likely to become confused about their position. (thanks to Adam Warner and Gerd Moellmann) + * ASDF-INSTALL bug fix: now parses *PROXY* properly. (thanks to + Sean Ross) * fixed some bugs revealed by Paul Dietz' test suite: ** the value of the :REHASH-THRESHOLD argument to MAKE-HASH-TABLE is ignored if it is too small, rather than propagating through diff --git a/contrib/asdf-install/installer.lisp b/contrib/asdf-install/installer.lisp index 5e7f970..656c913 100644 --- a/contrib/asdf-install/installer.lisp +++ b/contrib/asdf-install/installer.lisp @@ -99,7 +99,7 @@ (defun url-port (url) (assert (string-equal url "http://" :end1 7)) (let ((port-start (position #\: url :start 7))) - (if port-start (parse-integer url :start port-start :junk-allowed t) 80))) + (if port-start (parse-integer url :start (1+ port-start) :junk-allowed t) 80))) (defun url-connection (url) (let ((s (make-instance 'inet-socket :type :stream :protocol :tcp)) diff --git a/src/code/linux-os.lisp b/src/code/linux-os.lisp index 52610c7..2bfe083 100644 --- a/src/code/linux-os.lisp +++ b/src/code/linux-os.lisp @@ -34,9 +34,9 @@ :output stream)))))) (defun os-cold-init-or-reinit () ; KLUDGE: don't know what to do here - (/show "entering linux-os.lisp OS-COLD-INIT-OR-REINIT") + (/show0 "entering linux-os.lisp OS-COLD-INIT-OR-REINIT") (setf *software-version* nil) - (/show "setting *DEFAULT-PATHNAME-DEFAULTS*") + (/show0 "setting *DEFAULT-PATHNAME-DEFAULTS*") (setf *default-pathname-defaults* ;; (temporary value, so that #'PATHNAME won't blow up when ;; we call it below:) @@ -44,7 +44,7 @@ *default-pathname-defaults* ;; (final value, constructed using #'PATHNAME:) (pathname (sb!unix:posix-getcwd/))) - (/show "leaving linux-os.lisp OS-COLD-INIT-OR-REINIT")) + (/show0 "leaving linux-os.lisp OS-COLD-INIT-OR-REINIT")) ;;; Return system time, user time and number of page faults. (defun get-system-info () diff --git a/src/code/target-alieneval.lisp b/src/code/target-alieneval.lisp index ff91742..a25d4b9 100644 --- a/src/code/target-alieneval.lisp +++ b/src/code/target-alieneval.lisp @@ -137,7 +137,7 @@ `((setq ,symbol ,initial-value))) ,@body))))) (:extern - (/show ":EXTERN case") + (/show0 ":EXTERN case") (let ((info (make-heap-alien-info :type alien-type :sap-form `(foreign-symbol-address @@ -146,7 +146,7 @@ ((,symbol (%heap-alien ',info))) ,@body)))) (:local - (/show ":LOCAL case") + (/show0 ":LOCAL case") (let ((var (gensym)) (initval (if initial-value (gensym))) (info (make-local-alien-info :type alien-type))) @@ -164,7 +164,7 @@ (dispose-local-alien ',info ,var)))))))))))) (/show "revised" body) (verify-local-auxiliaries-okay) - (/show "back from VERIFY-LOCAL-AUXILIARIES-OK, returning") + (/show0 "back from VERIFY-LOCAL-AUXILIARIES-OK, returning") `(symbol-macrolet ((&auxiliary-type-definitions& ,(append *new-auxiliary-types* (auxiliary-type-definitions env)))) diff --git a/src/code/target-signal.lisp b/src/code/target-signal.lisp index cdcae59..c492023 100644 --- a/src/code/target-signal.lisp +++ b/src/code/target-signal.lisp @@ -91,7 +91,7 @@ `(defun ,name (signal info context) (declare (ignore signal info)) (declare (type system-area-pointer context)) - (/show "in Lisp-level signal handler" (sap-int context)) + (/show "in Lisp-level signal handler" ,(symbol-name name) (sap-int context)) (,function ,(concatenate 'simple-string what " at #X~X") (with-alien ((context (* os-context-t) context)) (sap-int (sb!vm:context-pc context))))))) diff --git a/version.lisp-expr b/version.lisp-expr index 6f2dbde..07e6d61 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.8.6.17" +"0.8.6.18" -- 1.7.10.4