Menu
▾
▴
clisp-cvs digest, Vol 1 #821 - 11 msgs
|
From: <cli...@li...> - 2004-11-23 23:27:37
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/tests clos.tst,1.79,1.80 mop.tst,1.30,1.31 ChangeLog,1.266,1.267 (Bruno Haible) 2. clisp/src clos-class1.lisp,1.24,1.25 clos-class2.lisp,1.46,1.47 clos-class3.lisp,1.71,1.72 ChangeLog,1.3835,1.3836 (Bruno Haible) 3. clisp/src ChangeLog,1.3836,1.3837 spvw.d,1.324,1.325 (Bruno Haible) 4. clisp/doc impbody.xml,1.312,1.313 (Bruno Haible) 5. clisp/src clhs.lisp,1.21,1.22 ChangeLog,1.3837,1.3838 (Bruno Haible) 6. clisp/tests macro8.tst,1.50,1.51 ChangeLog,1.267,1.268 (Sam Steingold) 7. clisp/src reploop.lisp,1.37,1.38 compiler.lisp,1.229,1.230 ChangeLog,1.3838,1.3839 (Sam Steingold) 8. clisp/doc cl-ent.xml,1.70,1.71 (Sam Steingold) 9. clisp/doc impbody.xml,1.313,1.314 (Sam Steingold) 10. clisp/doc impbody.xml,1.314,1.315 (Bruno Haible) 11. clisp/doc impext.xml,1.290,1.291 impent.xml,1.173,1.174 impbody.xml,1.315,1.316 (Sam Steingold) --__--__-- Message: 1 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/tests clos.tst,1.79,1.80 mop.tst,1.30,1.31 ChangeLog,1.266,1.267 Date: Tue, 23 Nov 2004 11:35:02 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14666/tests Modified Files: clos.tst mop.tst ChangeLog Log Message: Use forward-referenced-class instances instead of symbols in the direct-superclasses list. Index: mop.tst =================================================================== RCS file: /cvsroot/clisp/clisp/tests/mop.tst,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- mop.tst 19 Nov 2004 12:12:10 -0000 1.30 +++ mop.tst 23 Nov 2004 11:35:00 -0000 1.31 @@ -283,6 +283,72 @@ #-(or CLISP CMU SBCL) UNKNOWN +;; Check that undefined classes are treated as undefined, even though they +;; are represented by a FORWARD-REFERENCED-CLASS. +(progn + (defclass foo132 (forwardclass02) ()) + (defparameter *forwardclass* (first (clos:class-direct-superclasses (find-class 'foo132)))) + t) +T +(typep 1 *forwardclass*) +ERROR +(locally (declare (compile)) (typep 1 *forwardclass*)) +ERROR +(type-expand *forwardclass*) +ERROR +(subtypep *forwardclass* 't) +ERROR +(subtypep 'nil *forwardclass*) +ERROR +(sys::subtype-integer *forwardclass*) +ERROR +(sys::subtype-sequence *forwardclass*) +NIL ; should also be ERROR +(write-to-string *forwardclass* :readably t) +ERROR +(setf (find-class 'foo132a) *forwardclass*) +ERROR +(class-name *forwardclass*) +FORWARDCLASS02 +(setf (class-name *forwardclass*) 'forwardclass03) +ERROR +(class-name *forwardclass*) +FORWARDCLASS02 +(clos:class-direct-superclasses *forwardclass*) +NIL +(clos:class-direct-slots *forwardclass*) +NIL +(clos:class-direct-default-initargs *forwardclass*) +NIL +(clos:class-precedence-list *forwardclass*) +ERROR +(clos:class-slots *forwardclass*) +ERROR +(clos:class-default-initargs *forwardclass*) +ERROR +(clos:class-finalized-p *forwardclass*) +NIL +(clos:class-prototype *forwardclass*) +ERROR +(clos:finalize-inheritance *forwardclass*) +ERROR +(clos:class-finalized-p *forwardclass*) +NIL +(eval `(defmethod foo132a ((x ,*forwardclass*)))) +ERROR +(progn + (defgeneric foo132b (x) + (:method ((x integer)) x)) + (clos:add-method #'foo132b + (make-instance 'standard-method + :qualifiers '() + :lambda-list '(x) + :specializers (list *forwardclass*) + :function #'(lambda (args next-methods) (first args)))) + #-CLISP (foo132b 7)) +ERROR + + ;; Check that defclass supports user-defined options. (progn (defclass option-class (standard-class) Index: clos.tst =================================================================== RCS file: /cvsroot/clisp/clisp/tests/clos.tst,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- clos.tst 17 Nov 2004 11:35:44 -0000 1.79 +++ clos.tst 23 Nov 2004 11:35:00 -0000 1.80 @@ -4046,3 +4046,32 @@ (make-instance 'foo130) *foo130-counter*) 1 + +;; Check that undefined classes are treated as undefined, even though they +;; are represented by a FORWARD-REFERENCED-CLASS. +(progn + (defclass foo131 (forwardclass01) ()) + t) +T +(find-class 'forwardclass01) +ERROR +(find-class 'forwardclass01 nil) +NIL +(typep 1 'forwardclass01) +ERROR +(locally (declare (compile)) (typep 1 'forwardclass01)) +ERROR +(type-expand 'forwardclass01) +ERROR +(subtypep 'forwardclass01 't) +ERROR +(subtypep 'nil 'forwardclass01) +ERROR +(sys::subtype-integer 'forwardclass01) +NIL ; should also be ERROR +(sys::subtype-sequence 'forwardclass01) +NIL ; should also be ERROR +(defstruct (foo131a (:include forwardclass01))) +ERROR +(defmethod foo131b ((x forwardclass01))) +ERROR Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/tests/ChangeLog,v retrieving revision 1.266 retrieving revision 1.267 diff -u -d -r1.266 -r1.267 --- ChangeLog 22 Nov 2004 14:57:58 -0000 1.266 +++ ChangeLog 23 Nov 2004 11:35:00 -0000 1.267 @@ -1,3 +1,9 @@ +2004-11-17 Bruno Haible <br...@cl...> + + * clos.tst: Add some tests for symbols naming forward-referenced + classes. + * mop.tst: Add some tests for forward-referenced classes. + 2004-11-22 Sam Steingold <sd...@gn...> * setf.tst (foo22): quote (values) --__--__-- Message: 2 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src clos-class1.lisp,1.24,1.25 clos-class2.lisp,1.46,1.47 clos-class3.lisp,1.71,1.72 ChangeLog,1.3835,1.3836 Date: Tue, 23 Nov 2004 11:35:02 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14666/src Modified Files: clos-class1.lisp clos-class2.lisp clos-class3.lisp ChangeLog Log Message: Use forward-referenced-class instances instead of symbols in the direct-superclasses list. Index: clos-class2.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/clos-class2.lisp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- clos-class2.lisp 22 Nov 2004 10:14:37 -0000 1.46 +++ clos-class2.lisp 23 Nov 2004 11:34:57 -0000 1.47 @@ -12,6 +12,7 @@ ;; Metaclasses: (defvar <class>) ; <standard-class> +(defvar <forward-referenced-class>) ; <standard-class> (defvar <defined-class>) ; <standard-class> (defvar <standard-class>) ; <standard-class> (defvar <funcallable-standard-class>) ; <standard-class> @@ -108,7 +109,11 @@ ;; Should we do (setf (class-name h) nil) ? No, because CLHS of FIND-CLASS ;; says that "the class object itself is not affected". (sys::check-redefinition symbol '(setf find-class) - (and (defined-class-p h) "class"))) + (and (defined-class-p h) "class")) + (when (and h (typep-class h <forward-referenced-class>) new-value) + ;; Move the list of subclasses from the old class object to the new one. + (dolist (subclass (class-direct-subclasses h)) + (add-direct-subclass new-value subclass)))) (if new-value (setf (get symbol 'CLOSCLASS) new-value) (progn (remprop symbol 'CLOSCLASS) nil))) Index: clos-class3.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/clos-class3.lisp,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- clos-class3.lisp 22 Nov 2004 10:14:37 -0000 1.71 +++ clos-class3.lisp 23 Nov 2004 11:34:58 -0000 1.72 @@ -493,7 +493,17 @@ (mapcar #'(lambda (c) (if (defined-class-p c) c - (or (find-class c (not a-semi-standard-class-p)) c))) + (let ((cn (if (class-p c) (class-name c) c))) + (assert (symbolp cn)) + (if a-semi-standard-class-p + ;; Need a class. Allocate a forward-referenced-class + ;; if none is yet allocated. + (or (get cn 'CLOSCLASS) + (setf (get cn 'CLOSCLASS) + (make-instance 'forward-referenced-class + :name cn))) + ;; Need a defined-class. + (find-class cn))))) direct-superclasses)) (if class ;; Modify the class and return the modified class. @@ -589,11 +599,22 @@ ((atom l)) (let ((c (car l))) (unless (defined-class-p c) - (let ((new-c (or (find-class c nil) c))) - (unless (symbolp new-c) - (check-allowed-superclass class new-c)) - (setf (car l) new-c) - (when (defined-class-p new-c) ; changed from symbol to defined-class + (let ((new-c + (let ((cn (if (class-p c) (class-name c) c))) + (assert (symbolp cn)) + ;; Need a class. Allocate a forward-referenced-class + ;; if none is yet allocated. + (or (get cn 'CLOSCLASS) + (setf (get cn 'CLOSCLASS) + (make-instance 'forward-referenced-class + :name cn)))))) + (unless (eq new-c c) + (when (defined-class-p new-c) + ; changed from forward-referenced-class to defined-class + (check-allowed-superclass class new-c)) + (setf (car l) new-c) + (when (class-p c) + (remove-direct-subclass c class)) (add-direct-subclass new-c class)))))))) (when direct-slots-p ;; Convert the direct-slots to <direct-slot-definition> instances. @@ -650,11 +671,9 @@ (setf (class-current-version class) new-version)) ;; Restore the direct-subclasses pointers. (dolist (super tmp-direct-superclasses) - (unless (symbolp super) - (remove-direct-subclass-internal super class))) + (remove-direct-subclass-internal super class)) (dolist (super old-direct-superclasses) - (unless (symbolp super) - (add-direct-subclass-internal super class))) + (add-direct-subclass-internal super class)) ;; Restore the finalized-direct-subclasses pointers. (dolist (super tmp-direct-superclasses) (when (semi-standard-class-p super) @@ -831,9 +850,6 @@ result)) (defun update-subclasses-sets (class old-direct-superclasses new-direct-superclasses) - ;; Drop classes that are not yet defined; they have no subclasses list. - (setq old-direct-superclasses (remove-if #'symbolp old-direct-superclasses)) - (setq new-direct-superclasses (remove-if #'symbolp new-direct-superclasses)) (unless (equal old-direct-superclasses new-direct-superclasses) (let ((removed-direct-superclasses (set-difference old-direct-superclasses new-direct-superclasses)) @@ -1864,7 +1880,10 @@ &optional force-p ; The stack of classes being finalized now: (finalizing-now nil)) - (when (or (defined-class-p class) (setq class (find-class class force-p))) + (when (or (defined-class-p class) + (setq class + (find-class (if (class-p class) (class-name class) class) + force-p))) (if (>= (class-initialized class) 6) ; already finalized? class (progn @@ -1886,10 +1905,13 @@ ;; be nil here, otherwise an error was signaled already. So we ;; have to return nil as well. (return-from finalize-class nil)) - (when (symbolp superclass) ; changed from symbol to class - (check-allowed-superclass class finalized-superclass)) - (setf (car superclassesr) finalized-superclass) - (when (symbolp superclass) ; changed from symbol to class + (unless (eq superclass finalized-superclass) + ; changed from forward-referenced-class to defined-class + (assert (not (defined-class-p superclass))) + (assert (defined-class-p finalized-superclass)) + (check-allowed-superclass class finalized-superclass) + (setf (car superclassesr) finalized-superclass) + (remove-direct-subclass superclass class) (add-direct-subclass finalized-superclass class))))) ;; Now compute the class-precedence-list. (finalize-instance-semi-standard-class class) @@ -2483,8 +2505,9 @@ *<eql-specializer>-class-version*) ;; Define the class <forward-referenced-class>. - (macrolet ((form () *<forward-referenced-class>-defclass*)) - (form)) + (setq <forward-referenced-class> + (macrolet ((form () *<forward-referenced-class>-defclass*)) + (form))) );progn Index: clos-class1.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/clos-class1.lisp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- clos-class1.lisp 22 Nov 2004 10:14:37 -0000 1.24 +++ clos-class1.lisp 23 Nov 2004 11:34:57 -0000 1.25 @@ -293,8 +293,8 @@ (error (TEXT "(~S ~S) for class ~S: The ~S argument should be a proper list, not ~S") (if (eq situation 't) 'initialize-instance 'shared-initialize) 'class name ':direct-superclasses direct-superclasses)) - (unless (every #'(lambda (x) (or (class-p x) (symbolp x))) direct-superclasses) - (error (TEXT "(~S ~S) for class ~S: The direct-superclasses list should consist of classes and symbols, not ~S") + (unless (every #'class-p direct-superclasses) + (error (TEXT "(~S ~S) for class ~S: The direct-superclasses list should consist of classes, not ~S") (if (eq situation 't) 'initialize-instance 'shared-initialize) 'class name direct-superclasses)) (when (and (> (length direct-superclasses) 1) @@ -303,7 +303,7 @@ (if (eq situation 't) 'initialize-instance 'shared-initialize) 'class name (class-of class))) (dolist (sc direct-superclasses) - (unless (symbolp sc) + (when (defined-class-p sc) (check-allowed-superclass class sc))) (when (null direct-superclasses) (setq direct-superclasses (default-direct-superclasses class)))) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.3835 retrieving revision 1.3836 diff -u -d -r1.3835 -r1.3836 --- ChangeLog 22 Nov 2004 18:03:03 -0000 1.3835 +++ ChangeLog 23 Nov 2004 11:34:58 -0000 1.3836 @@ -1,3 +1,23 @@ +2004-11-17 Bruno Haible <br...@cl...> + + Use forward-referenced-class instances instead of symbols in the + direct-superclasses list. + * clos-class1.lisp (shared-initialize-<defined-class>): Don't accept + symbols in the direct-superclasses list any more. + * clos-class2.lisp (<forward-referenced-class>): New variable. + ((setf find-class)): When replacing a forward-referenced class, move + the list of subclasses from the old class object to the new one. + * clos-class3.lisp (ensure-class-using-class-<t>): Convert symbols in + the direct-superclasses list to forward-referenced-class instances. + (reinitialize-instance-<defined-class>): Likewise. Handle the change + from a forward-referenced-class to a defined-class. + (update-subclasses-sets): Treat the forward-referenced-class the same + way. + (finalize-class): Handle the case where the argument is a + forward-referenced-class. Handle the change from a + forward-referenced-class to a defined-class. + (<forward-referenced-class>): Initialize. + 2004-11-22 Bruno Haible <br...@cl...> * stream.d (low_read_unbuffered_handle): Use full_read instead of read. --__--__-- Message: 3 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.3836,1.3837 spvw.d,1.324,1.325 Date: Tue, 23 Nov 2004 11:57:16 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19746/src Modified Files: ChangeLog spvw.d Log Message: Add an indicator for MacOS X to *features*. Index: spvw.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/spvw.d,v retrieving revision 1.324 retrieving revision 1.325 diff -u -d -r1.324 -r1.325 --- spvw.d 12 Nov 2004 15:14:22 -0000 1.324 +++ spvw.d 23 Nov 2004 11:57:12 -0000 1.325 @@ -1407,6 +1407,9 @@ #ifdef UNIX " :UNIX" #endif + #ifdef UNIX_MACOSX + " :MACOS" + #endif #ifdef UNIX_CYGWIN32 " :CYGWIN" #endif Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.3836 retrieving revision 1.3837 diff -u -d -r1.3836 -r1.3837 --- ChangeLog 23 Nov 2004 11:34:58 -0000 1.3836 +++ ChangeLog 23 Nov 2004 11:57:11 -0000 1.3837 @@ -1,3 +1,7 @@ +2004-11-23 Bruno Haible <br...@cl...> + + * spvw.d (init_object_tab): Add :MACOS to *FEATURES* on MacOS X. + 2004-11-17 Bruno Haible <br...@cl...> Use forward-referenced-class instances instead of symbols in the --__--__-- Message: 4 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/doc impbody.xml,1.312,1.313 Date: Tue, 23 Nov 2004 11:57:13 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19746/doc Modified Files: impbody.xml Log Message: Add an indicator for MacOS X to *features*. Index: impbody.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/impbody.xml,v retrieving revision 1.312 retrieving revision 1.313 diff -u -d -r1.312 -r1.313 --- impbody.xml 18 Nov 2004 22:13:24 -0000 1.312 +++ impbody.xml 23 Nov 2004 11:57:10 -0000 1.313 @@ -4342,6 +4342,9 @@ <varlistentry><term>&unix-k;</term> <listitem><simpara>if &os; = &unix; (in this case the &hw; is irrelevant!) </simpara></listitem></varlistentry> +<varlistentry><term><constant>:MACOS</constant></term> + <listitem><simpara>if &os; = MacOS X (in that case &unix-k; is also present) +</simpara></listitem></varlistentry> <varlistentry><term><constant>:CYGWIN</constant></term> <listitem><simpara>if &clisp; is using the &cygwin; &unix; compatibility layer on top of &win32; --__--__-- Message: 5 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src clhs.lisp,1.21,1.22 ChangeLog,1.3837,1.3838 Date: Tue, 23 Nov 2004 12:03:49 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21764/src Modified Files: clhs.lisp ChangeLog Log Message: Extra comfort for MacOS X. Index: clhs.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/clhs.lisp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- clhs.lisp 23 Mar 2004 15:57:01 -0000 1.21 +++ clhs.lisp 23 Nov 2004 12:03:43 -0000 1.22 @@ -67,6 +67,9 @@ (ext::shell-execute "open" url nil nil) ;to start default browser (when out (format out "done~%")) (return-from browse-url)) + #+MACOS + (unless browser ; use default browser if no browser is specified + (setq browser '("open" "~a"))) (let* ((command (etypecase browser (list browser) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.3837 retrieving revision 1.3838 diff -u -d -r1.3837 -r1.3838 --- ChangeLog 23 Nov 2004 11:57:11 -0000 1.3837 +++ ChangeLog 23 Nov 2004 12:03:46 -0000 1.3838 @@ -1,5 +1,11 @@ 2004-11-23 Bruno Haible <br...@cl...> + * clhs.lisp (browse-url): On MacOS X, use the system's browser by + default. + Suggested by Pascal Costanza <pc...@p-...>. + +2004-11-23 Bruno Haible <br...@cl...> + * spvw.d (init_object_tab): Add :MACOS to *FEATURES* on MacOS X. 2004-11-17 Bruno Haible <br...@cl...> --__--__-- Message: 6 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/tests macro8.tst,1.50,1.51 ChangeLog,1.267,1.268 Date: Tue, 23 Nov 2004 18:28:14 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21418/tests Modified Files: macro8.tst ChangeLog Log Message: reverted the 2003-10-10 patch and fixed the problem differently: since the problem is that COMPILE/LOAD-TIME-VALUE must work even inside COMPILE-FILE, *FASOUTPUT-STREAM* should be bound there Index: macro8.tst =================================================================== RCS file: /cvsroot/clisp/clisp/tests/macro8.tst,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- macro8.tst 30 Aug 2004 13:49:45 -0000 1.50 +++ macro8.tst 23 Nov 2004 18:28:02 -0000 1.51 @@ -816,3 +816,51 @@ (funcall (compile nil f) 5 6 7 8 9) (g 'a 'b 'c 'd 'e)))) ((0 1 2 3 4) (5 6 7 8 9) (e d c b a)) + +;; <http://article.gmane.org/gmane.lisp.clisp.devel/10566> +(let ((fname "donc.lisp") (results '()) compiled) + (with-open-file (out fname :direction :output :if-exists :overwrite + :if-does-not-exist :create) + (write '(defparameter *donc* nil) :stream out) + (terpri out) + (write '(eval-when (:load-toplevel :compile-toplevel :execute) + (setq *donc* (funcall (compile (defun g () + (load-time-value (+ 2 3))))))) + :stream out) + (terpri out)) + (load fname) + (push *donc* results) + (setq compiled (compile-file fname)) + (push *donc* results) + (load compiled) + (push *donc* results) + (delete-file fname) + (delete-file compiled) + #+clisp (delete-file (make-pathname :type "lib" :defaults fname)) + (nreverse results)) +(5 5 5) + +;; <http://article.gmane.org/gmane.lisp.clisp.devel/13127> +(let ((fname "donc.lisp") (results '()) compiled) + (with-open-file (out fname :direction :output :if-exists :overwrite + :if-does-not-exist :create) + (write '(defmacro m1 (x) + (compile x (lambda nil (load-time-value (+ 2 3)))) 4) + :stream out) + (terpri out) + (write '(defun foo () (m1 bar)) :stream out) + (terpri out)) + (load fname) + (push (bar) results) + (push (foo) results) + (setq compiled (compile-file fname)) + (push (bar) results) + (push (foo) results) + (load compiled) + (push (bar) results) + (push (foo) results) + (delete-file fname) + (delete-file compiled) + #+clisp (delete-file (make-pathname :type "lib" :defaults fname)) + (nreverse results)) +(5 4 5 4 5 4) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/tests/ChangeLog,v retrieving revision 1.267 retrieving revision 1.268 diff -u -d -r1.267 -r1.268 --- ChangeLog 23 Nov 2004 11:35:00 -0000 1.267 +++ ChangeLog 23 Nov 2004 18:28:11 -0000 1.268 @@ -1,3 +1,7 @@ +2004-11-23 Sam Steingold <sd...@gn...> + + * macro8.tst: test COMPILE+LOAD-TIME-VALUE inside COMPILE-FILE + 2004-11-17 Bruno Haible <br...@cl...> * clos.tst: Add some tests for symbols naming forward-referenced --__--__-- Message: 7 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src reploop.lisp,1.37,1.38 compiler.lisp,1.229,1.230 ChangeLog,1.3838,1.3839 Date: Tue, 23 Nov 2004 18:29:14 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21418/src Modified Files: reploop.lisp compiler.lisp ChangeLog Log Message: reverted the 2003-10-10 patch and fixed the problem differently: since the problem is that COMPILE/LOAD-TIME-VALUE must work even inside COMPILE-FILE, *FASOUTPUT-STREAM* should be bound there Index: reploop.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/reploop.lisp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- reploop.lisp 28 Oct 2004 12:57:23 -0000 1.37 +++ reploop.lisp 23 Nov 2004 18:28:12 -0000 1.38 @@ -533,7 +533,6 @@ (makunbound '*terminal-read-open-object*) (clear-input *debug-io*) ; because the user did not expect a break loop (let* ((*break-count* (1+ *break-count*)) - (*fasoutput-stream* nil) ; compiled code may be called right away (stream (make-synonym-stream '*debug-io*)) (*standard-input* stream) (*standard-output* stream) Index: compiler.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/compiler.lisp,v retrieving revision 1.229 retrieving revision 1.230 diff -u -d -r1.229 -r1.230 --- compiler.lisp 22 Nov 2004 10:14:43 -0000 1.229 +++ compiler.lisp 23 Nov 2004 18:28:14 -0000 1.230 @@ -5538,9 +5538,7 @@ situation)))) (let ((form `(PROGN ,@(cddr *form*)))) (when (and compile-p load-p) (c-write-lib form)) - (when compile-p - ;; if FORM calls COMPILE, the result may be called right away - (let ((*fasoutput-stream* nil)) (eval form))) + (when compile-p (eval form)) (funcall c (if (or load-p (and execute-p (not top-level-p))) form nil))))) @@ -10499,6 +10497,7 @@ (*style-warning-count* 0) (*compiling-from-file* nil) (*c-listing-output* nil) + (*fasoutput-stream* nil) ; compiled code may be called right away (*c-error-output* *error-output*) (*known-special-vars* '()) (*constant-special-vars* '()) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.3838 retrieving revision 1.3839 diff -u -d -r1.3838 -r1.3839 --- ChangeLog 23 Nov 2004 12:03:46 -0000 1.3838 +++ ChangeLog 23 Nov 2004 18:28:31 -0000 1.3839 @@ -1,3 +1,14 @@ +2004-11-23 Sam Steingold <sd...@gn...> + + reverted the 2003-10-10 patch and fixed the problem differently: + since the problem is that COMPILE/LOAD-TIME-VALUE must work even + inside COMPILE-FILE, *FASOUTPUT-STREAM* should be bound there + * compiler.lisp (compile): bind *FASOUTPUT-STREAM* to NIL + (c-EVAL-WHEN): do not bind *FASOUTPUT-STREAM* + * reploop.lisp (break-loop): ditto + Suggested by Don Cohen in + <http://article.gmane.org/gmane.lisp.clisp.devel/13127> + 2004-11-23 Bruno Haible <br...@cl...> * clhs.lisp (browse-url): On MacOS X, use the system's browser by --__--__-- Message: 8 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/doc cl-ent.xml,1.70,1.71 Date: Tue, 23 Nov 2004 18:34:12 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22837 Modified Files: cl-ent.xml Log Message: (beos): new platform Index: cl-ent.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/cl-ent.xml,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- cl-ent.xml 18 Nov 2004 20:42:39 -0000 1.70 +++ cl-ent.xml 23 Nov 2004 18:34:09 -0000 1.71 @@ -127,6 +127,7 @@ <!ENTITY acorn "<ulink url='http://www.acorn.com/'><emphasis role='strong'>Acorn</emphasis></ulink>"> <!ENTITY amiga "<ulink url='http://www.amiga.org/'><emphasis role='strong'>Amiga</emphasis></ulink>"> <!ENTITY ascii "<ulink url='http://www.cplusplus.com/doc/papers/ascii.html'><emphasis role='strong'>ASCII</emphasis></ulink>"> +<!ENTITY beos "<ulink url='http://www.haiku-os.org/'><emphasis role='strong'>BeOS</emphasis></ulink>"> <!ENTITY cygwin "<ulink url='http://cygwin.com/'><emphasis role='strong'>Cygwin</emphasis></ulink>"> <!ENTITY dos "<ulink url='http://www.freedos.org/'><emphasis role='strong'>DOS</emphasis></ulink>"> <!ENTITY gnome "<ulink url='http://www.gnome.org/'><emphasis role='strong'>Gnome</emphasis></ulink>"> --__--__-- Message: 9 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/doc impbody.xml,1.313,1.314 Date: Tue, 23 Nov 2004 18:39:32 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23877/doc Modified Files: impbody.xml Log Message: (*features*): mention :BEOS Index: impbody.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/impbody.xml,v retrieving revision 1.313 retrieving revision 1.314 diff -u -d -r1.313 -r1.314 --- impbody.xml 23 Nov 2004 11:57:10 -0000 1.313 +++ impbody.xml 23 Nov 2004 18:39:28 -0000 1.314 @@ -4334,7 +4334,7 @@ <varlistentry><term><constant>:CLOS</constant></term> <listitem><simpara>&clos; is implemented</simpara></listitem></varlistentry> <varlistentry><term><constant>:WIN32</constant></term> - <listitem><simpara>if &hw; = PC (clone) and &os; = Win32 + <listitem><simpara>if &hw; = PC (clone) and &os; = &win32; (Windows 95/98/NT/Me/2000/XP)</simpara></listitem></varlistentry> <varlistentry><term><constant>:PC386</constant></term> <listitem><simpara>if &hw; = PC (clone) with a 386/486/586/686/786 CPU @@ -4342,13 +4342,16 @@ <varlistentry><term>&unix-k;</term> <listitem><simpara>if &os; = &unix; (in this case the &hw; is irrelevant!) </simpara></listitem></varlistentry> -<varlistentry><term><constant>:MACOS</constant></term> - <listitem><simpara>if &os; = MacOS X (in that case &unix-k; is also present) +<varlistentry><term><constant>:BEOS</constant></term> + <listitem><simpara>if &os; = &beos; (in that case &unix-k; is also present) </simpara></listitem></varlistentry> <varlistentry><term><constant>:CYGWIN</constant></term> <listitem><simpara>if &clisp; is using the &cygwin; &unix; compatibility layer on top of &win32; (in that case &unix-k; is also present) +</simpara></listitem></varlistentry> +<varlistentry><term><constant>:MACOS</constant></term> + <listitem><simpara>if &os; = &macosx; (in that case &unix-k; is also present) </simpara></listitem></varlistentry></variablelist></para> <para>Each &module; should add the appropriate keyword, e.g., --__--__-- Message: 10 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/doc impbody.xml,1.314,1.315 Date: Tue, 23 Nov 2004 19:09:18 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30355 Modified Files: impbody.xml Log Message: PC386 means 32-bit CPU. Index: impbody.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/impbody.xml,v retrieving revision 1.314 retrieving revision 1.315 diff -u -d -r1.314 -r1.315 --- impbody.xml 23 Nov 2004 18:39:28 -0000 1.314 +++ impbody.xml 23 Nov 2004 19:09:07 -0000 1.315 @@ -4337,7 +4337,7 @@ <listitem><simpara>if &hw; = PC (clone) and &os; = &win32; (Windows 95/98/NT/Me/2000/XP)</simpara></listitem></varlistentry> <varlistentry><term><constant>:PC386</constant></term> - <listitem><simpara>if &hw; = PC (clone) with a 386/486/586/686/786 CPU + <listitem><simpara>if &hw; = PC (clone) with a 32-bit 386/486/586/686/786 CPU </simpara></listitem></varlistentry> <varlistentry><term>&unix-k;</term> <listitem><simpara>if &os; = &unix; (in this case the &hw; is irrelevant!) --__--__-- Message: 11 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/doc impext.xml,1.290,1.291 impent.xml,1.173,1.174 impbody.xml,1.315,1.316 Date: Tue, 23 Nov 2004 19:30:20 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2711/doc Modified Files: impext.xml impent.xml impbody.xml Log Message: (win32-only, unix-only, unix-w32-only, unicode-only, non-unicode-only): added Index: impext.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/impext.xml,v retrieving revision 1.290 retrieving revision 1.291 diff -u -d -r1.290 -r1.291 --- impext.xml 18 Nov 2004 14:45:52 -0000 1.290 +++ impext.xml 23 Nov 2004 19:30:12 -0000 1.291 @@ -211,14 +211,12 @@ <variablelist> <!-- #ifndef UNICODE --> -<varlistentry><term>Platform dependent: Only in &clisp; built - &without; compile-time flag &unicode;.</term> +<varlistentry><term>&non-unicode-only;</term> <listitem><simpara>Only one character set is understood: the platform's native (8-bit) character set. See <xref linkend="characters"/>. </simpara></listitem></varlistentry> <!-- #else --> -<varlistentry id="charset-symbols"><term>Platform dependent: - Only in &clisp; built &with; compile-time flag &unicode;.</term> +<varlistentry id="charset-symbols"><term>&unicode-only;</term> <listitem><para>The following character sets are supported, as values of the corresponding (constant) symbol in the &charset-pac; package: <orderedlist id="charset-symbol-list"> @@ -668,8 +666,7 @@ </section> <section id="enc-charset"><title>Function &enc-charset;.</title> -<subtitle>Platform dependent: Only in &clisp; built - &with; compile-time flag &unicode;.</subtitle> +<subtitle>&unicode-only;</subtitle> <para>The function <code>(&enc-charset; &encoding-r;)</code> returns the charset of the &encoding-r;, as a &symbol-t; or a &string-t;.</para> @@ -691,8 +688,7 @@ <!-- #ifdef UNICODE --> <variablelist> -<varlistentry><term>Platform dependent: Only in &clisp; built - &with; compile-time flag &unicode;.</term> +<varlistentry><term>&unicode-only;</term> <listitem><simpara>The following are &symbol-macro; places.</simpara> <variablelist> <varlistentry><term><firstterm>&path-enc; @@ -1689,7 +1685,7 @@ <!-- #if defined(SCREEN) --> <section id="screen"><title>Random Screen Access</title> -<subtitle>Platform dependent: &unix;, &win32; platforms only.</subtitle> +<subtitle>&unix-w32-only;</subtitle> <variablelist> <varlistentry><term><code>(<function>SCREEN:MAKE-WINDOW</function>)</code></term> @@ -1767,7 +1763,7 @@ <!-- #if defined(UNIX) || defined(WIN32_NATIVE) --> <section id="modules"><title>External Modules</title> -<subtitle>Platform dependent: &unix; and &win32; platforms only.</subtitle> +<subtitle>&unix-w32-only;</subtitle> <note id="mod-win32"><title>Modules on &win32;.</title> <para>Everything described in the section will work verbatim on &win32; @@ -4069,7 +4065,7 @@ <!-- #endif --> <section id="socket"><title>Socket Streams</title> -<subtitle>Platform dependent: &unix;, &win32; platforms only.</subtitle> +<subtitle>&unix-w32-only;</subtitle> <!-- #ifdef SOCKET_STREAMS --> <variablelist> @@ -4307,8 +4303,7 @@ <!-- #ifdef UNIX --> <section id="quickstart-unix"><title>Scripting with &clisp;</title> - <subtitle>Platform dependent: &unix; platforms only, including - &cygwin;.</subtitle> + <subtitle>&unix-only;</subtitle> <para>On &unix;, a text file (&fasl-file; or &lisp-file;) can be made executable by adding a first line of the form @@ -4530,7 +4525,7 @@ <variablelist> <!-- #ifdef UNIX --> -<varlistentry><term>Platform dependent: &unix; platforms only.</term> +<varlistentry><term>&unix-only;</term> <listitem><simpara><code>(&exec; &program-r; <replaceable>arg&sub-1;</replaceable> <replaceable>arg&sub-2;</replaceable> ...)</code> @@ -4542,7 +4537,7 @@ <!-- #endif --> <!-- #ifdef HAVE_SHELL --> -<varlistentry><term>Platform dependent: &unix;, &win32; platforms only.</term> +<varlistentry><term>&unix-w32-only;</term> <listitem><simpara><code>(&shell; [&command-r;])</code> calls the operating system's shell, the value of the &env-var; <envar>SHELL</envar> on &unix; and <envar>COMSPEC</envar> on &win32;. @@ -4553,8 +4548,7 @@ <!-- #endif --> <!-- #ifdef PIPES2 --> -<varlistentry id="run-prog"><term>Platform dependent: &unix;, &win32; - platforms only.</term> +<varlistentry id="run-prog"><term>&unix-w32-only;</term> <listitem><simpara>The functions &run-cmd; and &run-prog; are the general interface to &shell; and the above:</simpara> @@ -4575,7 +4569,7 @@ <listitem><simpara>the shell command.</simpara> <!-- #ifdef UNIX --> <variablelist> - <varlistentry><term>Platform dependent: &unix; platforms only.</term> + <varlistentry><term>&unix-only;</term> <listitem><simpara>The shell the command is passed to is the value of the &env-var; <envar>SHELL</envar>, which normally is &sh;. The command should be a <quote>simple command</quote>; @@ -4643,7 +4637,7 @@ <!-- #ifdef PIPES --> <variablelist> -<varlistentry><term>Platform dependent: &unix;, &win32; platforms only.</term> +<varlistentry><term>&unix-w32-only;</term> <listitem><variablelist> <varlistentry><term><code>(&mk-pipe-in; &command-r; &key-amp; &eltype; &extfmt; &buffered;)</code></term> @@ -4725,7 +4719,7 @@ <variablelist> <!-- #ifdef UNIX --> -<varlistentry><term>Platform dependent: &unix; platforms only.</term> +<varlistentry><term>&unix-only;</term> <listitem><para>When running under the &X;, you can create a &bidi-s;, which uses a new dedicated xterm, using the function <firstterm>&mk-xterm-io;<indexterm id="mk-xterm" significance="preferred"> Index: impbody.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/impbody.xml,v retrieving revision 1.315 retrieving revision 1.316 diff -u -d -r1.315 -r1.316 --- impbody.xml 23 Nov 2004 19:09:07 -0000 1.315 +++ impbody.xml 23 Nov 2004 19:30:16 -0000 1.316 @@ -1603,8 +1603,7 @@ <!-- #ifdef UNICODE --> <variablelist> -<varlistentry><term>Platform dependent: only in &clisp; built - &with; the compile-time flag &unicode;.</term> +<varlistentry><term>&unicode-only;</term> <listitem><simpara>More precisely, &clisp; uses the 21-bit &unicode; 3.2 character set (ISO 10646, also known as UCS-4). </simpara></listitem></varlistentry></variablelist> @@ -1868,8 +1867,7 @@ <!-- #ifdef KEYBOARD --> <variablelist> -<varlistentry><term>Platform dependent: &unix;, &win32; - platforms only.</term> +<varlistentry><term>&unix-w32-only;</term> <listitem><simpara>The system itself uses this &input-char; type only to mention special keys and &ctrl;/&alt;/&shift; key status on return from <code>(&read-char; &kbd-in;)</code>.</simpara></listitem></varlistentry> @@ -1943,7 +1941,7 @@ <!-- #if defined(WIN32) || (defined(UNIX) && (O_BINARY != 0)) --> <variablelist> -<varlistentry><term>Platform dependent: &win32; platforms only.</term> +<varlistentry><term>&win32-only;</term> <listitem><simpara>When writing to a file, &nl-s; is converted to &cr-c;/&lf-c;. (This is the usual convention on &dos;.) For example, &cr-s;+&nl-s; is written as &cr-c;/&cr-c;/&lf-c;. @@ -2566,7 +2564,7 @@ <variablelist> <!-- #if defined(PATHNAME_UNIX) --> -<varlistentry><term>Platform dependent: &unix; platforms only.</term> +<varlistentry><term>&unix-only;</term> <listitem><simpara>For example, <filename>#P"foo/bar"</filename> denotes the file &bar-f; in the directory &foo-f;, while <filename>#P"foo/bar/"</filename> denotes the subdirectory @@ -2575,7 +2573,7 @@ <!-- #endif --> <!-- #ifdef PATHNAME_WIN32 --> -<varlistentry><term>Platform dependent: &win32; platforms only.</term> +<varlistentry><term>&win32-only;</term> <listitem><simpara>For example, <filename>#P"foo\\bar"</filename> denotes the file &bar-f; in the directory &foo-f;, while <filename>#P"foo\\bar\\"</filename> denotes the subdirectory @@ -2658,7 +2656,7 @@ <!-- #ifdef PATHNAME_UNIX --> <variablelist> -<varlistentry><term>Platform dependent: &unix; platforms only.</term> +<varlistentry><term>&unix-only;</term> <listitem><variablelist>&path-comps; <varlistentry><term>&host-r;</term>&always-nil;</varlistentry> <varlistentry><term>&device-r;</term>&always-nil;</varlistentry> @@ -2692,7 +2690,7 @@ <!-- #if defined(PATHNAME_WIN32) --> <variablelist> -<varlistentry><term>Platform dependent: &win32; platforms only.</term> +<varlistentry><term>&win32-only;</term> <listitem><variablelist>&path-comps; <varlistentry><term>&host-r;</term> <listitem><simpara>&nil; or &simple-string-t;, wildcard characters may @@ -2740,8 +2738,7 @@ <!-- #ifdef PATHNAME_NOEXT --> <variablelist> -<varlistentry><term>Platform dependent: &unix;, &win32; - platforms only.</term> +<varlistentry><term>&unix-w32-only;</term> <listitem><simpara>The wildcard characters: &file-star; matches any sequence of characters, &file-ques; matches any one character. </simpara></listitem></varlistentry> @@ -2751,8 +2748,7 @@ <!-- #ifdef PATHNAME_NOEXT --> <formalpara id="name-type-split"><title>Name/type namestring split.</title> <para><variablelist> -<varlistentry><term>Platform dependent: &unix;, &win32; - platforms only.</term> +<varlistentry><term>&unix-w32-only;</term> <listitem><para>A filename is split into name and type according to the following rule: <itemizedlist> <listitem><simpara>if there is no &file-dot; in the filename, then the @@ -2803,7 +2799,7 @@ <variablelist> <!-- #ifdef PATHNAME_UNIX --> -<varlistentry><term>Platform dependent: &unix; platforms only.</term> +<varlistentry><term>&unix-only;</term> <listitem><informaltable id="unix-path-external-table" frame="all"> <tgroup cols="2" colsep="1" rowsep="1" align="center"><tbody> <row><entry>[ &file-slash; ]</entry> @@ -2820,7 +2816,7 @@ <!-- #endif --> <!-- #ifdef PATHNAME_WIN32 --> -<varlistentry><term>Platform dependent: &win32; platforms only.</term> +<varlistentry><term>&win32-only;</term> <listitem><informaltable id="win32-path-external-table" frame="all"> <tgroup cols="2" colsep="1" rowsep="1" align="center"><tbody> <row><entry>[ [<replaceable>drivespec</replaceable>] : ]</entry> @@ -3077,7 +3073,7 @@ <!-- #ifdef UNIX --> <variablelist> -<varlistentry><term>Platform dependent: &unix; platforms only.</term> +<varlistentry><term>&unix-only;</term> <listitem><simpara>If the <constant>:CIRCLE</constant> argument is non-&nil;, the function avoids endless loops that may result from symbolic links.</simpara></listitem></varlistentry> @@ -3117,11 +3113,11 @@ <para><code>(&cd; &path-r;)</code> sets it, <code>(&cd;)</code> returns it. <variablelist> <!-- #if defined(PATHNAME_UNIX) --> -<varlistentry><term>Platform dependent: &unix; platforms only.</term> +<varlistentry><term>&unix-only;</term> <listitem><simpara><code>(&cd; [&path-r;])</code> manages the current directory.</simpara></listitem></varlistentry> <!-- #else --> -<varlistentry><term>Platform dependent: &win32; platforms only.</term> +<varlistentry><term>&win32-only;</term> <listitem><simpara><code>(&cd; [&path-r;])</code> manages the current device and the current directory. </simpara></listitem></varlistentry> @@ -3186,7 +3182,7 @@ <!-- #if defined(KEYBOARD) --> <variablelist><title>Macro &with-kbd;</title> -<varlistentry><term>Platform dependent: &unix;, &win32; platforms only.</term> +<varlistentry><term>&unix-w32-only;</term> <listitem><para>&terminal-io-var; is not the only stream that communicates directly with the user: During execution of the body of a <code>(&with-kbd; . &body-r;)</code> form, @@ -3197,8 +3193,7 @@ <variablelist> <!-- #ifdef WIN32 --> <varlistentry><term><constant>:hyper</constant></term> - <listitem><simpara><emphasis>(Platform dependent: - &win32; platforms only.)</emphasis> + <listitem><simpara>(&win32-only;) if a non-standard key. These keys are: <!-- #ifdef WIN32 --> <emphasis>[&win32;]:</emphasis> @@ -3210,8 +3205,7 @@ <listitem><para>the key name, for non-standard keys: <variablelist> <!-- #if defined(UNIX) || defined(WIN32) --> - <varlistentry><term>Platform dependent: &unix;, &win32; - platforms only.</term> + <varlistentry><term>&unix-w32-only;</term> <listitem><informaltable id="unix-kbd-keys" frame="all"> <tgroup cols="2" colsep="1" rowsep="1" align="center"> &key-value-header;<tbody> @@ -3245,19 +3239,17 @@ <!-- #ifdef WIN32 --> <varlistentry><term><constant>:super</constant></term> - <listitem><simpara><emphasis>(Platform dependent: - &win32; platforms only.)</emphasis> - if pressed together with &shift; key(s) and if the keystroke would - have been an other without &shift;.</simpara></listitem></varlistentry> + <listitem><simpara>(&win32-only;) if pressed together with &shift; + key(s) and if the keystroke would have been an other without + &shift;.</simpara></listitem></varlistentry> <!-- #endif --> <varlistentry><term><constant>:control</constant></term> <listitem><simpara>if pressed together with the &ctrl; key. </simpara></listitem></varlistentry> <!-- #ifdef WIN32 --> <varlistentry><term><constant>:meta</constant></term> - <listitem><simpara><emphasis>(Platform dependent: &win32; - platforms only.)</emphasis> if pressed together with the &alt; key. - </simpara></listitem></varlistentry> + <listitem><simpara>(&win32-only;) if pressed together with the &alt; + key.</simpara></listitem></varlistentry> <!-- #endif --> </variablelist> This keyboard input is not echoed on the screen. During execution of a @@ -3547,7 +3539,7 @@ <!-- #if defined(WIN32) || (defined(UNIX) && (O_BINARY!= 0)) --> <variablelist> - <varlistentry><term>Platform dependent: &win32; platforms only.</term> + <varlistentry><term>&win32-only;</term> <listitem><simpara>When a &nl-s; is output to (respectively input from) a file stream, its file position is increased by 2 since &nl-s; is encoded as &cr-c;/&lf-c; in the file. @@ -3923,7 +3915,7 @@ has no influence on the way floating point numbers are printed.</para> <variablelist> -<varlistentry><term>Platform dependent: &unix;, &win32; platforms only.</term> +<varlistentry><term>&unix-w32-only;</term> <listitem><simpara>&print-pretty-var; is initially &nil; but set to &t; in &config-file;. This makes screen output prettier. </simpara></listitem></varlistentry> @@ -3979,22 +3971,17 @@ <entry>macro expander (defined by &defmacro; and friends)</entry></row> <!-- #ifdef FOREIGN --> <row><entry><literal>#<&foreign-pointer-t; #x...></literal></entry> - <entry>foreign pointer <emphasis>(Platform dependent: &unix;, - &win32; platforms only.)</emphasis> - </entry></row> + <entry>foreign pointer (&unix-w32-only;)</entry></row> <!-- #endif --> <!-- #ifdef DYNAMIC_FFI --> <row><entry><literal>#<&foreign-address-t; #x...></literal></entry> - <entry>foreign address <emphasis>(Platform dependent: &unix;, - &win32; platforms only.)</emphasis></entry></row> + <entry>foreign address (&unix-w32-only;)</entry></row> <row><entry><literal>#<&foreign-variable-t; &name-r; #x...></literal></entry> - <entry>foreign variable <emphasis>(Platform dependent: &unix;, - &win32; platforms only.)</emphasis></entry></row> + <entry>foreign variable (&unix-w32-only;)</entry></row> <row><entry><literal>#<&foreign-function-t; &name-r; #x...></literal></entry> - <entry>foreign function <emphasis>(Platform dependent: &unix;, - &win32; platforms only.)</emphasis></entry></row> + <entry>foreign function (&unix-w32-only;)</entry></row> <!-- #endif --> <row><entry><literal>#<UNBOUND></literal></entry> <entry><quote>value</quote> of an unbound symbol, an unsupplied @@ -4035,7 +4022,7 @@ "test.lisp")</code></simpara> <variablelist> <!-- #if defined(WIN32) --> -<varlistentry><term>Platform dependent: &win32; platforms only.</term> +<varlistentry><term>&win32-only;</term> <listitem><simpara>As in all strings, backslashes must be written twice here: <filename>#"A:\\programs\\test.lisp"</filename> </simpara></listitem></varlistentry> @@ -4618,7 +4605,7 @@ <section id="disassemble"><title>Function &disassemble;</title> <variablelist> -<varlistentry><term>Platform dependent: &unix; platforms only.</term> +<varlistentry><term>&unix-only;</term> <listitem><simpara>&disassemble; can disassemble to machine code, provided that &gnu; &gdb; is present. In that case the argument may be a @@ -4840,13 +4827,13 @@ <section id="machine"><title>Machine</title> <variablelist> <!-- #ifdef MACHINE_KNOWN --> -<varlistentry><term>Platform dependent: &unix; platform only.</term> +<varlistentry><term>&unix-only;</term> <listitem><simpara>The functions &short-site-name;, &long-site-name; should be defined in a site-specific &config-file; file. The default implementations try to read the value of the &env-var; <envar>ORGANIZATION</envar>, and, failing that, call &uname;. </simpara></listitem></varlistentry> -<varlistentry><term>Platform dependent: &win32; platform only.</term> +<varlistentry><term>&win32-only;</term> <listitem><simpara>The functions &short-site-name;, &long-site-name; should be defined in a site-specific &config-file; file. The default implementations try to read the registry. Index: impent.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/impent.xml,v retrieving revision 1.173 retrieving revision 1.174 diff -u -d -r1.173 -r1.174 --- impent.xml 16 Nov 2004 17:02:26 -0000 1.173 +++ impent.xml 23 Nov 2004 19:30:15 -0000 1.174 @@ -786,3 +786,13 @@ <!ENTITY sig-err "&signal;s an &error-t;"> <!ENTITY clisp-only "<title>Implementation dependent: only in &clisp;.</title>"> +<!ENTITY win32-only "<emphasis>Platform dependent: &win32; platform + only.</emphasis>"> +<!ENTITY unix-only "<emphasis>Platform dependent: &unix; platform + only.</emphasis>"> +<!ENTITY unix-w32-only "<emphasis>Platform dependent: &unix;, &win32; + platforms only.</emphasis>"> +<!ENTITY unicode-only "<emphasis>Platform dependent: Only in &clisp; built + &with; compile-time flag &unicode;</emphasis>"> +<!ENTITY non-unicode-only "<emphasis>Platform dependent: Only in &clisp; built + &without; compile-time flag &unicode;</emphasis>"> --__--__-- _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest |