September 2016 - cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl][master] 3 commits: Add documentation for run-program
by Raymond Toy 27 Sep '16

27 Sep '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: a773ea60 by Raymond Toy at 2016-09-26T19:50:47-07:00 Add documentation for run-program * Document :input and :output behavior when they are string streams. * Document :element-type and :external-format - - - - - 48c1dd59 by Raymond Toy at 2016-09-26T19:51:12-07:00 Update the date Prepare for release 21b. - - - - - 1b8f72ed by Raymond Toy at 2016-09-26T20:03:24-07:00 Update from logs Fix some typos too. - - - - - 3 changed files: - src/docs/cmu-user/cmu-user.tex - src/docs/cmu-user/extensions.tex - src/general-info/release-21b.txt Changes: ===================================== src/docs/cmu-user/cmu-user.tex ===================================== --- a/src/docs/cmu-user/cmu-user.tex +++ b/src/docs/cmu-user/cmu-user.tex @@ -48,7 +48,7 @@ \newcommand{\keywords}{lisp, Common Lisp, manual, compiler, programming language implementation, programming environment} -\date{October 2014 \\ 20f} +\date{October 2016 \\ 21b} \begin{document} ===================================== src/docs/cmu-user/extensions.tex ===================================== --- a/src/docs/cmu-user/extensions.tex +++ b/src/docs/cmu-user/extensions.tex @@ -1099,7 +1099,8 @@ It is possible to run programs from Lisp by using the following function. \morekeys{\kwd{if-input-does-not-exist}} \yetmorekeys{\kwd{output} \kwd{if-output-exists}} \yetmorekeys{\kwd{error} \kwd{if-error-exists}} - \yetmorekeys{\kwd{status-hook}}}} + \yetmorekeys{\kwd{status-hook} \kwd{external-format}} + \yetmorekeys{\kwd{element-type}}}} \code{run-program} runs \var{program} in a child process. \var{Program} should be a pathname or string naming the program. @@ -1154,6 +1155,11 @@ It is possible to run programs from Lisp by using the following function. already contains all the input for the process. In this case \code{run-program} reads all the input from this stream before returning, so this cannot be used to interact with the process. + If \kwd{input} is a string stream, it is up to the caller to call + \code{string-encode} or other function to convert the string to + the appropriate encoding. In either case, the least significant 8 + bits of the \code{char-code} of each \code{character} is + sent to the program. \item[\kwd{if-input-does-not-exist}] This specifies what to do if the input file does not exist. The following values are valid: @@ -1172,7 +1178,10 @@ It is possible to run programs from Lisp by using the following function. \code{process-output} slot contains an input stream from which you can read the program's output. \kwd{output} can also be a stream in which case all output from the process is written to this - stream. + stream. If \kwd{output} is a string-stream, each octet read from + the program is converted to a character using \code{code-char}. + It is up to the caller to convert this using the appropriate + external format to create the desired encoded string. \item[\kwd{if-output-exists}] This specifies what to do if the output file already exists. The following values are valid: @@ -1197,6 +1206,15 @@ It is possible to run programs from Lisp by using the following function. the process changes status. This is especially useful when specifying \kwd{wait} as \nil. The function takes the process as a required argument. + + \item[\kwd{external-format}] This specifies the external format to + use for streams created for \code{run-program}. This does not + apply to string streams passed in as \kwd{input} or \kwd{output} + parameters. + + \item[\kwd{element-type}] If streams are created \code{run-program}, + use this as the \kwd{element-type} for the stream. Defaults to + \code{BASE-CHAR}. % \item[\kwd{before-execve}] This specifies a function to run in the % child process before it becomes the program to run. This is ===================================== src/general-info/release-21b.txt ===================================== --- a/src/general-info/release-21b.txt +++ b/src/general-info/release-21b.txt @@ -48,7 +48,7 @@ New in this release: WITH-FLOAT-TRAPS-MASKED. * (EXPT 0 power) doesn't throw INTEXP-LIMIT-ERROR anymore for any integer value of power. - * Starting cmucl with "-dyanmic-space-size 0" means using the + * Starting cmucl with "-dynamic-space-size 0" means using the maximum possible heap size for the platform. * More descriptive docstring for * *environment-list* @@ -56,16 +56,21 @@ New in this release: * Maximum dynamic-space-size on Linux reduced to 1530 MB because that's the largest available space on 32-bit Ubuntu 11.10. * For linux, darwin, and solaris/sparc, the binding stack and - control stack are now mapped into memory whereever the OS wishes + control stack are now mapped into memory wherever the OS wishes to place them instead of being mapped into a fixed location. This is indicated by new feature :relocatable-stacks. * ANSI compliance fixes: * PATHNAME-MATCH-P did not accept search-lists. + * (compile 'foo) returns the compiled function if foo is already + compiled. (See Ticket #24). This is a change in behavior for + developers where foo would be recompiled if the source was + available. Developers might want to investigate uncompile + combined with compile to get the old behavior back. - * Bugfixes: + * Bug fixes: * Linux was missing unix-setitimer which prevented saving cores. - * Generate inxact exceptions more carefully. + * Generate inexact exceptions more carefully. * Fix FP issue when building with Xcode 7.2 (and newer versions of clang). (See ticket #12.) * Cleanups in handling floating-point exceptions. See Tickets #15 @@ -94,8 +99,13 @@ New in this release: * Ticket #27 fixed: Regression: ASDF test failures * Ticket #28 fixed: Recursive function definition during cross-compile + * Ticket #30 fixed: Compilation of (describe 'foo) + * Ticket #31 fixed: (compile #'foo) fails + * Ticket #24 fixed: Compilation of (compile 'foo) + * Ticket #32 fixed: doc fix: ext:run-program has no before-execve option * Other changes: + * Update user manual. * Improvements to the PCL implementation of CLOS: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/9fe2a7d9699b1a60d874868c…

1 0

[Git][cmucl/cmucl][master] 4 commits: Remove :before-execve option
by Raymond Toy 26 Sep '16

26 Sep '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 47b1e69b by Raymond Toy at 2016-09-25T19:10:25-07:00 Remove :before-execve option The documentation for this keyward option to run-program was commented, but the actual option was not removed from the list of options for run-program. Remove it. - - - - - 21ae1a78 by Raymond Toy at 2016-09-25T19:26:54-07:00 Merge branch 'master' into rtoy-32-no-before-execve-option - - - - - 2cc0df30 by Raymond Toy at 2016-09-25T19:28:17-07:00 Add test for issue #32. - - - - - 9fe2a7d9 by Raymond Toy at 2016-09-26T02:29:33+00:00 Merge branch 'rtoy-32-no-before-execve-option' into 'master' Fix #32: Remove :before-execve option The documentation for this keyward option to run-program was commented, but the actual option was not removed from the list of options for run-program. Remove it. See merge request !14 - - - - - 2 changed files: - src/docs/cmu-user/extensions.tex - tests/issues.lisp Changes: ===================================== src/docs/cmu-user/extensions.tex ===================================== --- a/src/docs/cmu-user/extensions.tex +++ b/src/docs/cmu-user/extensions.tex @@ -1099,7 +1099,7 @@ It is possible to run programs from Lisp by using the following function. \morekeys{\kwd{if-input-does-not-exist}} \yetmorekeys{\kwd{output} \kwd{if-output-exists}} \yetmorekeys{\kwd{error} \kwd{if-error-exists}} - \yetmorekeys{\kwd{status-hook} \kwd{before-execve}}}} + \yetmorekeys{\kwd{status-hook}}}} \code{run-program} runs \var{program} in a child process. \var{Program} should be a pathname or string naming the program. ===================================== tests/issues.lisp ===================================== --- a/tests/issues.lisp +++ b/tests/issues.lisp @@ -315,3 +315,9 @@ (:tag :issues) (let* ((test-file #.(merge-pathnames #p"resources/issue-24.lisp" cl:*load-pathname*))) (assert-true (compile-file test-file :load t)))) + +(define-test issue.32 + (:tag :issues) + (assert-error 'kernel:simple-program-error + (ext:run-program "cat" nil + :before-execve t))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/d6ae3337990d21c6e9fb236f…

1 0

[Git][cmucl/cmucl][rtoy-32-no-before-execve-option] 6 commits: Fix #24: compile already compiled function
by Raymond Toy 26 Sep '16

