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

[Git][cmucl/cmucl][rtoy-bignum-mult-less-consing] Use fixed ubuntu image
by Raymond Toy 07 Jul '18

07 Jul '18

Raymond Toy pushed to branch rtoy-bignum-mult-less-consing at cmucl / cmucl Commits: be073d06 by Raymond Toy at 2018-07-07T10:41:33-07:00 Use fixed ubuntu image - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ variables: version: "2018-03-x86" linux-runner: + image: ubuntu:16.04 tags: - linux before_script: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/be073d061d49a3d14999b04fa… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/be073d061d49a3d14999b04fa… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-bignum-mult-less-consing] Rename functions to use the new version by default.
by Raymond Toy 04 Jul '18

04 Jul '18

Raymond Toy pushed to branch rtoy-bignum-mult-less-consing at cmucl / cmucl Commits: d652bd09 by Raymond Toy at 2018-07-04T13:31:21-07:00 Rename functions to use the new version by default. Update tests to reflect the change in names. - - - - - 2 changed files: - src/code/bignum.lisp - tests/bignum.lisp Changes: ===================================== src/code/bignum.lisp ===================================== --- a/src/code/bignum.lisp +++ b/src/code/bignum.lisp @@ -884,7 +884,12 @@ down to individual words.") (negate-bignum-in-place result)) (%normalize-bignum result (1+ (* 2 n)))))))) -(defun classical-multiply-bignums (a b) +;; Bignum multiply using Knuth's algorithm. We keep this around for +;; now so we can compare the new algorithm against this to make sure +;; this are working. +;; +;; TODO: Remove this eventually? +(defun classical-multiply-bignums-knuth (a b) (declare (type bignum-type a b)) (let* ((a-plusp (%bignum-0-or-plusp a (%bignum-length a))) (b-plusp (%bignum-0-or-plusp b (%bignum-length b))) @@ -916,16 +921,29 @@ down to individual words.") (when negate-res (negate-bignum-in-place res)) (%normalize-bignum res len-res))) -;; Pretend the bignums are actually unsigned, do an unsigned multiply -;; and then correct the result. This is based on the algorithm in -;; Hacker's Delight. -(defun classical-multiply-bignum-hd (a b) +;; Classical multiplication of bignums using Knuth's algorithm +;; modified to handle signed bignums. Pretend the bignums are +;; actually unsigned, do an unsigned multiply and then correct the +;; result. This is based on the algorithm in Hacker's Delight. +;; +;; Let a[n] and b[n] represent the individual bits of each bignum with +;; M being the number of bits in a and N being the number of bits in +;; b. If these are interpreted as an unsigned number, then we are +;; multiplying numbers +;; +;; (a + 2^M*a[M-1})*(b + 2^N*b[N-1]) +;; = a*b + 2^M*u[M-1]*b + 2^N*b[N-1]*a + 2^(M+N)*a[M-1]*b[M-1] +;; +;; To get the desired result, we need to subtract out the term +;; 2^M*u[M-1]*b + 2^N*b[N-1]*a from the product. The last term +;; doesn't need to subtracted because we know the product fits in M+N +;; bits and this term is beyond that. +(defun classical-multiply-bignums (a b) (declare (type bignum-type a b)) (let* ((len-a (%bignum-length a)) (len-b (%bignum-length b)) (len-res (+ len-a len-b)) (res (%allocate-bignum len-res))) - (negate-res (not (eq a-plusp b-plusp)))) (declare (type bignum-index len-a len-b len-res)) ;; Unsigned multiply (dotimes (i len-a) @@ -937,36 +955,39 @@ down to individual words.") (type bignum-element-type carry-digit x)) (dotimes (j len-b) (multiple-value-bind (big-carry res-digit) - (%multiply-and-add x (%bignum-ref b j) - (%bignum-ref res k) - carry-digit) + (%multiply-and-add x (%bignum-ref b j) + (%bignum-ref res k) + carry-digit) (declare (type bignum-element-type big-carry res-digit)) (setf (%bignum-ref res k) res-digit) (setf carry-digit big-carry) (incf k))) (setf (%bignum-ref res k) carry-digit))) ;; Apply corrections if either of the arguments is negative. - ;; If a < 0, subtract b*2^M from the result - (unless(%bignum-0-or-plusp a) + (unless (%bignum-0-or-plusp a len-a) (let ((borrow 1)) (dotimes (j len-b) + (declare (type bignum-index j)) (let ((index (+ j len-a))) + (declare (type bignum-index index)) (multiple-value-bind (d borrow-out) - (%subtract-with-borrow (bignum-ref res index) - (bignum-ref b j) + (%subtract-with-borrow (%bignum-ref res index) + (%bignum-ref b j) borrow) - (setf (bignum-ref res index) d) + (setf (%bignum-ref res index) d) (setf borrow borrow-out)))))) - (unless (%bignum-0-or-plusp b) + (unless (%bignum-0-or-plusp b len-b) (let ((borrow 1)) (dotimes (j len-a) + (declare (type bignum-index j)) (let ((index (+ j len-b))) - (multiple-value-bind (d borrow-out) - (%subtract-with-borrow (bignum-ref res index) - (bignum-ref a j) - borrow) - (setf (bignum-ref res index) d) - (setf borrow borrow-out))))) + (declare (type bignum-index index)) + (multiple-value-bind (d borrow-out) + (%subtract-with-borrow (%bignum-ref res index) + (%bignum-ref a j) + borrow) + (setf (%bignum-ref res index) d) + (setf borrow borrow-out)))))) (%normalize-bignum res len-res))) (defparameter *min-karatsuba-bits* 512 ===================================== tests/bignum.lisp ===================================== --- a/tests/bignum.lisp +++ b/tests/bignum.lisp @@ -21,8 +21,8 @@ (dotimes (k 100) (let* ((r1 (gen-bignum range (random 2 rng))) (r2 (gen-bignum range (random 2 rng))) - (prod-knuth (bignum::classical-multiply-bignums r1 r2)) - (prod-hd (bignum::classical-multiply-bignum-hd r1 r2))) + (prod-knuth (bignum::classical-multiply-bignums-knuth r1 r2)) + (prod-hd (bignum::classical-multiply-bignums r1 r2))) (assert-equal prod-knuth prod-hd r1 r2)))))) @@ -45,12 +45,12 @@ (r2 (gen-bignum range 1)) res) (time (dotimes (k reps) - (declare (fixnum k)) (setf res - (bignum::classical-multiply-bignums r1 r2)))) + (declare (fixnum k)) + (setf res (bignum::classical-multiply-bignums-knuth r1 r2)))) (print res) (time (dotimes (k reps) - (declare (fixnum k)) (setf res - (bignum::classical-multiply-bignum-hd r1 r2)))) + (declare (fixnum k)) + (setf res (bignum::classical-multiply-bignums r1 r2)))) (print res))))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/d652bd096516a2217e9c273da… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/d652bd096516a2217e9c273da… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][rtoy-bignum-mult-less-consing] 2 commits: Add simple test
by Raymond Toy 04 Jul '18

04 Jul '18

Raymond Toy pushed to branch rtoy-bignum-mult-less-consing at cmucl / cmucl Commits: e6b95b82 by Raymond Toy at 2018-07-04T12:21:25-07:00 Add simple test - - - - - 3af22f92 by Raymond Toy at 2018-07-04T12:40:30-07:00 Add some timing code, but not for tests. - - - - - 1 changed file: - + tests/bignum.lisp Changes: ===================================== tests/bignum.lisp ===================================== --- /dev/null +++ b/tests/bignum.lisp @@ -0,0 +1,56 @@ +;;; Tests for the bignum operations + +(defpackage :bignum-tests + (:use :cl :lisp-unit)) + +(in-package #:bignum-tests) + +(define-test hd-mult + "Test bignum multiplier" + (:tag :bignum-tests) + (let ((rng (kernel::make-random-object :state (kernel:init-random-state) + :rand 0 + :cached-p nil)) + (range (ash 1 128))) + (flet ((gen-bignum (x sign) + (do ((r (random x rng) (random x rng))) + ((typep r 'bignum) + (if (zerop sign) + r + (- r)))))) + (dotimes (k 100) + (let* ((r1 (gen-bignum range (random 2 rng))) + (r2 (gen-bignum range (random 2 rng))) + (prod-knuth (bignum::classical-multiply-bignums r1 r2)) + (prod-hd (bignum::classical-multiply-bignum-hd r1 r2))) + (assert-equal prod-knuth prod-hd r1 r2)))))) + + +;; Just for simple timing tests so we can redo the timing tests if needed. +#+nil +(define-test hd-timing + "Test execution time" + (:tag :bignum-tests) + (let ((rng (kernel::make-random-object :state + (kernel:init-random-state) + :rand 0 :cached-p nil)) + (range (ash 1 128)) + (reps 10000)) + (flet ((gen-bignum (x sign) + (do ((r (random x rng) (random x rng))) + ((typep r 'bignum) + (if (zerop sign) + r (- r)))))) + (let* ((r1 (gen-bignum range 1)) + (r2 (gen-bignum range 1)) res) + (time + (dotimes (k reps) + (declare (fixnum k)) (setf res + (bignum::classical-multiply-bignums r1 r2)))) + (print res) + (time + (dotimes (k reps) + (declare (fixnum k)) (setf res + (bignum::classical-multiply-bignum-hd r1 r2)))) + (print res))))) + View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/90d8b4b5f6bf1e612f3e7c24… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/90d8b4b5f6bf1e612f3e7c24… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-bignum-mult-less-consing
by Raymond Toy 04 Jul '18

04 Jul '18

Raymond Toy pushed new branch rtoy-bignum-mult-less-consing at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/tree/rtoy-bignum-mult-less-consi… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] ASDF 3.3.2
by Raymond Toy 12 May '18

12 May '18

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 23e31483 by Raymond Toy at 2018-05-12T10:40:12-07:00 ASDF 3.3.2 - - - - - 5 changed files: - src/contrib/asdf/asdf.lisp - src/contrib/asdf/doc/asdf.html - src/contrib/asdf/doc/asdf.info - src/contrib/asdf/doc/asdf.pdf - src/general-info/release-21d.md Changes: ===================================== src/contrib/asdf/asdf.lisp ===================================== --- a/src/contrib/asdf/asdf.lisp +++ b/src/contrib/asdf/asdf.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*- -;;; This is ASDF 3.3.1: Another System Definition Facility. +;;; This is ASDF 3.3.2: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel(a)common-lisp.net>. @@ -747,13 +747,13 @@ or when loading the package is optional." :and :do (setf use-p t) :else :when (eq kw :unintern) :append args :into unintern :else :do (error "unrecognized define-package keyword ~S" kw) - :finally (return `(,package - :nicknames ,nicknames :documentation ,documentation - :use ,(if use-p use '(:common-lisp)) - :shadow ,shadow :shadowing-import-from ,shadowing-import-from - :import-from ,import-from :export ,export :intern ,intern - :recycle ,(if recycle-p recycle (cons package nicknames)) - :mix ,mix :reexport ,reexport :unintern ,unintern))))) + :finally (return `(',package + :nicknames ',nicknames :documentation ',documentation + :use ',(if use-p use '(:common-lisp)) + :shadow ',shadow :shadowing-import-from ',shadowing-import-from + :import-from ',import-from :export ',export :intern ',intern + :recycle ',(if recycle-p recycle (cons package nicknames)) + :mix ',mix :reexport ',reexport :unintern ',unintern))))) (defmacro define-package (package &rest clauses) "DEFINE-PACKAGE takes a PACKAGE and a number of CLAUSES, of the form @@ -779,7 +779,10 @@ export symbols with the same name as those exported from p. Note that in the ca of shadowing, etc. the symbols with the same name may not be the same symbols. UNINTERN -- Remove symbols here from PACKAGE." (let ((ensure-form - `(apply 'ensure-package ',(parse-define-package-form package clauses)))) + `(prog1 + (funcall 'ensure-package ,@(parse-define-package-form package clauses)) + #+sbcl (setf (sb-impl::package-source-location (find-package ',package)) + (sb-c:source-location))))) `(progn #+(or clasp ecl gcl mkcl) (defpackage ,package (:use)) (eval-when (:compile-toplevel :load-toplevel :execute) @@ -807,7 +810,7 @@ UNINTERN -- Remove symbols here from PACKAGE." #+(or mcl cmucl) (:shadow #:user-homedir-pathname)) (in-package :uiop/common-lisp) -#-(or abcl allegro clasp clisp clozure cmucl cormanlisp ecl gcl genera lispworks mcl mkcl sbcl scl xcl) +#-(or abcl allegro clasp clisp clozure cmucl cormanlisp ecl gcl genera lispworks mcl mezzano mkcl sbcl scl xcl) (error "ASDF is not supported on your implementation. Please help us port it.") ;; (declaim (optimize (speed 1) (debug 3) (safety 3))) ; DON'T: trust implementation defaults. @@ -815,7 +818,7 @@ UNINTERN -- Remove symbols here from PACKAGE." ;;;; Early meta-level tweaks -#+(or allegro clasp clisp clozure cmucl ecl mkcl sbcl) +#+(or allegro clasp clisp clozure cmucl ecl mezzano mkcl sbcl) (eval-when (:load-toplevel :compile-toplevel :execute) (when (and #+allegro (member :ics *features*) #+(or clasp clisp cmucl ecl mkcl) (member :unicode *features*) @@ -1669,7 +1672,7 @@ message, that takes the functionality as its first argument (that can be skipped (in-package :uiop/version) (with-upgradability () - (defparameter *uiop-version* "3.3.1") + (defparameter *uiop-version* "3.3.2") (defun unparse-version (version-list) "From a parsed version (a list of natural numbers), compute the version string" @@ -1897,6 +1900,10 @@ keywords explicitly." "Is the underlying operating system Haiku?" (featurep :haiku)) + (defun os-mezzano-p () + "Is the underlying operating system Mezzano?" + (featurep :mezzano)) + (defun detect-os () "Detects the current operating system. Only needs be run at compile-time, except on ABCL where it might change between FASL compilation and runtime." @@ -1904,7 +1911,8 @@ except on ABCL where it might change between FASL compilation and runtime." :for (feature . detect) :in '((:os-unix . os-unix-p) (:os-macosx . os-macosx-p) (:os-windows . os-windows-p) (:genera . os-genera-p) (:os-oldmac . os-oldmac-p) - (:haiku . os-haiku-p)) + (:haiku . os-haiku-p) + (:mezzano . os-mezzano-p)) :when (and (or (not o) (eq feature :os-macosx)) (funcall detect)) :do (setf o feature) (pushnew feature *features*) :else :do (setf *features* (remove feature *features*)) @@ -1941,7 +1949,7 @@ use getenvp to return NIL in such a case." (ct:free buffer) (ct:free buffer1))) #+gcl (system:getenv x) - #+genera nil + #+(or genera mezzano) nil #+lispworks (lispworks:environment-variable x) #+mcl (ccl:with-cstrs ((name x)) (let ((value (_getenv name))) @@ -1949,7 +1957,7 @@ use getenvp to return NIL in such a case." (ccl:%get-cstring value)))) #+mkcl (#.(or (find-symbol* 'getenv :si nil) (find-symbol* 'getenv :mk-ext nil)) x) #+sbcl (sb-ext:posix-getenv x) - #-(or abcl allegro clasp clisp clozure cmucl cormanlisp ecl gcl genera lispworks mcl mkcl sbcl scl xcl) + #-(or abcl allegro clasp clisp clozure cmucl cormanlisp ecl gcl genera lispworks mcl mezzano mkcl sbcl scl xcl) (not-implemented-error 'getenv)) (defsetf getenv (x) (val) @@ -1995,7 +2003,7 @@ then returning the non-empty string value of the variable" '(:abcl (:acl :allegro) (:ccl :clozure) :clisp (:corman :cormanlisp) (:cmu :cmucl :cmu) :clasp :ecl :gcl (:lwpe :lispworks-personal-edition) (:lw :lispworks) - :mcl :mkcl :sbcl :scl (:smbx :symbolics) :xcl))) + :mcl :mezzano :mkcl :sbcl :scl (:smbx :symbolics) :xcl))) (defvar *implementation-type* (implementation-type) "The type of Lisp implementation used, as a short UIOP-standardized keyword") @@ -2010,7 +2018,8 @@ then returning the non-empty string value of the variable" (:solaris :solaris :sunos) (:bsd :bsd :freebsd :netbsd :openbsd :dragonfly) :unix - :genera))) + :genera + :mezzano))) (defun architecture () "The CPU architecture of the current host" @@ -2068,6 +2077,9 @@ then returning the non-empty string value of the variable" (multiple-value-bind (major minor) (sct:get-system-version "System") (format nil "~D.~D" major minor)) #+mcl (subseq s 8) ; strip the leading "Version " + #+mezzano (format nil "~A-~D" + (subseq s 0 (position #\space s)) ; strip commit hash + sys.int::*llf-version*) ;; seems like there should be a shorter way to do this, like ACALL. #+mkcl (or (let ((fname (find-symbol* '#:git-describe-this-mkcl :mkcl nil))) @@ -2093,7 +2105,7 @@ suitable for use as a directory name to segregate Lisp FASLs, C dynamic librarie (with-upgradability () (defun hostname () "return the hostname of the current host" - #+(or abcl clasp clozure cmucl ecl genera lispworks mcl mkcl sbcl scl xcl) (machine-instance) + #+(or abcl clasp clozure cmucl ecl genera lispworks mcl mezzano mkcl sbcl scl xcl) (machine-instance) #+cormanlisp "localhost" ;; is there a better way? Does it matter? #+allegro (symbol-call :excl.osi :gethostname) #+clisp (first (split-string (machine-instance) :separator " ")) @@ -2113,7 +2125,7 @@ suitable for use as a directory name to segregate Lisp FASLs, C dynamic librarie (defun getcwd () "Get the current working directory as per POSIX getcwd(3), as a pathname object" - (or #+(or abcl genera xcl) (truename *default-pathname-defaults*) ;; d-p-d is canonical! + (or #+(or abcl genera mezzano xcl) (truename *default-pathname-defaults*) ;; d-p-d is canonical! #+allegro (excl::current-directory) #+clisp (ext:default-directory) #+clozure (ccl:current-directory) @@ -2131,7 +2143,7 @@ suitable for use as a directory name to segregate Lisp FASLs, C dynamic librarie (defun chdir (x) "Change current directory, as per POSIX chdir(2), to a given pathname object" (if-let (x (pathname x)) - #+(or abcl genera xcl) (setf *default-pathname-defaults* (truename x)) ;; d-p-d is canonical! + #+(or abcl genera mezzano xcl) (setf *default-pathname-defaults* (truename x)) ;; d-p-d is canonical! #+allegro (excl:chdir x) #+clisp (ext:cd x) #+clozure (setf (ccl:current-directory) x) @@ -2324,7 +2336,7 @@ by the underlying implementation's MAKE-PATHNAME and other primitives" ;; This will be :unspecific if supported, or NIL if not. (defparameter *unspecific-pathname-type* #+(or abcl allegro clozure cmucl genera lispworks sbcl scl) :unspecific - #+(or clasp clisp ecl mkcl gcl xcl #|These haven't been tested:|# cormanlisp mcl) nil + #+(or clasp clisp ecl mkcl gcl xcl #|These haven't been tested:|# cormanlisp mcl mezzano) nil "Unspecific type component to use with the underlying implementation's MAKE-PATHNAME") (defun make-pathname* (&rest keys &key directory host device name type version defaults @@ -4511,6 +4523,9 @@ This is designed to abstract away the implementation specific quit forms." (dbg:*debug-print-level* *print-level*) (dbg:*debug-print-length* *print-length*)) (dbg:bug-backtrace nil)) + #+mezzano + (let ((*standard-output* stream)) + (sys.int::backtrace count)) #+sbcl (sb-debug:print-backtrace :stream stream :count (or count most-positive-fixnum)) #+xcl @@ -4599,12 +4614,12 @@ depending on whether *LISP-INTERACTION* is set, enter debugger or die" #+clozure ccl:*command-line-argument-list* #+(or cmucl scl) extensions:*command-line-strings* #+gcl si:*command-args* - #+(or genera mcl) nil + #+(or genera mcl mezzano) nil #+lispworks sys:*line-arguments-list* #+mkcl (loop :for i :from 0 :below (mkcl:argc) :collect (mkcl:argv i)) #+sbcl sb-ext:*posix-argv* #+xcl system:*argv* - #-(or abcl allegro clasp clisp clozure cmucl ecl gcl genera lispworks mcl mkcl sbcl scl xcl) + #-(or abcl allegro clasp clisp clozure cmucl ecl gcl genera lispworks mcl mezzano mkcl sbcl scl xcl) (not-implemented-error 'raw-command-line-arguments)) (defun command-line-arguments (&optional (arguments (raw-command-line-arguments))) @@ -7506,7 +7521,7 @@ previously-loaded version of ASDF." ;; "3.4.5.67" would be a development version in the official branch, on top of 3.4.5. ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67 - (asdf-version "3.3.1") + (asdf-version "3.3.2") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) @@ -8324,21 +8339,33 @@ a SYMBOL (designing its name, downcased), or a STRING (designing itself)." (t (sysdef-error (compatfmt "~@<Invalid component designator: ~3i~_~A~@:>") name)))) (defun primary-system-name (system-designator) - "Given a system designator NAME, return the name of the corresponding primary system, -after which the .asd file is named. That's the first component when dividing the name -as a string by / slashes. A component designates its system." + "Given a system designator NAME, return the name of the corresponding +primary system, after which the .asd file in which it is defined is named. +If given a string or symbol (to downcase), do it syntactically + by stripping anything from the first slash on. +If given a component, do it semantically by extracting +the system-primary-system-name of its system." (etypecase system-designator (string (if-let (p (position #\/ system-designator)) (subseq system-designator 0 p) system-designator)) (symbol (primary-system-name (coerce-name system-designator))) - (component (primary-system-name (coerce-name (component-system system-designator)))))) + (component (let* ((system (component-system system-designator)) + (source-file (physicalize-pathname (system-source-file system)))) + (and source-file + (equal (pathname-type source-file) "asd") + (pathname-name source-file)))))) (defun primary-system-p (system) "Given a system designator SYSTEM, return T if it designates a primary system, or else NIL. -Also return NIL if system is neither a SYSTEM nor a string designating one." - (typecase system +If given a string, do it syntactically and return true if the name does not contain a slash. +If given a symbol, downcase to a string then fallback to previous case (NB: for NIL return T). +If given a component, do it semantically and return T if it's a SYSTEM and its primary-system-name +is the same as its component-name." + (etypecase system (string (not (find #\/ system))) - (system (primary-system-p (coerce-name system))))) + (symbol (primary-system-p (coerce-name system))) + (component (and (typep system 'system) + (equal (component-name system) (primary-system-name system)))))) (defun coerce-filename (name) "Coerce a system designator NAME into a string suitable as a filename component. @@ -9999,6 +10026,24 @@ initialized with SEED." ;; so they need not refer to the state of the filesystem, ;; and the stamps could be cryptographic checksums rather than timestamps. ;; Such a change remarkably would only affect COMPUTE-ACTION-STAMP. + (define-condition dependency-not-done (warning) + ((op + :initarg :op) + (component + :initarg :component) + (dep-op + :initarg :dep-op) + (dep-component + :initarg :dep-component) + (plan + :initarg :plan + :initform nil)) + (:report (lambda (condition stream) + (with-slots (op component dep-op dep-component plan) condition + (format stream "Computing just-done stamp ~@[in plan ~S~] for action ~S, but dependency ~S wasn't done yet!" + plan + (action-path (make-action op component)) + (action-path (make-action dep-op dep-component))))))) (defmethod compute-action-stamp (plan (o operation) (c component) &key just-done) ;; Given an action, figure out at what time in the past it has been done, @@ -10032,10 +10077,10 @@ initialized with SEED." (just-done ;; It's OK to lose some ASDF action stamps during self-upgrade (unless (equal "asdf" (primary-system-name dc)) - (warn "Computing just-done stamp in plan ~S for action ~S, but dependency ~S wasn't done yet!" - plan - (action-path (make-action o c)) - (action-path (make-action do dc)))) + (warn 'dependency-not-done + :plan plan + :op o :component c + :dep-op do :dep-component dc)) status) (t (return (values nil nil)))))) @@ -10682,11 +10727,9 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms.")) ;; TODO: could this file be refactored so that locate-system is merely ;; the cache-priming call to input-files here? (defmethod input-files ((o define-op) (s system)) - (assert (equal (coerce-name s) (primary-system-name s))) (if-let ((asd (system-source-file s))) (list asd))) (defmethod perform ((o define-op) (s system)) - (assert (equal (coerce-name s) (primary-system-name s))) (nest (if-let ((pathname (first (input-files o s))))) (let ((readtable *readtable*) ;; save outer syntax tables. TODO: proper syntax-control @@ -10795,21 +10838,25 @@ Do NOT try to load a .asd file directly with CL:LOAD. Always use ASDF:LOAD-ASD." (defun locate-system (name) "Given a system NAME designator, try to locate where to load the system from. -Returns five values: FOUNDP FOUND-SYSTEM PATHNAME PREVIOUS PREVIOUS-TIME +Returns six values: FOUNDP FOUND-SYSTEM PATHNAME PREVIOUS PREVIOUS-TIME PREVIOUS-PRIMARY FOUNDP is true when a system was found, either a new unregistered one or a previously registered one. FOUND-SYSTEM when not null is a SYSTEM object that may be REGISTER-SYSTEM'ed. PATHNAME when not null is a path from which to load the system, either associated with FOUND-SYSTEM, or with the PREVIOUS system. PREVIOUS when not null is a previously loaded SYSTEM object of same name. -PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded." +PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded. +PREVIOUS-PRIMARY when not null is the primary system for the PREVIOUS system." (with-asdf-session () ;; NB: We don't cache the results. We once used to, but it wasn't useful, ;; and keeping a negative cache was a bug (see lp#1335323), which required ;; explicit invalidation in clear-system and find-system (when unsucccessful). (let* ((name (coerce-name name)) (previous (registered-system name)) ; load from disk if absent or newer on disk - (primary (registered-system (primary-system-name name))) - (previous-time (and previous primary (component-operation-time 'define-op primary))) + (previous-primary-name (and previous (primary-system-name previous))) + (previous-primary-system (and previous-primary-name + (registered-system previous-primary-name))) + (previous-time (and previous-primary-system + (component-operation-time 'define-op previous-primary-system))) (found (search-for-system-definition name)) (found-system (and (typep found 'system) found)) (pathname (ensure-pathname @@ -10822,37 +10869,38 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded. (unless (check-not-old-asdf-system name pathname) (check-type previous system) ;; asdf is preloaded, so there should be a previous one. (setf found-system nil pathname nil)) - (values foundp found-system pathname previous previous-time)))) + (values foundp found-system pathname previous previous-time previous-primary-system)))) + + ;; TODO: make a prepare-define-op node for this + ;; so we can properly cache the answer rather than recompute it. + (defun definition-dependencies-up-to-date-p (system) + (check-type system system) + (or (not (primary-system-p system)) + (handler-case + (loop :with plan = (make-instance *plan-class*) + :for action :in (definition-dependency-list system) + :always (action-up-to-date-p + plan (action-operation action) (action-component action)) + :finally + (let ((o (make-operation 'define-op))) + (multiple-value-bind (stamp done-p) + (compute-action-stamp plan o system) + (return (and (timestamp<= stamp (component-operation-time o system)) + done-p))))) + (system-out-of-date () nil)))) ;; Main method for find-system: first, make sure the computation is memoized in a session cache. ;; Unless the system is immutable, use locate-system to find the primary system; ;; reconcile the finding (if any) with any previous definition (in a previous session, ;; preloaded, with a previous configuration, or before filesystem changes), and ;; load a found .asd if appropriate. Finally, update registration table and return results. - - (defun definition-dependencies-up-to-date-p (system) - (check-type system system) - (assert (primary-system-p system)) - (handler-case - (loop :with plan = (make-instance *plan-class*) - :for action :in (definition-dependency-list system) - :always (action-up-to-date-p - plan (action-operation action) (action-component action)) - :finally - (let ((o (make-operation 'define-op))) - (multiple-value-bind (stamp done-p) - (compute-action-stamp plan o system) - (return (and (timestamp<= stamp (component-operation-time o system)) - done-p))))) - (system-out-of-date () nil))) - (defmethod find-system ((name string) &optional (error-p t)) (nest (with-asdf-session (:key `(find-system ,name))) (let ((name-primary-p (primary-system-p name))) (unless name-primary-p (find-system (primary-system-name name) nil))) (or (and *immutable-systems* (gethash name *immutable-systems*) (registered-system name))) - (multiple-value-bind (foundp found-system pathname previous previous-time) + (multiple-value-bind (foundp found-system pathname previous previous-time previous-primary) (locate-system name) (assert (eq foundp (and (or found-system pathname previous) t)))) (let ((previous-pathname (system-source-file previous)) @@ -10863,18 +10911,18 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded. (setf (system-source-file system) pathname)) (if-let ((stamp (get-file-stamp pathname))) (let ((up-to-date-p - (and previous + (and previous previous-primary (or (pathname-equal pathname previous-pathname) (and pathname previous-pathname (pathname-equal (physicalize-pathname pathname) (physicalize-pathname previous-pathname)))) (timestamp<= stamp previous-time) - ;; TODO: check that all dependencies are up-to-date. - ;; This necessitates traversing them without triggering - ;; the adding of nodes to the plan. - (or (not name-primary-p) - (definition-dependencies-up-to-date-p previous))))) + ;; Check that all previous definition-dependencies are up-to-date, + ;; traversing them without triggering the adding of nodes to the plan. + ;; TODO: actually have a prepare-define-op, extract its timestamp, + ;; and check that it is less than the stamp of the previous define-op ? + (definition-dependencies-up-to-date-p previous-primary)))) (unless up-to-date-p (restart-case (signal 'system-out-of-date :name name) @@ -11284,12 +11332,9 @@ system names contained using COERCE-NAME. Return the result." (in-package :asdf/bundle) (with-upgradability () - (defclass bundle-op (operation) - ;; NB: use of instance-allocated slots for operations is DEPRECATED - ;; and only supported in a temporary fashion for backward compatibility. - ;; Supported replacement: Define slots on program-system instead. - ((bundle-type :initform :no-output-file :reader bundle-type :allocation :class)) + (defclass bundle-op (operation) () (:documentation "base class for operations that bundle outputs from multiple components")) + (defgeneric bundle-type (bundle-op)) (defclass monolithic-op (operation) () (:documentation "A MONOLITHIC operation operates on a system *and all of its @@ -11330,10 +11375,11 @@ itself.")) (defclass link-op (bundle-op) () (:documentation "Abstract operation for linking files together")) - (defclass gather-operation (bundle-op) - ((gather-operation :initform nil :allocation :class :reader gather-operation) - (gather-type :initform :no-output-file :allocation :class :reader gather-type)) + (defclass gather-operation (bundle-op) () (:documentation "Abstract operation for gathering many input files from a system")) + (defgeneric gather-operation (gather-operation)) + (defmethod gather-operation ((o gather-operation)) nil) + (defgeneric gather-type (gather-operation)) (defun operation-monolithic-p (op) (typep op 'monolithic-op)) @@ -11370,11 +11416,12 @@ itself.")) `((,go ,@deps) ,@(call-next-method)))) ;; Create a single fasl for the entire library - (defclass basic-compile-bundle-op (bundle-op basic-compile-op) - ((gather-type :initform #-(or clasp ecl mkcl) :fasl #+(or clasp ecl mkcl) :object - :allocation :class) - (bundle-type :initform :fasb :allocation :class)) + (defclass basic-compile-bundle-op (bundle-op basic-compile-op) () (:documentation "Base class for compiling into a bundle")) + (defmethod bundle-type ((o basic-compile-bundle-op)) :fasb) + (defmethod gather-type ((o basic-compile-bundle-op)) + #-(or clasp ecl mkcl) :fasl + #+(or clasp ecl mkcl) :object) ;; Analog to prepare-op, for load-bundle-op and compile-bundle-op (defclass prepare-bundle-op (sideway-operation) @@ -11383,9 +11430,7 @@ itself.")) :allocation :class)) (:documentation "Operation class for loading the bundles of a system's dependencies")) - (defclass lib-op (link-op gather-operation non-propagating-operation) - ((gather-type :initform :object :allocation :class) - (bundle-type :initform :lib :allocation :class)) + (defclass lib-op (link-op gather-operation non-propagating-operation) () (:documentation "Compile the system and produce a linkable static library (.a/.lib) for all the linkable object files associated with the system. Compare with DLL-OP. @@ -11394,6 +11439,8 @@ written in C or another language with a compiler producing linkable object files On CLASP, ECL, MKCL, these object files _also_ include the contents of Lisp files themselves. In any case, this operation will produce what you need to further build a static runtime for your system, or a dynamic library to load in an existing runtime.")) + (defmethod bundle-type ((o lib-op)) :lib) + (defmethod gather-type ((o lib-op)) :object) ;; What works: on ECL, CLASP(?), MKCL, we link the many .o files from the system into the .so; ;; on other implementations, we combine (usually concatenate) the .fasl files into one. @@ -11417,11 +11464,11 @@ faster and more resource efficient.")) ;; we'd have to have the monolithic-op not inherit from the main op, ;; but instead inherit from a basic-FOO-op as with basic-compile-bundle-op above. - (defclass dll-op (link-op gather-operation non-propagating-operation) - ((gather-type :initform :object :allocation :class) - (bundle-type :initform :dll :allocation :class)) + (defclass dll-op (link-op gather-operation non-propagating-operation) () (:documentation "Compile the system and produce a dynamic loadable library (.so/.dll) for all the linkable object files associated with the system. Compare with LIB-OP.")) + (defmethod bundle-type ((o dll-op)) :dll) + (defmethod gather-type ((o dll-op)) :object) (defclass deliver-asd-op (basic-compile-op selfward-operation) ((selfward-operation @@ -11450,27 +11497,25 @@ for all the linkable object files associated with the system. Compare with LIB-O ((selfward-operation :initform 'monolithic-compile-bundle-op :allocation :class)) (:documentation "Load a single fasl for the system and its dependencies.")) - (defclass monolithic-lib-op (lib-op monolithic-bundle-op non-propagating-operation) - ((gather-type :initform :object :allocation :class)) + (defclass monolithic-lib-op (lib-op monolithic-bundle-op non-propagating-operation) () (:documentation "Compile the system and produce a linkable static library (.a/.lib) for all the linkable object files associated with the system or its dependencies. See LIB-OP.")) - (defclass monolithic-dll-op (dll-op monolithic-bundle-op non-propagating-operation) - ((gather-type :initform :object :allocation :class)) + (defclass monolithic-dll-op (dll-op monolithic-bundle-op non-propagating-operation) () (:documentation "Compile the system and produce a dynamic loadable library (.so/.dll) for all the linkable object files associated with the system or its dependencies. See LIB-OP")) (defclass image-op (monolithic-bundle-op selfward-operation #+(or clasp ecl mkcl) link-op #+(or clasp ecl mkcl) gather-operation) - ((bundle-type :initform :image :allocation :class) - (gather-operation :initform 'lib-op :allocation :class) - #+(or clasp ecl mkcl) (gather-type :initform :static-library :allocation :class) - (selfward-operation :initform '(#-(or clasp ecl mkcl) load-op) :allocation :class)) + ((selfward-operation :initform '(#-(or clasp ecl mkcl) load-op) :allocation :class)) (:documentation "create an image file from the system and its dependencies")) + (defmethod bundle-type ((o image-op)) :image) + #+(or clasp ecl mkcl) (defmethod gather-operation ((o image-op)) 'lib-op) + #+(or clasp ecl mkcl) (defmethod gather-type ((o image-op)) :static-library) - (defclass program-op (image-op) - ((bundle-type :initform :program :allocation :class)) + (defclass program-op (image-op) () (:documentation "create an executable file from the system and its dependencies")) + (defmethod bundle-type ((o program-op)) :program) ;; From the ASDF-internal bundle-type identifier, get a filesystem-usable pathname type. (defun bundle-pathname-type (bundle-type) @@ -11857,8 +11902,8 @@ which is probably not what you want; you probably need to tweak your output tran ;;; (with-upgradability () ;; Base classes for both regular and monolithic concatenate-source operations - (defclass basic-concatenate-source-op (bundle-op) - ((bundle-type :initform "lisp" :allocation :class))) + (defclass basic-concatenate-source-op (bundle-op) ()) + (defmethod bundle-type ((o basic-concatenate-source-op)) "lisp") (defclass basic-load-concatenated-source-op (basic-load-op selfward-operation) ()) (defclass basic-compile-concatenated-source-op (basic-compile-op selfward-operation) ()) (defclass basic-load-compiled-concatenated-source-op (basic-load-op selfward-operation) ()) @@ -12076,7 +12121,7 @@ otherwise return a default system name computed from PACKAGE-NAME." previous (eval `(defsystem ,system :class package-inferred-system - :source-file nil + :source-file ,(system-source-file top) :pathname ,dir :depends-on ,dependencies :around-compile ,around-compile @@ -13282,10 +13327,10 @@ system or its dependencies if it has already been loaded." :asdf/system ;; used by ECL :asdf/upgrade :asdf/system-registry :asdf/operate :asdf/bundle) ;; Happily, all those implementations all have the same module-provider hook interface. - #+(or abcl clasp cmucl clozure ecl mkcl sbcl) - (:import-from #+abcl :sys #+(or clasp cmucl ecl) :ext #+clozure :ccl #+mkcl :mk-ext #+sbcl sb-ext - #:*module-provider-functions* - #+ecl #:*load-hooks*) + #+(or abcl clasp cmucl clozure ecl mezzano mkcl sbcl) + (:import-from #+abcl :sys #+(or clasp cmucl ecl) :ext #+clozure :ccl #+mkcl :mk-ext #+sbcl sb-ext #+mezzano :sys.int + #:*module-provider-functions* + #+ecl #:*load-hooks*) #+(or clasp mkcl) (:import-from :si #:*load-hooks*)) (in-package :asdf/footer) @@ -13299,7 +13344,7 @@ system or its dependencies if it has already been loaded." ;;;; Hook ASDF into the implementation's REQUIRE and other entry points. -#+(or abcl clasp clisp clozure cmucl ecl mkcl sbcl) +#+(or abcl clasp clisp clozure cmucl ecl mezzano mkcl sbcl) (with-upgradability () ;; Hook into CL:REQUIRE. #-clisp (pushnew 'module-provide-asdf *module-provider-functions*) @@ -13319,15 +13364,15 @@ system or its dependencies if it has already been loaded." (setf (gethash 'module-provide-asdf *wrapped-module-provider*) 'module-provide-asdf) (defun wrap-module-provider (provider name) (let ((results (multiple-value-list (funcall provider name)))) - (when (first results) (register-preloaded-system (coerce-name name))) - (values-list results))) + (when (first results) (register-preloaded-system (coerce-name name))) + (values-list results))) (defun wrap-module-provider-function (provider) (ensure-gethash provider *wrapped-module-provider* - (constantly - #'(lambda (module-name) - (wrap-module-provider provider module-name))))) + (constantly + #'(lambda (module-name) + (wrap-module-provider provider module-name))))) (setf *module-provider-functions* - (mapcar #'wrap-module-provider-function *module-provider-functions*)))) + (mapcar #'wrap-module-provider-function *module-provider-functions*)))) #+cmucl ;; Hook into the CMUCL herald. (with-upgradability () ===================================== src/contrib/asdf/doc/asdf.html ===================================== --- a/src/contrib/asdf/doc/asdf.html +++ b/src/contrib/asdf/doc/asdf.html @@ -277,7 +277,7 @@ ul.no-bullet {list-style: none} <a name="Top"></a> <a name="ASDF_003a-Another-System-Definition-Facility"></a> <h1 class="top">ASDF: Another System Definition Facility</h1> -<p>Manual for Version 3.3.1 +<p>Manual for Version 3.3.2 </p> <p>This manual describes ASDF, a system definition facility @@ -6047,9 +6047,10 @@ see the <samp>TODO</samp> file in the source repository. Available in updated-for-CL form on the web at <a href="http://nhplace.com/kent/Papers/Large-Systems.html">http://nhplace.com/kent/Papers/Large-Systems.html</a> </li><li> Dan Weinreb and David Moon: - “Lisp Machine Manual”, MIT, 1981. + “Lisp Machine Manual”, 3rd Edition MIT, March 1981. The famous CHINE NUAL describes one of the earliest variants of DEFSYSTEM. - <a href="https://bitsavers.trailing-edge.com/pdf/mit/cadr/chinual_4thEd_Jul81.pdf">https://bitsavers.trailing-edge.com/pdf/mit/cadr/chinual_4thEd_Jul81.pdf</a> + (NB: Not present in the second preliminary version of January 1979) + <a href="http://bitsavers.org/pdf/mit/cadr/chinual_3rdEd_Mar81.pdf">http://bitsavers.org/pdf/mit/cadr/chinual_3rdEd_Mar81.pdf</a> </li></ul> ===================================== src/contrib/asdf/doc/asdf.info ===================================== --- a/src/contrib/asdf/doc/asdf.info +++ b/src/contrib/asdf/doc/asdf.info @@ -43,7 +43,7 @@ File: asdf.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) ASDF: Another System Definition Facility **************************************** -Manual for Version 3.3.1 +Manual for Version 3.3.2 This manual describes ASDF, a system definition facility for Common Lisp programs and libraries. @@ -5544,10 +5544,11 @@ Bibliography * Kent M. Pitman (kmp): "The Description of Large Systems", MIT AI Memo 801, 1984. Available in updated-for-CL form on the web at <http://nhplace.com/kent/Papers/Large-Systems.html> - * Dan Weinreb and David Moon: "Lisp Machine Manual", MIT, 1981. The - famous CHINE NUAL describes one of the earliest variants of - DEFSYSTEM. - <https://bitsavers.trailing-edge.com/pdf/mit/cadr/chinual_4thEd_Jul81.pdf> + * Dan Weinreb and David Moon: "Lisp Machine Manual", 3rd Edition MIT, + March 1981. The famous CHINE NUAL describes one of the earliest + variants of DEFSYSTEM. (NB: Not present in the second preliminary + version of January 1979) + <http://bitsavers.org/pdf/mit/cadr/chinual_3rdEd_Mar81.pdf> File: asdf.info, Node: Concept Index, Next: Function and Class Index, Prev: Bibliography, Up: Top @@ -5999,8 +6000,8 @@ Node: ASDF development FAQs252003 Node: How do I run the tests interactively in a REPL?252242 Node: Ongoing Work253809 Node: Bibliography254088 -Node: Concept Index257559 -Node: Function and Class Index264554 -Node: Variable Index276328 +Node: Concept Index257635 +Node: Function and Class Index264630 +Node: Variable Index276404 End Tag Table ===================================== src/contrib/asdf/doc/asdf.pdf ===================================== Binary files a/src/contrib/asdf/doc/asdf.pdf and b/src/contrib/asdf/doc/asdf.pdf differ ===================================== src/general-info/release-21d.md ===================================== --- a/src/general-info/release-21d.md +++ b/src/general-info/release-21d.md @@ -19,7 +19,7 @@ public domain. ## New in this release: * Known issues: * Feature enhancements - * Update to ASDF 3.3.1, fixing issues introduced in 3.3.0 + * Update to ASDF 3.3.2 * Changes * x86 and sparc have replaced the MT19937 RNG with xoroshiro128+ RNG. * The required state for this generator is just 4 32-bit words instead of the 600+ for MT19937. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/23e31483c0524f5ddb6349d04… --- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/23e31483c0524f5ddb6349d04… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Update manual date to 21c
by Raymond Toy 14 Mar '18

14 Mar '18

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 3c749f8b by Raymond Toy at 2018-03-14T15:47:15-07:00 Update manual date to 21c Just change the date on the manual to the date of the 21c release. Now that we can create the html pages again with hevea, we can update this. - - - - - 1 changed file: - src/docs/cmu-user/cmu-user.tex 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 2016 \\ 21b} +\date{October 2017 \\ 21c} \begin{document} View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/3c749f8b9bc08723d814ce9d4… --- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/3c749f8b9bc08723d814ce9d4… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 6 commits: Restore hevea support for buliding cmu-user
by Raymond Toy 06 Mar '18

06 Mar '18

Raymond Toy pushed to branch master at cmucl / cmucl Commits: e3c4759d by Philip Fominykh at 2018-02-13T00:20:33-05:00 Restore hevea support for buliding cmu-user - - - - - 3be1f5ba by Philip Fominykh at 2018-02-13T00:22:15-05:00 Improved function signature rendering in cmu-user html version - - - - - ccd159f1 by Philip Fominykh at 2018-03-05T00:59:37-05:00 Remove extra paragraph generation in Hevea definitions. Added argument #5 to \layout to act as prelude. Putting index and spacing commands there eliminates extra paragraph. - - - - - 7b9be9a8 by Philip Fominykh at 2018-03-05T01:01:53-05:00 Hevea cmu-user generation cleanups. - - - - - 9b55c3e4 by Philip Fominykh at 2018-03-05T01:03:02-05:00 Merge branch 'master' into pfominykh-cmu-user-fixes - - - - - efc3d8c5 by Raymond Toy at 2018-03-06T04:18:37+00:00 Merge branch 'pfominykh-cmu-user-fixes' into 'master' Restore hevea support for cmu-user See merge request cmucl/cmucl!35 - - - - - 10 changed files: - src/docs/cmu-user/Makefile - src/docs/cmu-user/aliens.tex - src/docs/cmu-user/cmu-user.hva - src/docs/cmu-user/cmucl.css - src/docs/cmu-user/cross-referencing.tex - src/docs/cmu-user/debugger.tex - src/docs/cmu-user/extensions.tex - src/docs/cmu-user/introduction.tex - src/docs/cmu-user/ipc.tex - src/docs/cmu-user/unicode.tex Changes: ===================================== src/docs/cmu-user/Makefile ===================================== --- a/src/docs/cmu-user/Makefile +++ b/src/docs/cmu-user/Makefile @@ -70,7 +70,7 @@ all: cmu-user.pdf # the "-fix" option to hevea makes it run as many times as necessary # to resolve all cross-references and generate an index. -%.html : %.tex $(FILES) +%.html : %.tex $(FILES) cmu-user.hva $(HEVEA) -fix cmu-user.hva $< $(HACHA) -tocbis $@ -$(TIDY) -m *.html @@ -105,6 +105,7 @@ clean: rm -f *.log *.bbl *.blg *.ps *.pdf *.aux *.lof *.toc *.out *.ilg rm -f *.vdx *.cdx *.tdx *.fdx *.idx *.cnd *.fnd *.tnd *.vnd *.haux rm -f *.html *.hcnd *.htnd *.hvnd *.hfnd *.htoc + rm -f cmu-user.css index: makeindex cmu-user.tdx -o cmu-user.tnd ===================================== src/docs/cmu-user/aliens.tex ===================================== --- a/src/docs/cmu-user/aliens.tex +++ b/src/docs/cmu-user/aliens.tex @@ -295,7 +295,7 @@ This section describes the basic operations on Alien values. \subsection{Alien Access Operations} -\begin{defun}{alien:}{deref}{\args{\var{pointer-or-array} \amprest \var{indices}}} +\begin{defun}{alien:}{deref}{\args{\var{pointer-or-array} \amprest{} \var{indices}}} This function returns the value pointed to by an Alien pointer or the value of an Alien array element. If a pointer, an optional @@ -766,7 +766,7 @@ and two return values (\var{a} and \var{i}). macro: \begin{defmac}{alien:}{def-callback}{\var{name} (\var{return-type} - \mstar{(arg-name arg-type)}) \ampbody\ body} + \mstar{(arg-name arg-type)}) \ampbody{} \var{body}} This macro defines a Lisp function that can be called from C and a Lisp variable. The arguments to the function must be alien types, and the return type must also be an alien type. This Lisp function @@ -789,7 +789,7 @@ macro: \code{def-callback} macro. \end{defmac} -\begin{defmac}{alien:}{callback-funcall}{\var{callback-name} \amprest +\begin{defmac}{alien:}{callback-funcall}{\var{callback-name} \amprest{} \var{args}} This macro does the necessary stuff to call the callback named \var{callback-name} with the given arguments. ===================================== src/docs/cmu-user/cmu-user.hva ===================================== --- a/src/docs/cmu-user/cmu-user.hva +++ b/src/docs/cmu-user/cmu-user.hva @@ -4,18 +4,24 @@ % to HTML using Hevea. By Luc Maranget and Eric Marsden. \newif\ifhmode\hmodefalse -\newcommand{\xspace}{} +\newcommand{\pdfinfo}[1]{\@print{}} \let\hbox\mbox \def\hfil{} \def\hfill{} \newcommand{\parbox}[3][]{\mbox{#3}} \newcommand{\lengthtest}[1]{true} \newenvironment{minipage}[2][]{}{} -\newcommand{\layout}[4][] - {\@open{DIV}{align=left} +\newcommand{\layout}[5][] + {\@open{DIV}{align=left}#5% [#4] \\ + \begin{tabbing} \fcnname{#1}\fcnname{#2} #3 \@print{   } + \end{tabbing} \@close{DIV}} +\newcommand{\keys}[1]{\code{\&key}\@print{ }\= #1} + +\renewcommand{\textgreater}{\@print{>}} +\renewcommand{\textless}{\@print{<}} % \newcommand{\layout}[4][] % {\begin{tabular} @@ -26,13 +32,12 @@ % \end{tabular}} -\newcommand{\fcntype}[1]{\@open{TT}{class=function-type}#1\@close{TT}} -\newcommand{\argtype}[1]{\@open{TT}{class=argument-type}#1\@close{TT}} -\newcommand{\fcnname}[1]{\@open{TT}{class=function-name}#1\@close{TT}} -\newcommand{\var}[1]{\@open{TT}{class=variable}#1\@close{TT}} -\newcommand{\code}[1]{\@open{TT}{class=code}#1\@close{TT}} -\newcommand{\file}[1]{\@open{TT}{class=filename}#1\@close{TT}} - +\newcommand{\fcntype}[1]{\@styleattr{TT}{class=function-type}#1\@clearstyle} +\newcommand{\argtype}[1]{\@styleattr{TT}{class=argument-type}#1\@clearstyle} +\newcommand{\fcnname}[1]{\@styleattr{TT}{class=function-name}#1\@clearstyle} +\newcommand{\var}[1]{\@styleattr{TT}{class=variable}#1\@clearstyle} +\newcommand{\code}[1]{\@styleattr{TT}{class=code}#1\@clearstyle} +\newcommand{\file}[1]{\@styleattr{TT}{class=filename}#1\@clearstyle} %% Define a new type %% @@ -40,40 +45,40 @@ %% some description %% \end{deftp} \newenvironment{deftp}[3] - {\par\bigskip\index[types]{#2|textbf}% - \layout{#2}{\var{#3}}{#1} + {\layout{#2}{\var{#3}}{#1}% + {\bigskip\index[types]{#2|textbf}} \begin{quote}} {\end{quote}} %% Define a function %% -%% \begin{defun}{pkg}{name}{params} +%% \begin{defun}[suffix]{pkg}{name}{params} %% \defunx[pkg]{name}{params} %% description of function %% \end{defun} -\newenvironment{defun}[3] - {\par\defunvspace\fnindexbold{#2}\label{FN:#2}% - \layout[#1]{#2}{#3}{Function} +\newenvironment{defun}[4][] + {\layout[#2]{#3}{#4}{Function}% + {\defunvspace\fnindexbold{#3}\label{FN:#3#1}} \begin{quote}} {\end{quote}} \newcommand{\defunx}[3][\mbox{}]{% - \par\fnindexbold{#2}\label{FN:#2}% - \layout[#1]{#2}{#3}{Function}} + \layout[#1]{#2}{#3}{Function}% + {\fnindexbold{#2}\label{FN:#2}}} %% Define a macro %% -%% \begin{defmac}{pkg}{name}{params} +%% \begin{defmac}[suffix]{pkg}{name}{params} %% \defmacx[pkg]{name}{params} %% description of macro %% \end{defmac} -\newenvironment{defmac}[3]{% - \par\defunvspace\fnindexbold{#2}\label{FN:#2}% - \layout[#1]{#2}{#3}{Macro} +\newenvironment{defmac}[4][]{% + \layout[#2]{#3}{#4}{Macro}% + {\defunvspace\fnindexbold{#3}\label{FN:#3#1}} \begin{quote}} {\end{quote}} \newcommand{\defmacx}[3][\mbox{}]{% - \par\fnindexbold{#2}\label{FN:#2}% - \layout[#1]{#2}{#3}{Function}} + \layout[#1]{#2}{#3}{Function}% + {\fnindexbold{#2}\label{FN:#2}}} %% Define a variable %% @@ -82,13 +87,13 @@ %% description of defvar %% \end{defvar} \newenvironment{defvar}[2]{% - \par\defunvspace\vrindexbold{#2}\label{VR:#2} - \layout[#1]{*#2*}{}{Variable} + \layout[#1]{*#2*}{}{Variable}% + {\defunvspace\vrindexbold{#2}\label{VR:#2}} \begin{quote}} {\end{quote}} \newcommand{\defvarx}[2][\mbox{}]{% - \par\vrindexbold{#2}\label{VR:#2} - \layout[#1]{*#2*}{}{Variable}} + \layout[#1]{*#2*}{}{Variable}% + {\vrindexbold{#2}\label{VR:#2}}} %% Define a constant %% @@ -97,11 +102,12 @@ %% description of defconst %% \end{defconst} \newenvironment{defconst}[2]{% - \defunvspace\defconstx[#1]{#2} + \layout[#1]{#2}{}{Constant}% + {\defunvspace} \begin{quote}} {\end{quote}} \newcommand{\defconstx}[2][\mbox{}]{% - \layout[#1]{#2}{}{Constant}} + \layout[#1]{#2}{}{Constant}{}} @@ -110,10 +116,10 @@ {\@open{BLOCKQUOTE}{class=example}\begin{alltt}} {\end{alltt}\@close{BLOCKQUOTE}} \newenvironment{lisp} - {\@open{BLOCKQUOTE}{CLASS=lisp} \begin{alltt}} + {\@open{BLOCKQUOTE}{CLASS=lisp}\begin{alltt}} {\end{alltt}\@close{BLOCKQUOTE}} -\newcommand{\cmucl}{CMUCL} - +\newcommand{\cmucl}{{\scshape cmucl}} + % there are no page numbers in HTML, so we need to override certain % cross-referencing macros @@ -134,7 +140,7 @@ % disable ``this document generated by'' footer -\setcounter{footer}{0} +\def\@footer{} % \htmlhead{\@print{ % <a href="../../">CMUCL</a> -&gt @@ -165,12 +171,19 @@ \setcounter{cuttingdepth}{10} \input{report.hva} -\input{fancysection.hva} +%%\input{fancysection.hva} +\usepackage{color} \definecolor{chapter}{rgb}{1, 1, 0.74} \definecolor{part}{rgb}{1, 1, 0.81} \definecolor{section}{rgb}{1, 1, 0.83} \definecolor{subsection}{rgb}{1, 1, 0.89} \definecolor{subsubsection}{rgb}{1, 1, 0.93} +\newstyle{.chapter}{padding:0.5ex;background-color:\@getstylecolor{chapter}} +\newstyle{.section} {padding:.5ex;background-color:\@getstylecolor{section}}% +\newstyle{.subsection} {padding:0.3ex;background-color:\@getstylecolor{subsection}}% +\newstyle{.subsubsection} {padding:0.5ex;background-color:\@getstylecolor{subsubsection}}% +\newstyle{.paragraph} {padding:0.5ex;background-color:\@getstylecolor{paragraph}}% \renewcommand{\@bodyargs}{} + % EOF ===================================== src/docs/cmu-user/cmucl.css ===================================== --- a/src/docs/cmu-user/cmucl.css +++ b/src/docs/cmu-user/cmucl.css @@ -35,7 +35,7 @@ h3 { .code { background: #faf0e6; border:solid #faf0e6 1px; - white-space:pre; + white-space:pre-line; } .technical { ===================================== src/docs/cmu-user/cross-referencing.tex ===================================== --- a/src/docs/cmu-user/cross-referencing.tex +++ b/src/docs/cmu-user/cross-referencing.tex @@ -142,7 +142,7 @@ source file), and so is identified by the XREF facility by a string. \end{defun} -\begin{defun}{xref:}{xref-context-file}{context} +\begin{defun}{xref:}{xref-context-file}{\var{context}} Return the truename (in the sense of the variable \vindexed{compile-file-truename}) of the source file from which the referencing forms were compiled. This slot will be \nil{} if the @@ -150,7 +150,7 @@ source file), and so is identified by the XREF facility by a string. listener. \end{defun} -\begin{defun}{xref:}{xref-context-source-path}{context} +\begin{defun}{xref:}{xref-context-source-path}{\var{context}} Return a list of positive integers identifying the form that contains the cross-reference. The first integer in the source-path is the number of the top-level form containing the cross-reference ===================================== src/docs/cmu-user/debugger.tex ===================================== --- a/src/docs/cmu-user/debugger.tex +++ b/src/docs/cmu-user/debugger.tex @@ -998,8 +998,7 @@ printing of the trace information and conditional breakpoints on function entry or exit. \begin{defmac}{}{trace}{% - \args{\mstar{option global-value} \mstar{name \mstar{option - value}}}} + \args{\mstar{option global-value} \mstar{name \mstar{option value}}}} \code{trace} is a debugging tool that prints information when specified functions are called. In its simplest form: ===================================== src/docs/cmu-user/extensions.tex ===================================== --- a/src/docs/cmu-user/extensions.tex +++ b/src/docs/cmu-user/extensions.tex @@ -162,9 +162,7 @@ IEEE floating point specifies four possible rounding modes: \findexed{truncate} function. \end{Lentry} -\paragraph{Warning:} - -Although the rounding mode can be changed with +Warning: Although the rounding mode can be changed with \code{set-floating-point-modes}, use of any value other than the default (\kwd{nearest}) can cause unusual behavior, since it will affect rounding done by \llisp{} system code as well as rounding in @@ -267,7 +265,7 @@ These functions can be used to modify or read the floating point modes: To make handling control of floating-point exceptions, the following macro is useful. -\begin{defmac}{ext:}{with-float-traps-masked}{traps \ampbody\ body} +\begin{defmac}{ext:}{with-float-traps-masked}{\var{traps} \ampbody\ \var{body}} \code{body} is executed with the selected floating-point exceptions given by \code{traps} masked out (disabled). \code{traps} should be a list of possible floating-point exceptions that should be ignored. @@ -839,7 +837,7 @@ finalization is used to close the underlying file descriptor. \section{Describe} -\begin{defun}{}{describe}{ \args{\var{object} \&optional{} \var{stream}}} +\begin{defun}{}{describe}{ \args{\var{object} \ampoptional{} \var{stream}}} The \code{describe} function prints useful information about \var{object} on \var{stream}, which defaults to @@ -1947,7 +1945,8 @@ way to browse the library. \section{Generalized Function Names} -\begin{defmac}{ext:}{define-function-name-syntax}{name (var) \ampbody\ body} +\begin{defmac}{ext:}{define-function-name-syntax}{% + \var{name} (\var{var}) \ampbody\ \var{body}} Define lists starting with the symbol \code{name} as a new extended function name syntax. @@ -1969,7 +1968,7 @@ way to browse the library. user-defined package. \end{defmac} -\begin{defun}{ext:}{valid-function-name-p}{name} +\begin{defun}{ext:}{valid-function-name-p}{\var{name}} Returns two values: \begin{itemize} @@ -1999,7 +1998,7 @@ function is called and standardized method combinations like \code{progn}, \code{and}, etc. \end{itemize} -\begin{defgeneric}[-generic]{pcl:}{no-primary-method}{gf \&rest args} +\begin{defgeneric}[-generic]{pcl:}{no-primary-method}{\var{gf} \amprest{} \var{args}} In \cmucl, this generic function is called in the above erroneous cases. The parameter \code{gf} is the generic function being called, and \code{args} is a list of actual arguments in the generic @@ -2007,7 +2006,7 @@ function is called and \end{defgeneric} \begin{defmethod}[-standard]{pcl:}{no-primary-method}{% - (gf standard-generic-function) \&rest args} + (\var{gf} \argtype{standard-generic-function}) \amprest{} \var{args}} This method signals a continuable error of type \code{pcl:no-primary-method-error}. \end{defmethod} @@ -2292,7 +2291,7 @@ methods, as it would be the case when a function is inlined somewhere else. Because of this, the function \code{pcl:flush-emf-cache} is provided for forcing such an update of effective methods. -\begin{defun}{pcl:}{flush-emf-cache}{\&optional gf} +\begin{defun}{pcl:}{flush-emf-cache}{\ampoptional{} \var{gf}} Flush cached effective method functions. If \code{gf} is supplied, it should be a generic function metaobject or the name of a generic function, and this function flushes all cached effective methods for @@ -2341,7 +2340,7 @@ when the generic function is called depending on the value of Support for sealing classes and generic functions have been implemented. Please note that this interface is subject to change. -\begin{defmac}{pcl:}{seal}{name (var) \amprest\ specifiers} +\begin{defmac}{pcl:}{seal}{\var{name} (\var{var}) \amprest{} \var{specifiers}} Seal \code{name} with respect to the given specifiers; \code{name} can be the name of a class or generic-function. @@ -2352,7 +2351,7 @@ implemented. Please note that this interface is subject to change. Sealing violations signal an error of type \code{pcl:sealed-error}. \end{defmac} -\begin{defun}{pcl:}{unseal}{name-or-object} +\begin{defun}{pcl:}{unseal}{\var{name-or-object}} Remove seals from \code{name-or-object}. \end{defun} @@ -2438,8 +2437,8 @@ extensions. \subsection{Extensions} -\begin{defun}{}{constantly}{value \&optional val1 val2 \&rest - more-values} +\begin{defun}{}{constantly}{% + \var{value} \ampoptional{} \var{val1} \var{val2} \amprest{} \var{more-values}} As an extension, \cmucl{} allows \code{constantly} to accept more than one value which are returned as multiple values. \end{defun} @@ -2502,7 +2501,7 @@ innermost fwrapper object. Likewise, if a function is fwrapped, \code{(setf fdefinition)} will set the primary function in the innermost fwrapper. -\begin{defmac}{fwrappers:}{define-fwrapper}{name lambda-list \ampbody{} body} +\begin{defmac}{fwrappers:}{define-fwrapper}{\var{name} \var{lambda-list} \ampbody{} \var{body}} This macro is like \code{defun}, but defines a function named \var{name} that can be used as an fwrapper definition. @@ -2518,8 +2517,8 @@ innermost fwrapper. arguments. \end{defmac} -\begin{defun}{fwrappers:}{fwrap}{function-name fwrapper \&key type - user-data} +\begin{defun}{fwrappers:}{fwrap}{\var{function-name} \var{fwrapper} % + \keys{\kwd{type} \kwd{user-data}}} This function wraps function \code{function-name} in an fwrapper \var{fwrapper} which was defined with \code{define-fwrapper}. @@ -2534,58 +2533,58 @@ innermost fwrapper. Value is the fwrapper object created. \end{defun} -\begin{defun}{fwrappers:}{funwrap}{function-name \&key type test} +\begin{defun}{fwrappers:}{funwrap}{\var{function-name} \keys{\kwd{type} \kwd{test}}} Remove fwrappers from the function named \var{function-name}. If \var{type} is supplied, remove fwrappers whose type is \code{equal} to \var{type}. If \var{test} is supplied, remove fwrappers satisfying \var{test}. \end{defun} -\begin{defun}{fwrappers:}{find-fwrapper}{function-name \&key type test} +\begin{defun}{fwrappers:}{find-fwrapper}{\var{function-name} \keys{\kwd{type} \kwd{test}}} Find an fwrapper of \var{function-name}. If \var{type} is supplied, find an fwrapper whose type is \code{equal} to \var{type}. If \var{test} is supplied, find an fwrapper satisfying \var{test}. \end{defun} -\begin{defun}{fwrappers:}{update-fwrapper}{fwrapper} +\begin{defun}{fwrappers:}{update-fwrapper}{\var{fwrapper}} Update the funcallable instance function of the fwrapper object \var{fwrapper} from the definition of its function that was defined with \code{define-fwrapper}. This can be used to update fwrappers after changing a \code{define-fwrapper}. \end{defun} -\begin{defun}{fwrappers:}{update-fwrappers}{function-name \&key type test} +\begin{defun}{fwrappers:}{update-fwrappers}{\var{function-name} \keys{\kwd{type} \kwd{test}}} Update fwrappers of \var{function-name}; see \code{update-fwrapper}. If \var{type} is supplied, update fwrappers whose type is \code{equal} to \var{type}. If \var{test} is supplied, update fwrappers satisfying \var{test}. \end{defun} -\begin{defun}{fwrappers:}{set-fwrappers}{function-name fwrappers} +\begin{defun}{fwrappers:}{set-fwrappers}{\var{function-name} \var{fwrappers}} Set \var{function-names}'s fwrappers to elements of the list \var{fwrappers}, which is assumed to be ordered from outermost to innermost. \var{fwrappers} null means remove all fwrappers. \end{defun} -\begin{defun}{fwrappers:}{list-fwrappers}{function-name} +\begin{defun}{fwrappers:}{list-fwrappers}{\var{function-name}} Return a list of all fwrappers of \var{function-name}, ordered from outermost to innermost. \end{defun} -\begin{defun}{fwrappers:}{push-fwrapper}{fwrapper function-name} +\begin{defun}{fwrappers:}{push-fwrapper}{\var{fwrapper} \var{function-name}} Prepend fwrapper \var{fwrapper} to the definition of \var{function-name}. Signal an error if \var{function-name} is an undefined function. \end{defun} -\begin{defun}{fwrappers:}{delete-fwrapper}{fwrapper function-name} +\begin{defun}{fwrappers:}{delete-fwrapper}{\var{fwrapper} \var{function-name}} Remove fwrapper \var{fwrapper} from the definition of \var{function-name}. Signal an error if \var{function-name} is an undefined function. \end{defun} -\begin{defmac}{fwrappers:}{do-fwrappers}{(var fdefn \ampoptional{} - result) \ampbody{} body} +\begin{defmac}{fwrappers:}{do-fwrappers}{(\var{var} \var{fdefn} \ampoptional{} + \var{result}) \ampbody{} \var{body}} Evaluate \var{body} with \var{var} bound to consecutive fwrappers of \var{fdefn}. Return \var{result} at the end. Note that \var{fdefn} must be an \code{fdefn} object. You can use @@ -2772,18 +2771,18 @@ that order. beginning of this list. \end{defvar} -\begin{defmac}{ext:}{defmodule}{name \amprest{} files} +\begin{defmac}{ext:}{defmodule}{\var{name} \amprest{} \var{files}} Defines a module by registering the files that need to be loaded when the module is required. If \var{name} is a symbol, its print name is used after downcasing it. \end{defmac} -\begin{defun}{ext:}{module-provide-cmucl-defmodule}{module-name} +\begin{defun}{ext:}{module-provide-cmucl-defmodule}{\var{module-name}} This function is the module-provider for modules registered by a \code{ext:defmodule} form. \end{defun} -\begin{defun}{ext:}{module-provide-cmucl-library}{module-name} +\begin{defun}{ext:}{module-provide-cmucl-library}{\var{module-name}} This function is the module-provider for \cmucl's libraries, including Gray streams, simple streams, CLX, CLM, Hemlock, \emph{etc}. @@ -2830,7 +2829,7 @@ recording of strings, call \code{intl:translation-enable}. Disablle recording of translatable strings. \end{defun} -\begin{defun}{intl:}{setlocale}{\ampoptional{} locale} +\begin{defun}{intl:}{setlocale}{\ampoptional{} \var{locale}} Sets the locale to the locale specified by \var{locale}. If \var{locale} is not give or is \nil, the locale is determined by look at the environment variables \code{LANGUAGE}, \code{LC\_ALL}, @@ -2840,19 +2839,19 @@ recording of strings, call \code{intl:translation-enable}. The default locale is ``C''. \end{defun} -\begin{defun}{intl:}{textdomain}{domain} +\begin{defun}{intl:}{textdomain}{\var{domain}} Set the default domain to the domain specified by \var{domain}. Typically, this only needs to be done at the top of each source file. This is used to \code{gettext} and \code{ngettext} to set the domain for the message string. \end{defun} -\begin{defmac}{intl:}{gettext}{string} +\begin{defmac}{intl:}{gettext}{\var{string}} Look up the specified string, \var{string}, in the current message domain and return its translation. \end{defmac} -\begin{defun}{intl:}{dgettext}{domain string} +\begin{defun}{intl:}{dgettext}{\var{domain} \var{string}} Look up the specified string, \var{string}, in the message domain, \var{domain}. The translation is returned. @@ -2861,14 +2860,14 @@ recording of strings, call \code{intl:translation-enable}. \code{intl::dump-pot-files}.) \end{defun} -\begin{defmac}{intl:}{ngettext}{singular plural n} +\begin{defmac}{intl:}{ngettext}{\var{singular} \var{plural} \var{n}} Look up the singular or plural form of a message in the default domain. The singular form is \var{singular}; the plural is \var{plural}. The number of items is specified by \var{n} in case the correct translation depends on the actual number of items. \end{defmac} -\begin{defun}{intl:}{dngettext}{domain singular plural n} +\begin{defun}{intl:}{dngettext}{\var{domain} \var{singular} \var{plural} \var{n}} Look up the singular or plural form of a message in the specified domain, \var{domain}. The singular form is \var{singular}; the plural is \var{plural}. The number of items is specified by \var{n} @@ -2880,8 +2879,7 @@ recording of strings, call \code{intl:translation-enable}. created. (See \code{intl::dump-pot-files}.) \end{defun} -\begin{defun}{intl::}{dump-pot-files}{\keys copyright - output-directory} +\begin{defun}{intl::}{dump-pot-files}{\keys{\kwd{copyright} \kwd{output-directory}}} Dumps the translatable strings recorded by \code{dgettext} and \code{dngettext}. The message template file (pot file) is written to a file in the directory specified by \var{output-directory}, and @@ -2895,7 +2893,7 @@ recording of strings, call \code{intl:translation-enable}. This is a list of directory pathnames where the translations can be found. \end{defvar} -\begin{defun}{intl:}{install}{\ampoptional{} (rt *readtable*)} +\begin{defun}{intl:}{install}{\ampoptional{} (\var{rt} \var{*readtable*})} Installs reader macros and comment reader into the specified readtable as explained below. The readtable defaults to \var{*readtable*}. ===================================== src/docs/cmu-user/introduction.tex ===================================== --- a/src/docs/cmu-user/introduction.tex +++ b/src/docs/cmu-user/introduction.tex @@ -80,7 +80,7 @@ See also \verb|cmucl(1)|. Currently \cmucl{} accepts the following switches: \begin{Lentry} -\item[\code{--help}] Same as \code{-help}. +\item[\code{-{}-help}] Same as \code{-help}. \item[\code{-help}] Print ou the command line options and exit. ===================================== src/docs/cmu-user/ipc.tex ===================================== --- a/src/docs/cmu-user/ipc.tex +++ b/src/docs/cmu-user/ipc.tex @@ -161,7 +161,7 @@ could use \code{prin1-to-string} locally, send the string, and use \end{defmac} \begin{defmac}{wire:}{remote-value-bind}{% - \args{\var{wire} (\mstar{variable}) remote-form + \args{\var{wire} (\mstar{variable}) \var{remote-form} \mstar{local-forms}}} \code{remote-value-bind} is similar to \code{multiple-value-bind} ===================================== src/docs/cmu-user/unicode.tex ===================================== --- a/src/docs/cmu-user/unicode.tex +++ b/src/docs/cmu-user/unicode.tex @@ -348,10 +348,10 @@ this encoding and handle the surrogate pairs correctly. \begin{defun}{}{string=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} \defunx{string/=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} - \defunx{string$<$}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} - \defunx{string$>$}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} - \defunx{string$<$=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} - \defunx{string$>$=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} + \defunx{string\textless}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} + \defunx{string\textgreater}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} + \defunx{string\textless=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} + \defunx{string\textgreater=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}} The string comparison is done in codepoint order. (This is different from just comparing the order of the individual characters due to surrogate pairs.) Unicode collation is not done. @@ -443,7 +443,7 @@ The Unicode data base is stored in compressed form in the file \file{ext-formats:unidata.bin}. If this file is not found, Unicode support is severely reduced; you can only use ASCII characters. -\begin{defun}{}{open}{\args \var{filename} \amprest \var{options} +\begin{defun}{}{open}{\args \var{filename} \amprest{} \var{options} \keys{\kwd{direction} \kwd{element-type} \kwd{if-exists} \kwd{if-does-not-exist} \morekeys \kwd{class} \kwd{mapped} \kwd{input-handle} \kwd{output-handle} @@ -497,7 +497,7 @@ support is severely reduced; you can only use ASCII characters. formats and composing external formats. \end{defun} -\begin{defun}{extensions:}{describe-external-format}{external-format} +\begin{defun}{extensions:}{describe-external-format}{\var{external-format}} Print a description of the given \var{external-format}. This may cause the external format to be loaded (silently) if it is not already loaded. @@ -627,12 +627,12 @@ An external format basically needs two functions: external format is defined using the macro \code{stream::define-external-format}. -\begin{defmac}[base]{stream:}{define-external-format}{\args \var{name} - (\keys{\var{base} \var{min} \var{max} \var{size} - \var{documentation}}) +% tricky +\begin{defmac}[base]{stream::}{define-external-format}{\args \var{name} + (\keys{\kwd{base} \kwd{min} \kwd{max} \kwd{size} \kwd{documentation}}) (\amprest{} \var{slots}) - \morekeys{\var{octets-to-code} \var{code-to-octets} - \var{flush-state} \var{copy-state}}} + \\ + \= \ampoptional{} \var{octets-to-code} \var{code-to-octets} \var{flush-state} \var{copy-state}} If \kwd{base} is not given, this defines a new external format of @@ -726,7 +726,7 @@ external format is defined using the macro \subsection{Composing External Formats} \begin{defmac}{stream:}{define-composing-external-format}{\args \var{name} - (\keys{\var{min} \var{max} \var{size} \var{documentation}}) \var{input} + (\keys{\kwd{min} \kwd{max} \kwd{size} \kwd{documentation}}) \var{input} \var{output}} This is the same as \code{define-external-format}, except that a composing external format is created. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/52a93a052ba57908d3086146… --- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/52a93a052ba57908d3086146… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Use the 2018-03 snapshots for testing.
by Raymond Toy 03 Mar '18

03 Mar '18

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 52a93a05 by Raymond Toy at 2018-03-03T14:30:47-08:00 Use the 2018-03 snapshots for testing. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: - download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/2018/01" - version: "2018-01-x86" + download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/2018/03" + version: "2018-03-x86" linux-runner: tags: @@ -12,7 +12,7 @@ linux-runner: - mkdir snapshot - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2) script: - - bin/build.sh -B boot-2018-02-1 -C "" -o snapshot/bin/lisp + - bin/build.sh -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist linux-4 - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log @@ -24,6 +24,6 @@ osx-runner: - mkdir snapshot - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2) script: - - bin/build.sh -B boot-2018-02-1 -C "" -o snapshot/bin/lisp + - bin/build.sh -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist darwin-4 - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/52a93a052ba57908d30861466… --- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/52a93a052ba57908d30861466… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Remove test files from tests
by Raymond Toy 03 Mar '18

