cmucl-cvs September 2016

cmucl-cvs@common-lisp.net

1 participants
25 discussions

[Git][cmucl/cmucl][master] 3 commits: Fix #27: PATHNAME-MATCH-P loops for logical pathnames
by Raymond Toy 04 Sep '16

04 Sep '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: c07cad4b by Raymond Toy at 2016-09-03T19:51:47-07:00 Fix #27: PATHNAME-MATCH-P loops for logical pathnames When support for search-lists was added to PATHNAME-MATCH-P, support for logical pathnames was broken because PATHNAME-MATCH-P eventually calls TRANSLATE-LOGICAL-PATHNAME which calls PATHNAME-MATCH-P with logical pathnames. This caused infinite recursion. So add back the original PATHNAME-MATCH-P, but rename to %PATHNAME-MATCH-P and use that in TRANSLATE-LOGICAL-PATHNAME and friends. Add test for this case too. - - - - - 37c549c6 by Raymond Toy at 2016-09-04T13:43:03-07:00 Factor out the common part of pathname-match-p. - - - - - efc9519f by Raymond Toy at 2016-09-04T20:48:35+00:00 Merge branch 'rtoy-fix-27-pathname-match-p' into 'master' Fix #27: pathname-match-p infinite recursion When support for search-lists was added to `PATHNAME-MATCH-P`, support for logical pathnames was broken because `PATHNAME-MATCH-P` eventually calls `TRANSLATE-LOGICAL-PATHNAME` which calls `PATHNAME-MATCH-P` with logical pathnames. This caused infinite recursion. So add back the original `PATHNAME-MATCH-P`, but rename to `%PATHNAME-MATCH-P` and use that in `TRANSLATE-LOGICAL-PATHNAME` and friends. Add test for this case too. See merge request !10 - - - - - 2 changed files: - src/code/pathname.lisp - tests/pathname.lisp Changes: ===================================== src/code/pathname.lisp ===================================== --- a/src/code/pathname.lisp +++ b/src/code/pathname.lisp @@ -1219,6 +1219,32 @@ a host-structure or string." (:version (frob (%pathname-version pathname))))))) +(defun %%pathname-match-p (pathname wildname) + (macrolet ((frob (field &optional (op 'components-match )) + `(or (null (,field wildname)) + (,op (,field pathname) (,field wildname))))) + (and (or (null (%pathname-host wildname)) + (eq (%pathname-host wildname) (%pathname-host pathname))) + (frob %pathname-device) + (frob %pathname-directory directory-components-match) + (frob %pathname-name) + (frob %pathname-type) + (frob %pathname-version)))) + +;; Like PATHNAME-MATCH-P but the pathnames should not be search-lists. +;; Primarily intended for TRANSLATE-LOGICAL-PATHNAME and friends, +;; because PATHNAME-MATCH-P calls TRANSLATE-LOGICAL-PATHNAME, causing +;; infinite recursion. +(defun %pathname-match-p (in-pathname in-wildname) + "Pathname matches the wildname template?" + (declare (type path-designator in-pathname) + ;; Not path-designator because a file-stream can't have a + ;; wild pathname. + (type (or string pathname) in-wildname)) + (with-pathname (pathname in-pathname) + (with-pathname (wildname in-wildname) + (%%pathname-match-p pathname wildname)))) + ;;; PATHNAME-MATCH-P -- Interface ;;; (defun pathname-match-p (in-pathname in-wildname) @@ -1231,17 +1257,8 @@ a host-structure or string." (enumerate-search-list (pathname in-path) (with-pathname (in-wild in-wildname) (enumerate-search-list (wildname in-wild) - (macrolet ((frob (field &optional (op 'components-match )) - `(or (null (,field wildname)) - (,op (,field pathname) (,field wildname))))) - (when (and (or (null (%pathname-host wildname)) - (eq (%pathname-host wildname) (%pathname-host pathname))) - (frob %pathname-device) - (frob %pathname-directory directory-components-match) - (frob %pathname-name) - (frob %pathname-type) - (frob %pathname-version)) - (return-from pathname-match-p pathname)))))))) + (when (%%pathname-match-p pathname wildname) + (return-from pathname-match-p pathname))))))) ;;; SUBSTITUTE-INTO -- Internal @@ -1476,7 +1493,7 @@ a host-structure or string." (with-pathname (source source) (with-pathname (from from-wildname) (with-pathname (to to-wildname) - (unless (pathname-match-p source from) + (unless (%pathname-match-p source from) (didnt-match-error source from)) (let* ((source-host (%pathname-host source)) (to-host (%pathname-host to)) @@ -2171,7 +2188,7 @@ a host-structure or string." :format-control (intl:gettext "No translation for ~S") :format-arguments (list pathname))) (destructuring-bind (from to) x - (when (pathname-match-p pathname from) + (when (%pathname-match-p pathname from) (return (translate-logical-pathname (translate-pathname pathname from to))))))) (pathname pathname) ===================================== tests/pathname.lisp ===================================== --- a/tests/pathname.lisp +++ b/tests/pathname.lisp @@ -41,3 +41,35 @@ ;; Tests where both args are search-lists. (assert-true "foo:foo.lisp" "bar:*")) + +;; Verify PATHNAME-MATCH-P works with logical pathnames. (Issue 27) +;; This test modeled after a test from asdf +(defun setup-logical-host () + (let ((root *default-pathname-defaults*) + (bin-type (pathname-type (compile-file-pathname "foo.lisp")))) + (setf (logical-pathname-translations "ASDFTEST") + `((,(format nil "**;*.~a" bin-type) + ,(merge-pathnames (make-pathname :directory '(:relative :wild-inferiors) + :name :wild :type bin-type :version nil))) + (,(format nil "**;*.~a.*" bin-type) + ,(merge-pathnames (make-pathname :directory '(:relative "asdf-bin" :wild-inferiors) + :name :wild :type bin-type + :defaults root))) + ("**;*.*.*" + ,(merge-pathnames (make-pathname :directory '(:relative "asdf-src" :wild-inferiors) + :name :wild :type :wild :version :wild))) + ("**;*.*" + ,(merge-pathnames (make-pathname :directory '(:relative "asdf-src" :wild-inferiors) + :name :wild :type :wild :version nil))) + ("**;*" + ,(merge-pathnames (make-pathname :directory '(:relative "asdf-src" :wild-inferiors) + :name :wild :type nil :version nil))))))) +(setup-logical-host) + +(define-test pathname-match-p.logical-pathname + (assert-true (pathname-match-p + (make-pathname :host "ASDFTEST" + :directory '(:absolute "system2" "module4") + :name nil :type nil) + (parse-namestring "ASDFTEST:system2;module4;")))) + View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/a8934d1590ee605e2f4f0207…

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-fix-27-pathname-match-p
by Raymond Toy 04 Sep '16

04 Sep '16

Raymond Toy pushed new branch rtoy-fix-27-pathname-match-p at cmucl / cmucl

1 0

[Git][cmucl/cmucl][master] 3 commits: Fix #28: Recursive function definition in cross-compile
by Raymond Toy 03 Sep '16

03 Sep '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 2482e5f0 by Raymond Toy at 2016-09-03T10:55:25-07:00 Fix #28: Recursive function definition in cross-compile The recursive definition comes from %single-float and %double-float trying to coerce a double-double-float to a single or double. Not sure the best place to fix this, but added a special case here for %single-float and %double-float to convert the double-double-float to a double that can then be coerced to the appropriate type. (Could have added a deftransform for coerce to handle double-doubles, but doing it here makes it easier to follow the code.) Verified that x86->x86 and sparc->sparc cross-compiles no longer have the warning. Also verified that sparc->sparc actually cross-compiles and loads successfully and that the result will compile itself successfully. - - - - - 6c86016d by Raymond Toy at 2016-09-03T10:59:29-07:00 Add comment. - - - - - a8934d15 by Raymond Toy at 2016-09-03T18:01:25+00:00 Merge branch 'rtoy-28-fix-recursive-fcn-defn' into 'master' Fix #28: Recursive function definition Convert a `double-double` to a double before coercing to a `single-float` or `double-float`. See merge request !9 - - - - - 1 changed file: - src/code/float.lisp Changes: ===================================== src/code/float.lisp ===================================== --- a/src/code/float.lisp +++ b/src/code/float.lisp @@ -1047,9 +1047,15 @@ (number-dispatch ((x real)) (((foreach single-float double-float #+long-float long-float - #+double-double double-double-float fixnum)) (coerce x ',type)) + #+double-double + ((double-double-float) + ;; Convert the double-double to a double before + ;; coercing to the appropriate type. + (coerce (+ (double-double-hi x) + (double-double-lo x)) + ',type)) ((bignum) (bignum-to-float x ',type)) ((ratio) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/5beb6431855908e9010c36bc…

1 0

[Git][cmucl/cmucl][rtoy-28-fix-recursive-fcn-defn] Add comment.
by Raymond Toy 03 Sep '16

03 Sep '16

Raymond Toy pushed to branch rtoy-28-fix-recursive-fcn-defn at cmucl / cmucl Commits: 6c86016d by Raymond Toy at 2016-09-03T10:59:29-07:00 Add comment. - - - - - 1 changed file: - src/code/float.lisp Changes: ===================================== src/code/float.lisp ===================================== --- a/src/code/float.lisp +++ b/src/code/float.lisp @@ -1051,6 +1051,8 @@ (coerce x ',type)) #+double-double ((double-double-float) + ;; Convert the double-double to a double before + ;; coercing to the appropriate type. (coerce (+ (double-double-hi x) (double-double-lo x)) ',type)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/6c86016d677e5a39fc3fe2ddc…

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-28-fix-recursive-fcn-defn
by Raymond Toy 03 Sep '16

03 Sep '16

Raymond Toy pushed new branch rtoy-28-fix-recursive-fcn-defn at cmucl / cmucl

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs September 2016