26 Sep '16

Raymond Toy pushed to branch rtoy-32-no-before-execve-option at cmucl / cmucl Commits: 48d1f01f by Raymond Toy at 2016-09-10T12:40:03-07:00 Fix #24: compile already compiled function If the function is already compiled and we don't have the source for it any more, just return without recompiling anything. - - - - - ae93b43b by Raymond Toy at 2016-09-10T12:40:34-07:00 Add test for issue #24. - - - - - 94259938 by Raymond Toy at 2016-09-25T18:59:48-07:00 Don't try to get the lambda-expression for a function Since we're just going to return the original compiled function, there's no point in trying to get the function-lambda-expression of the function. So, if we're given a function, just return the (default) definition. - - - - - d6ae3337 by Raymond Toy at 2016-09-26T02:01:07+00:00 Merge branch 'rtoy-fix-24-compile-foo' into 'master' Fix #24: compilation of (compile 'foo) If the function is already compiled and we don't have the source for it, we don't need to do anything, per CLHS. Test case added as well. See merge request !12 - - - - - 21ae1a78 by Raymond Toy at 2016-09-25T19:26:54-07:00 Merge branch 'master' into rtoy-32-no-before-execve-option - - - - - 2cc0df30 by Raymond Toy at 2016-09-25T19:28:17-07:00 Add test for issue #32. - - - - - 2 changed files: - src/compiler/main.lisp - tests/issues.lisp Changes: ===================================== src/compiler/main.lisp ===================================== --- a/src/compiler/main.lisp +++ b/src/compiler/main.lisp @@ -2041,11 +2041,7 @@ ((or cons eval:interpreted-function) `#',(get-lambda-to-compile definition)) (function - (multiple-value-bind (exp lexenv) - (function-lambda-expression definition) - (if (and exp (not lexenv)) - `#',exp - `',definition))))) + definition))) (*source-info* (make-lisp-source-info form)) (*top-level-lambdas* ()) (*converting-for-interpreter* nil) @@ -2069,6 +2065,14 @@ (*gensym-counter* 0) (*current-function-names* (list name)) (intl::*default-domain* intl::*default-domain*)) + ;; As mentioned above, we can return the same function if the + ;; function was already compiled. We do this when FORM is EQ + ;; to DEFINITION (which happens above if we have a compiled + ;; function that we don't have the source for or was defined + ;; in a non-null environment. + (when (and name (eq form definition)) + (return-from compile + (values name nil nil))) (with-debug-counters (clear-stuff) (find-source-paths form 0) ===================================== tests/issues.lisp ===================================== --- a/tests/issues.lisp +++ b/tests/issues.lisp @@ -310,3 +310,14 @@ (assert-true (pathnamep fasl-file)) (assert-equalp (list fasl-file nil nil) (multiple-value-list (compile-file test-file :load t))))) + +(define-test issue.24 + (:tag :issues) + (let* ((test-file #.(merge-pathnames #p"resources/issue-24.lisp" cl:*load-pathname*))) + (assert-true (compile-file test-file :load t)))) + +(define-test issue.32 + (:tag :issues) + (assert-error 'kernel:simple-program-error + (ext:run-program "cat" nil + :before-execve t))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/47b1e69b80394e6bc8fb56cf…

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-32-no-before-execve-option
by Raymond Toy 26 Sep '16

26 Sep '16

Raymond Toy pushed new branch rtoy-32-no-before-execve-option at cmucl / cmucl

1 0

[Git][cmucl/cmucl][master] 4 commits: Fix #24: compile already compiled function
by Raymond Toy 26 Sep '16

26 Sep '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 48d1f01f by Raymond Toy at 2016-09-10T12:40:03-07:00 Fix #24: compile already compiled function If the function is already compiled and we don't have the source for it any more, just return without recompiling anything. - - - - - ae93b43b by Raymond Toy at 2016-09-10T12:40:34-07:00 Add test for issue #24. - - - - - 94259938 by Raymond Toy at 2016-09-25T18:59:48-07:00 Don't try to get the lambda-expression for a function Since we're just going to return the original compiled function, there's no point in trying to get the function-lambda-expression of the function. So, if we're given a function, just return the (default) definition. - - - - - d6ae3337 by Raymond Toy at 2016-09-26T02:01:07+00:00 Merge branch 'rtoy-fix-24-compile-foo' into 'master' Fix #24: compilation of (compile 'foo) If the function is already compiled and we don't have the source for it, we don't need to do anything, per CLHS. Test case added as well. See merge request !12 - - - - - 2 changed files: - src/compiler/main.lisp - tests/issues.lisp Changes: ===================================== src/compiler/main.lisp ===================================== --- a/src/compiler/main.lisp +++ b/src/compiler/main.lisp @@ -2041,11 +2041,7 @@ ((or cons eval:interpreted-function) `#',(get-lambda-to-compile definition)) (function - (multiple-value-bind (exp lexenv) - (function-lambda-expression definition) - (if (and exp (not lexenv)) - `#',exp - `',definition))))) + definition))) (*source-info* (make-lisp-source-info form)) (*top-level-lambdas* ()) (*converting-for-interpreter* nil) @@ -2069,6 +2065,14 @@ (*gensym-counter* 0) (*current-function-names* (list name)) (intl::*default-domain* intl::*default-domain*)) + ;; As mentioned above, we can return the same function if the + ;; function was already compiled. We do this when FORM is EQ + ;; to DEFINITION (which happens above if we have a compiled + ;; function that we don't have the source for or was defined + ;; in a non-null environment. + (when (and name (eq form definition)) + (return-from compile + (values name nil nil))) (with-debug-counters (clear-stuff) (find-source-paths form 0) ===================================== tests/issues.lisp ===================================== --- a/tests/issues.lisp +++ b/tests/issues.lisp @@ -310,3 +310,8 @@ (assert-true (pathnamep fasl-file)) (assert-equalp (list fasl-file nil nil) (multiple-value-list (compile-file test-file :load t))))) + +(define-test issue.24 + (:tag :issues) + (let* ((test-file #.(merge-pathnames #p"resources/issue-24.lisp" cl:*load-pathname*))) + (assert-true (compile-file test-file :load t)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/f810fc97740f2bd1405247fc…

1 0

[Git][cmucl/cmucl][rtoy-fix-24-compile-foo] Don't try to get the lambda-expression for a function
by Raymond Toy 26 Sep '16

26 Sep '16

Raymond Toy pushed to branch rtoy-fix-24-compile-foo at cmucl / cmucl Commits: 94259938 by Raymond Toy at 2016-09-25T18:59:48-07:00 Don't try to get the lambda-expression for a function Since we're just going to return the original compiled function, there's no point in trying to get the function-lambda-expression of the function. So, if we're given a function, just return the (default) definition. - - - - - 1 changed file: - src/compiler/main.lisp Changes: ===================================== src/compiler/main.lisp ===================================== --- a/src/compiler/main.lisp +++ b/src/compiler/main.lisp @@ -2041,11 +2041,7 @@ ((or cons eval:interpreted-function) `#',(get-lambda-to-compile definition)) (function - (multiple-value-bind (exp lexenv) - (function-lambda-expression definition) - (if (and exp (not lexenv)) - `#',exp - definition))))) + definition))) (*source-info* (make-lisp-source-info form)) (*top-level-lambdas* ()) (*converting-for-interpreter* nil) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/94259938ccba4c40ae4ab9445…

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-29-process-command-line
by Raymond Toy 19 Sep '16

19 Sep '16

Raymond Toy pushed new branch rtoy-29-process-command-line at cmucl / cmucl

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-fix-24-compile-foo
by Raymond Toy 10 Sep '16

10 Sep '16

Raymond Toy pushed new branch rtoy-fix-24-compile-foo at cmucl / cmucl

1 0

[Git][cmucl/cmucl][master] 4 commits: Fix #30: compilation of (describe 'foo)
by Raymond Toy 08 Sep '16

08 Sep '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 53fe0a4f by Raymond Toy at 2016-09-07T20:28:36-07:00 Fix #30: compilation of (describe 'foo) The debug-info-source isn't available until later in the fasl, so don't try to print where the source was compiled from. This seems like a small oversight since the next bit of code does nothing if the debug-info-source isn't available. - - - - - 5524c034 by Raymond Toy at 2016-09-07T20:29:38-07:00 Add test for issue #30. - - - - - 6714a3a1 by Raymond Toy at 2016-09-07T20:52:29-07:00 Fix mistake in test. - - - - - f810fc97 by Raymond Toy at 2016-09-08T03:55:32+00:00 Merge branch 'rtoy-fix-30-describe-foo' into 'master' Fix #30: compilation of describe foo The debug-info-source isn't available until later in the fasl, so don't try to print where the source was compiled from. This seems like a small oversight since the next bit of code does nothing if the debug-info-source isn't available. See merge request !11 - - - - - 3 changed files: - src/code/describe.lisp - tests/issues.lisp - + tests/resources/issue-30.lisp Changes: ===================================== src/code/describe.lisp ===================================== --- a/src/code/describe.lisp +++ b/src/code/describe.lisp @@ -313,11 +313,12 @@ (let ((info (kernel:%code-debug-info code-obj))) (when info (let ((sources (c::debug-info-source info))) - (format t (intl:gettext "~&On ~A it was compiled from:") - (format-universal-time nil - (c::debug-source-compiled - (first sources)) - :style :iso8601)) + (when sources + (format t (intl:gettext "~&On ~A it was compiled from:") + (format-universal-time nil + (c::debug-source-compiled + (first sources)) + :style :iso8601))) (dolist (source sources) (let ((name (c::debug-source-name source))) (ecase (c::debug-source-from source) ===================================== tests/issues.lisp ===================================== --- a/tests/issues.lisp +++ b/tests/issues.lisp @@ -298,3 +298,15 @@ (assert-eql (length in-string) (length out-string)) (assert-equal in-string out-string))))) + + +(define-test issue.30 + (:tag :issues) + (let* ((test-file #.(merge-pathnames #p"resources/issue-30.lisp" cl:*load-pathname*)) + (fasl-file (compile-file-pathname test-file))) + ;; Compiling and loading the test file should succeed without + ;; errors. + (assert-true (pathnamep test-file)) + (assert-true (pathnamep fasl-file)) + (assert-equalp (list fasl-file nil nil) + (multiple-value-list (compile-file test-file :load t))))) ===================================== tests/resources/issue-30.lisp ===================================== --- /dev/null +++ b/tests/resources/issue-30.lisp @@ -0,0 +1,4 @@ +(defun foo () + (print "Hello world")) + +(describe 'foo) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/a5175917df91f875c88e7206…

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-fix-30-describe-foo
by Raymond Toy 08 Sep '16

08 Sep '16

Raymond Toy pushed new branch rtoy-fix-30-describe-foo at cmucl / cmucl

1 0

[Git][cmucl/cmucl] Pushed new tag snapshot-2016-09
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy pushed new tag snapshot-2016-09 at cmucl / cmucl

1 0

[Git][cmucl/cmucl][master] Revert changes restoring to snapshot-2016-06.
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: a5175917 by Raymond Toy at 2016-09-05T15:38:08-07:00 Revert changes restoring to snapshot-2016-06. - - - - - 1 changed file: - src/general-info/release-21a.txt Changes: ===================================== src/general-info/release-21a.txt ===================================== --- a/src/general-info/release-21a.txt +++ b/src/general-info/release-21a.txt @@ -100,16 +100,6 @@ New in this release: * Issue #3: Shadowing compiler macro functions. * Issue #7: Local functions and get-setf-expansions * Issue #8: Constants and top-level code - * Issue #10: (setf aref) on (simple-array (unsigned-byte 4) (*)) - with constant index is incorrect. - * Issue #11: Merge unix-glibc2.lisp into unix.lisp - * Issue #14: (asinh 0d0) signals inexact on linux - * Issue #16: pathname-match-p doesn't handle search lists - * Issue #18: Fix docstring for *environment-list* - * Issue #18: Add better description to :env option for run-program - * Issue #19: Make min version for OSX be 10.6 - * Issue #22: Incorrect coercion to float - * Issue #12: unable to build master/$HEAD with 2015-12 darwin snapshot * Other changes: * Cross compile scripts from x86 to sparc and ppc updated to work View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/a5175917df91f875c88e72067…

1 0

[Git][cmucl/cmucl][master] 2 commits: Revert change.
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: df0289d5 by Raymond Toy at 2016-09-05T15:16:44-07:00 Revert change. - - - - - ff661afb by Raymond Toy at 2016-09-05T15:18:22-07:00 Update from logs. - - - - - 2 changed files: - src/general-info/release-21a.txt - src/general-info/release-21b.txt Changes: ===================================== src/general-info/release-21a.txt ===================================== --- a/src/general-info/release-21a.txt +++ b/src/general-info/release-21a.txt @@ -110,10 +110,6 @@ New in this release: * Issue #19: Make min version for OSX be 10.6 * Issue #22: Incorrect coercion to float * Issue #12: unable to build master/$HEAD with 2015-12 darwin snapshot - * Issue #25: Issue with ext:run-program and string streams - (related to character sizes?) - * Issue #27: Regression: ASDF test failures - * Issue #28: Recursive function definition during cross-compile * Other changes: * Cross compile scripts from x86 to sparc and ppc updated to work ===================================== src/general-info/release-21b.txt ===================================== --- a/src/general-info/release-21b.txt +++ b/src/general-info/release-21b.txt @@ -89,6 +89,11 @@ New in this release: * Ticket #18 fixed: better description of :ENV option for RUN-PROGRAM. * Ticket #22 fixed: Incorrect coercion to float. + * Ticket #25 fixed: Issue with ext:run-program and string streams + (related to character sizes?) + * Ticket #27 fixed: Regression: ASDF test failures + * Ticket #28 fixed: Recursive function definition during + cross-compile * Other changes: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/9f2f0330804a623d887c7969…

1 0

[Git][cmucl/cmucl] Deleted tag snapshot-2016-09
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy deleted tag snapshot-2016-09 at cmucl / cmucl

1 0

[Git][cmucl/cmucl] Pushed new tag snapshot-2016-09
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy pushed new tag snapshot-2016-09 at cmucl / cmucl

1 0

[Git][cmucl/cmucl] Deleted tag snapshot-2016-09
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy deleted tag snapshot-2016-09 at cmucl / cmucl

1 0

[Git][cmucl/cmucl] Pushed new tag snapshot-2016-09
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy pushed new tag snapshot-2016-09 at cmucl / cmucl

1 0

[Git][cmucl/cmucl] Deleted tag snapshot-2016-09
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy deleted tag snapshot-2016-09 at cmucl / cmucl

1 0

[Git][cmucl/cmucl] Pushed new tag snapshot-2016-09
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy pushed new tag snapshot-2016-09 at cmucl / cmucl

1 0

[Git][cmucl/cmucl][master] Update from logs.
by Raymond Toy 05 Sep '16

05 Sep '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 9f2f0330 by Raymond Toy at 2016-09-05T13:08:16-07:00 Update from logs. Also add some tickets that were fixed but weren't listed. - - - - - 1 changed file: - src/general-info/release-21a.txt Changes: ===================================== src/general-info/release-21a.txt ===================================== --- a/src/general-info/release-21a.txt +++ b/src/general-info/release-21a.txt @@ -100,6 +100,20 @@ New in this release: * Issue #3: Shadowing compiler macro functions. * Issue #7: Local functions and get-setf-expansions * Issue #8: Constants and top-level code + * Issue #10: (setf aref) on (simple-array (unsigned-byte 4) (*)) + with constant index is incorrect. + * Issue #11: Merge unix-glibc2.lisp into unix.lisp + * Issue #14: (asinh 0d0) signals inexact on linux + * Issue #16: pathname-match-p doesn't handle search lists + * Issue #18: Fix docstring for *environment-list* + * Issue #18: Add better description to :env option for run-program + * Issue #19: Make min version for OSX be 10.6 + * Issue #22: Incorrect coercion to float + * Issue #12: unable to build master/$HEAD with 2015-12 darwin snapshot + * Issue #25: Issue with ext:run-program and string streams + (related to character sizes?) + * Issue #27: Regression: ASDF test failures + * Issue #28: Recursive function definition during cross-compile * Other changes: * Cross compile scripts from x86 to sparc and ppc updated to work View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/9f2f0330804a623d887c7969e…

1 0

[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