03 Mar '18

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 3c56ed8c by Raymond Toy at 2018-03-03T14:28:53-08:00 Remove test files from tests The tests create some files in /tmp. Remove them when the test script ends so that we get a clean directory. I think this fixes the issue with the osx-runner sometimes failing because it can't remove the temp files that I created locally when testing locally. - - - - - 1 changed file: - bin/run-tests.sh Changes: ===================================== bin/run-tests.sh ===================================== --- a/bin/run-tests.sh +++ b/bin/run-tests.sh @@ -34,12 +34,19 @@ done # Shift out the options shift $[$OPTIND - 1] -# Create the test directory needed issue.45 test. - +# Create the test directory needed by the issue.45 test. rm -rf test-tmp mkdir test-tmp ln -s /bin/ls test-tmp/ls-link +# Cleanup temp files and directories that we created during testing. +function cleanup { + rm -f /tmp/trac.36.bom.txt /tmp/trac.43.txt + rm -rf /tmp/foo +} + +trap cleanup EXIT + if [ $# -eq 0 ]; then # No args so run all the tests $LISP -noinit -load tests/run-tests.lisp -eval '(cmucl-test-runner:run-all-tests)' View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/3c56ed8c550e509b3f080e531… --- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/3c56ed8c550e509b3f080e531… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new tag snapshot-2018-03
by Raymond Toy 03 Mar '18

03 Mar '18

Raymond Toy pushed new tag snapshot-2018-03 at cmucl / cmucl --- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/tree/snapshot-2018-03 You're receiving this email because of your account on gitlab.common-lisp.net.

1 0