From: <cli...@li...> - 2005-01-25 09:04:05
|
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/src defpackage.lisp,1.9,1.10 ChangeLog,1.4135,1.4136 (Sam Steingold) 2. clisp/doc impent.xml,1.191,1.192 impbody.xml,1.353,1.354 (Sam Steingold) 3. clisp/modules/bindings/glibc linux.lisp,1.15,1.16 (Sam Steingold) 4. clisp/modules/postgresql postgresql.lisp,1.8,1.9 (Sam Steingold) 5. clisp/modules/wildcard wildcard.lisp,1.8,1.9 (Sam Steingold) 6. clisp/src ChangeLog,1.4136,1.4137 (Sam Steingold) 7. clisp/modules/netica netica.lisp,1.9,1.10 (Sam Steingold) 8. clisp/modules/pari pari.lisp,1.3,1.4 (Sam Steingold) 9. clisp/modules/matlab matlab.lisp,1.5,1.6 (Sam Steingold) 10. clisp/modules/bindings/win32 win32.lisp,1.11,1.12 (Sam Steingold) 11. clisp/src defpackage.lisp,1.10,1.11 ChangeLog,1.4137,1.4138 (Bruno Haible) 12. clisp/src makemake.in,1.503,1.504 (Bruno Haible) 13. clisp/src defpackage.lisp,1.11,1.12 ChangeLog,1.4138,1.4139 (Sam Steingold) 14. clisp/src makemake.in,1.504,1.505 (Sam Steingold) --__--__-- Message: 1 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src defpackage.lisp,1.9,1.10 ChangeLog,1.4135,1.4136 Date: Mon, 24 Jan 2005 17:35:56 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24606/src Modified Files: defpackage.lisp ChangeLog Log Message: (defpackage): accept :MODERN argument Index: defpackage.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/defpackage.lisp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- defpackage.lisp 15 Dec 2004 23:09:40 -0000 1.9 +++ defpackage.lisp 24 Jan 2005 17:35:50 -0000 1.10 @@ -18,16 +18,19 @@ (setq packname (string packname)) ;; Process important options: (let ((case-sensitive nil) ; flag for :CASE-SENSITIVE - (case-inverted nil)) ; flag for :CASE-INVERTED + (case-inverted nil) ; flag for :CASE-INVERTED + (modern :DEFAULT)) ; flag for :MODERN (dolist (option options) (when (listp option) (case (first option) (:CASE-SENSITIVE ; CLISP extension - (when (not (null (second option))) - (setq case-sensitive t))) + (when (second option) (setq case-sensitive t))) (:CASE-INVERTED ; CLISP extension - (when (not (null (second option))) - (setq case-inverted t)))))) + (when (second option) (setq case-inverted t))) + (:MODERN ; CLISP extension + (setq modern (second option) + case-sensitive (not (null modern)) + case-inverted case-sensitive))))) (let ((to-string (if case-inverted #'cs-cl:string #'cl:string))) ;; Process options: (let ((size nil) ; :SIZE has been supplied @@ -36,7 +39,7 @@ (shadow-list '()) ; list of symbol names to shadow (shadowing-list '()) ; list of pairs (symbol-name . package-name) for shadowing-import (use-list '()) ; list of package-names for use-package - (use-default '("COMMON-LISP")) ; default for use-list + (use-default "COMMON-LISP") ; default use-list (import-list '()) ; list of (symbol-name . package-name) for import (intern-list '()) ; list of symbol-names for intern (symname-list '()) ; list of all symbol names specified so far @@ -48,7 +51,17 @@ :detail name (TEXT "~S ~A: the symbol ~A must not be specified more than once") 'defpackage packname name) - (push name symname-list)))) + (push name symname-list))) + (modernize (name) + ;; MODERN: CL ==> CS-CL + (let ((pack (find-package name))) + (ecase modern + ((t) (if (eq pack #.(find-package "COMMON-LISP")) + "CS-COMMON-LISP" (package-name pack))) + ((nil) (if (eq pack #.(find-package "CS-COMMON-LISP")) + "COMMON-LISP" (package-name pack))) + ((:DEFAULT) (package-name pack)))))) + (setq use-default (modernize use-default)) (dolist (option options) (if (listp option) (if (keywordp (car option)) @@ -82,19 +95,19 @@ (let ((pack (string (second option)))) (dolist (name (cddr option)) (setq name (funcall to-string name)) - (let ((name+pack (cons name pack))) + (let ((name+pack (cons name (modernize pack)))) (unless (member name+pack shadowing-list :test #'equal) ; #'string= on car and cdr (push name+pack shadowing-list) (record-symname name)))))) (:USE (dolist (name (rest option)) - (push (string name) use-list)) + (push (modernize name) use-list)) (setq use-default nil)) (:IMPORT-FROM (let ((pack (string (second option)))) (dolist (name (cddr option)) (setq name (funcall to-string name)) - (let ((name+pack (cons name pack))) + (let ((name+pack (cons name (modernize pack)))) (unless (member name+pack import-list :test #'equal) ; #'string= on car and cdr (push name+pack import-list) (record-symname name)))))) @@ -111,6 +124,7 @@ (push name export-list)))) (:CASE-SENSITIVE) ; CLISP extension, already handled above (:CASE-INVERTED) ; CLISP extension, already handled above + (:MODERN) ; CLISP extension, already handled above (T (error-of-type 'source-program-error :form whole-form :detail (first option) @@ -133,7 +147,7 @@ (setq nickname-list (nreverse nickname-list)) (setq shadow-list (nreverse shadow-list)) (setq shadowing-list (nreverse shadowing-list)) - (setq use-list (or use-default (nreverse use-list))) + (setq use-list (if use-default (list use-default) (nreverse use-list))) (setq import-list (nreverse import-list)) (setq intern-list (nreverse intern-list)) (setq export-list (nreverse export-list)) @@ -142,6 +156,23 @@ (SYSTEM::%IN-PACKAGE ,packname :NICKNAMES ',nickname-list :USE '() :CASE-SENSITIVE ,case-sensitive :CASE-INVERTED ,case-inverted) + ;; Step 0 + ,@(ecase modern + ((t) + `((when (find "COMMON-LISP" (package-use-list ,packname) + :test #'string= :key #'package-name) + (unuse-package "COMMON-LISP" ,packname) + (use-package "CS-COMMON-LISP" ,packname) + (setq use-list (delete "CS-COMMON-LISP" use-list + :test #'string=))))) + ((nil) + `((when (find "CS-COMMON-LISP" (package-use-list ,packname) + :test #'string= :key #'package-name) + (unuse-package "CS-COMMON-LISP" ,packname) + (use-package "COMMON-LISP" ,packname) + (setq use-list (delete "COMMON-LISP" use-list + :test #'string=))))) + ((:DEFAULT) '())) ;; Step 1 ,@(if shadow-list `((,(if case-inverted 'CS-CL:shadow 'CL:SHADOW) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4135 retrieving revision 1.4136 diff -u -d -r1.4135 -r1.4136 --- ChangeLog 24 Jan 2005 16:34:41 -0000 1.4135 +++ ChangeLog 24 Jan 2005 17:35:50 -0000 1.4136 @@ -1,5 +1,9 @@ 2005-01-24 Sam Steingold <sd...@gn...> + * defpackage.lisp (defpackage): accept :MODERN argument + +2005-01-24 Sam Steingold <sd...@gn...> + * makemake.in (BASE_MODULES): add i18n only when USE_GETTEXT is true 2005-01-24 Sam Steingold <sd...@gn...> --__--__-- Message: 2 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/doc impent.xml,1.191,1.192 impbody.xml,1.353,1.354 Date: Mon, 24 Jan 2005 17:35:57 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24606/doc Modified Files: impent.xml impbody.xml Log Message: (defpackage): accept :MODERN argument Index: impbody.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/impbody.xml,v retrieving revision 1.353 retrieving revision 1.354 diff -u -d -r1.353 -r1.354 --- impbody.xml 24 Jan 2005 10:18:50 -0000 1.353 +++ impbody.xml 24 Jan 2005 17:35:54 -0000 1.354 @@ -1264,11 +1264,9 @@ sets the &package-var; initially to the &cs-clu; package, and &print-base-var; to <constant>:downcase</constant>.</para> -<para>For packages to be located in the modern, case-sensitive world, you - need to augment their &defpackage; declaration, by adding the options - <code>(&case-sensitive-k; &t;) (&case-inverted-k; &t;)</code>, and replacing - <code>(:use #:cl)</code> with <code>(:use #:cs-cl)</code>. -</para> +<para>For packages to be located in the <quote>modern</quote> + (case-sensitive) world, you need to augment their &defpackage; + declaration by adding the option <code>(&modern-k; &t;)</code>.</para> </section> </section> @@ -1281,19 +1279,36 @@ <literal role="data">(&cl-pac;)</literal>.</para> <para>&make-package; accepts additional keyword arguments - &case-sensitive-k; and &case-inverted-k;.</para></section> + &case-sensitive-k; and &case-inverted-k; (but ¬-e; &modern-k;!) +</para></section> <section id="defpack"><title>Macro &defpackage;</title> -<para>&defpackage; accepts additional options &case-sensitive-k; and - &case-inverted-k;.</para> +<para>&defpackage; accepts additional options &case-sensitive-k;, + &case-inverted-k;, and &modern-k;.</para> <para>When the package being defined already exists, it is modified as follows (and in this order):<variablelist> - <varlistentry><term>&case-sensitive-k;</term><term>&case-inverted-k;</term> + <varlistentry><term>&case-sensitive-k;</term> <listitem><simpara>adjusted with <code>(&setf; &pack-sensitive;)</code> (with a warning)</simpara></listitem></varlistentry> <varlistentry><term>&case-inverted-k;</term> <listitem><simpara>adjusted with <code>(&setf; &pack-inverted;)</code> (with a warning)</simpara></listitem></varlistentry> + <varlistentry><term>&modern-k;</term> + <listitem><para>if &cl-pac; is being used, it is un-used and + &cs-cl; is used instead; also, &cs-cl; is used instead of &cl-pac; + throughout the &defpackage; form, e.g.,<programlisting language="lisp"> +(&defpackage; "FOO" + (&modern-k; &t;) + (&use-k; "COMMON-LISP" "EXT")) +</programlisting>is equivalent to<programlisting language="lisp"> +(&defpackage; "FOO" + (&case-sensitive-k; &t;) + (&case-inverted-k; &t;) + (&use-k; "CS-COMMON-LISP" "EXT")) +</programlisting></para> + <simpara><code>(&modern-k; &nil;)</code> reverts the + effects of <code>(&modern-k; &t;)</code>.</simpara> + </listitem></varlistentry> <varlistentry><term><constant>:NICKNAMES</constant></term> <listitem><simpara>adjusted with &rename-package; </simpara></listitem></varlistentry> Index: impent.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/impent.xml,v retrieving revision 1.191 retrieving revision 1.192 diff -u -d -r1.191 -r1.192 --- impent.xml 6 Jan 2005 16:47:39 -0000 1.191 +++ impent.xml 24 Jan 2005 17:35:54 -0000 1.192 @@ -167,6 +167,7 @@ <!ENTITY byte-t "<link linkend='byte-type'><type>BYTE</type></link>"> <!ENTITY case-inverted-k "<link linkend='package-case'><constant>:CASE-INVERTED</constant></link>"> <!ENTITY case-sensitive-k "<link linkend='package-case'><constant>:CASE-SENSITIVE</constant></link>"> +<!ENTITY modern-k "<link linkend='package-case'><constant>:MODERN</constant></link>"> <!ENTITY cd "<link linkend='cd'><function>EXT:CD</function></link>"> <!ENTITY ch-ctrl "<link linkend='char-bits'><constant>EXT:CHAR-CONTROL-BIT</constant></link>"> <!ENTITY ch-hyper "<link linkend='char-bits'><constant>EXT:CHAR-HYPER-BIT</constant></link>"> --__--__-- Message: 3 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/bindings/glibc linux.lisp,1.15,1.16 Date: Mon, 24 Jan 2005 18:33:59 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/bindings/glibc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6999/modules/bindings/glibc Modified Files: linux.lisp Log Message: use :MODERN in DEFPACKAGE Index: linux.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/bindings/glibc/linux.lisp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- linux.lisp 20 Dec 2004 14:15:28 -0000 1.15 +++ linux.lisp 24 Jan 2005 18:33:55 -0000 1.16 @@ -4,9 +4,9 @@ ;; Sam Steingold 2002-2003 (defpackage "LINUX" - (:case-sensitive t) (:case-inverted t) + (:modern t) (:nicknames "UNIX" "GLIBC") - (:use "CS-COMMON-LISP" "FFI") + (:use "COMMON-LISP" "FFI") (:shadowing-import-from "EXPORTING" #:defconstant #:defun #:defmacro #:define-modify-macro #:define-symbol-macro #:defsetf --__--__-- Message: 4 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/postgresql postgresql.lisp,1.8,1.9 Date: Mon, 24 Jan 2005 18:33:40 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/postgresql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6999/modules/postgresql Modified Files: postgresql.lisp Log Message: use :MODERN in DEFPACKAGE Index: postgresql.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/postgresql/postgresql.lisp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- postgresql.lisp 20 Dec 2004 14:15:31 -0000 1.8 +++ postgresql.lisp 24 Jan 2005 18:33:36 -0000 1.9 @@ -4,8 +4,8 @@ (defpackage "SQL" (:nicknames "POSTGRES" "POSTGRESQL") - (:case-sensitive t) (:case-inverted t) - (:use "CS-COMMON-LISP" "FFI") + (:modern t) + (:use "COMMON-LISP" "FFI") (:shadowing-import-from "EXPORTING" #:defconstant #:defun #:defmacro #:def-c-type #:def-c-enum #:def-c-struct #:def-c-var #:def-call-out)) --__--__-- Message: 5 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/wildcard wildcard.lisp,1.8,1.9 Date: Mon, 24 Jan 2005 18:33:38 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/wildcard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6999/modules/wildcard Modified Files: wildcard.lisp Log Message: use :MODERN in DEFPACKAGE Index: wildcard.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/wildcard/wildcard.lisp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- wildcard.lisp 21 Dec 2004 11:47:10 -0000 1.8 +++ wildcard.lisp 24 Jan 2005 18:33:35 -0000 1.9 @@ -3,8 +3,8 @@ ;; Sam Steingold 2001-2004 (defpackage "WILDCARD" - (:case-sensitive t) (:case-inverted t) - (:use "CS-COMMON-LISP" "FFI") + (:modern t) + (:use "COMMON-LISP" "FFI") (:export #:match #:wildcard-matcher)) (in-package "WILDCARD") --__--__-- Message: 6 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.4136,1.4137 Date: Mon, 24 Jan 2005 18:33:37 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6999/src Modified Files: ChangeLog Log Message: use :MODERN in DEFPACKAGE Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4136 retrieving revision 1.4137 diff -u -d -r1.4136 -r1.4137 --- ChangeLog 24 Jan 2005 17:35:50 -0000 1.4136 +++ ChangeLog 24 Jan 2005 18:32:51 -0000 1.4137 @@ -1,5 +1,12 @@ 2005-01-24 Sam Steingold <sd...@gn...> + * modules/bindings/glibc/linux.lisp, modules/bindings/win32/win32.lisp: + * modules/matlab/matlab.lisp, modules/netica/netica.lisp: + * modules/pari/pari.lisp, modules/postgresql/postgresql.lisp: + * modules/wildcard/wildcard.lisp: use :MODERN in DEFPACKAGE + +2005-01-24 Sam Steingold <sd...@gn...> + * defpackage.lisp (defpackage): accept :MODERN argument 2005-01-24 Sam Steingold <sd...@gn...> --__--__-- Message: 7 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/netica netica.lisp,1.9,1.10 Date: Mon, 24 Jan 2005 18:33:55 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/netica In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6999/modules/netica Modified Files: netica.lisp Log Message: use :MODERN in DEFPACKAGE Index: netica.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/netica/netica.lisp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- netica.lisp 20 Dec 2004 14:15:30 -0000 1.9 +++ netica.lisp 24 Jan 2005 18:33:51 -0000 1.10 @@ -6,8 +6,8 @@ ;;; See http://www.gnu.org/copyleft/gpl.html (defpackage "NETICA" - (:case-sensitive t) (:case-inverted t) - (:use "CS-COMMON-LISP" "FFI") + (:modern t) + (:use "COMMON-LISP" "FFI") (:shadowing-import-from "EXPORTING" #:defconstant #:defvar #:defun #:defmacro #:define-symbol-macro #:def-c-type #:def-c-enum #:def-c-struct #:def-c-var #:def-call-out)) --__--__-- Message: 8 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/pari pari.lisp,1.3,1.4 Date: Mon, 24 Jan 2005 18:33:53 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/pari In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6999/modules/pari Modified Files: pari.lisp Log Message: use :MODERN in DEFPACKAGE Index: pari.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/pari/pari.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pari.lisp 17 Dec 2004 18:14:18 -0000 1.3 +++ pari.lisp 24 Jan 2005 18:33:38 -0000 1.4 @@ -4,8 +4,8 @@ ;; This is free software, distributed under the GNU GPL (defpackage #:pari - (:case-sensitive t) (:case-inverted t) - (:use #:cs-cl #:ffi)) + (:modern t) + (:use #:cl #:ffi)) (in-package #:pari) (default-foreign-language :stdc) --__--__-- Message: 9 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/matlab matlab.lisp,1.5,1.6 Date: Mon, 24 Jan 2005 18:33:56 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/matlab In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6999/modules/matlab Modified Files: matlab.lisp Log Message: use :MODERN in DEFPACKAGE Index: matlab.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/matlab/matlab.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- matlab.lisp 11 Jan 2005 15:32:28 -0000 1.5 +++ matlab.lisp 24 Jan 2005 18:33:53 -0000 1.6 @@ -6,8 +6,8 @@ ;;; See http://www.gnu.org/copyleft/gpl.html (defpackage "MATLAB" - (:case-sensitive t) (:case-inverted t) - (:use "CS-COMMON-LISP" "FFI") + (:modern t) + (:use "COMMON-LISP" "FFI") (:shadowing-import-from "EXPORTING" #:defconstant #:defun #:defmacro #:def-c-type #:def-c-enum #:def-c-struct #:def-c-var #:def-call-out)) --__--__-- Message: 10 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/modules/bindings/win32 win32.lisp,1.11,1.12 Date: Mon, 24 Jan 2005 18:33:57 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/bindings/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6999/modules/bindings/win32 Modified Files: win32.lisp Log Message: use :MODERN in DEFPACKAGE Index: win32.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/modules/bindings/win32/win32.lisp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- win32.lisp 20 Dec 2004 14:15:29 -0000 1.11 +++ win32.lisp 24 Jan 2005 18:33:54 -0000 1.12 @@ -3,8 +3,8 @@ (defpackage "WIN32" (:nicknames "WOE32" "W32") - (:case-sensitive t) (:case-inverted t) - (:use "CS-COMMON-LISP" "FFI") + (:modern t) + (:use "COMMON-LISP" "FFI") (:shadowing-import-from "EXPORTING" #:defconstant #:defun #:defmacro #:def-c-type #:def-c-enum #:def-c-struct #:def-c-var #:def-call-out)) --__--__-- Message: 11 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src defpackage.lisp,1.10,1.11 ChangeLog,1.4137,1.4138 Date: Mon, 24 Jan 2005 19:08:33 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15650 Modified Files: defpackage.lisp ChangeLog Log Message: Make the order of the :modern and :case-sensitive clauses irrelevant. Index: defpackage.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/defpackage.lisp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- defpackage.lisp 24 Jan 2005 17:35:50 -0000 1.10 +++ defpackage.lisp 24 Jan 2005 19:07:55 -0000 1.11 @@ -20,17 +20,20 @@ (let ((case-sensitive nil) ; flag for :CASE-SENSITIVE (case-inverted nil) ; flag for :CASE-INVERTED (modern :DEFAULT)) ; flag for :MODERN + ;; Process :MODERN first, because it specifies some defaults. + (dolist (option options) + (when (listp option) + (case (first option) + (:MODERN ; CLISP extension + (setq modern (second option)) + (setq case-inverted (setq case-sensitive (not (null modern)))))))) (dolist (option options) (when (listp option) (case (first option) (:CASE-SENSITIVE ; CLISP extension - (when (second option) (setq case-sensitive t))) + (setq case-sensitive (not (null (second option))))) (:CASE-INVERTED ; CLISP extension - (when (second option) (setq case-inverted t))) - (:MODERN ; CLISP extension - (setq modern (second option) - case-sensitive (not (null modern)) - case-inverted case-sensitive))))) + (setq case-inverted (not (null (second option)))))))) (let ((to-string (if case-inverted #'cs-cl:string #'cl:string))) ;; Process options: (let ((size nil) ; :SIZE has been supplied Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4137 retrieving revision 1.4138 diff -u -d -r1.4137 -r1.4138 --- ChangeLog 24 Jan 2005 18:32:51 -0000 1.4137 +++ ChangeLog 24 Jan 2005 19:07:57 -0000 1.4138 @@ -1,3 +1,8 @@ +2005-01-24 Bruno Haible <br...@cl...> + + * defpackage.lisp (defpackage): Let :case-sensitive and :case-inverted + options override the default provided by :modern. + 2005-01-24 Sam Steingold <sd...@gn...> * modules/bindings/glibc/linux.lisp, modules/bindings/win32/win32.lisp: --__--__-- Message: 12 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src makemake.in,1.503,1.504 Date: Mon, 24 Jan 2005 20:16:26 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1039 Modified Files: makemake.in Log Message: Comments about BASE_MODULES. Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.503 retrieving revision 1.504 diff -u -d -r1.503 -r1.504 --- makemake.in 24 Jan 2005 16:34:29 -0000 1.503 +++ makemake.in 24 Jan 2005 20:16:11 -0000 1.504 @@ -1881,6 +1881,10 @@ echol "MODULES = ${MODULES} "`set | grep '^with_module_' | sed -e 's,^with_module_,,' -e 's,=.*$,,'` echol echol "# List of add-on modules that are already hardwired in the base linking set" +# We put i18n into 'base' because it's essential for internationalized programs. +# We put syscalls into 'base' because it is very useful for scripting. +# We put regexp into 'base' because it is useful for scripting and text processing, +# and we don't want P*rl to take over 100% of CPU time. if [ -n "$USE_GETTEXT" ]; then echol "BASE_MODULES = i18n syscalls regexp" else --__--__-- Message: 13 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src defpackage.lisp,1.11,1.12 ChangeLog,1.4138,1.4139 Date: Mon, 24 Jan 2005 22:02:44 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23129/src Modified Files: defpackage.lisp ChangeLog Log Message: (defpackage): duplicate USE-PACKAGE is OK Index: defpackage.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/defpackage.lisp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- defpackage.lisp 24 Jan 2005 19:07:55 -0000 1.11 +++ defpackage.lisp 24 Jan 2005 22:00:51 -0000 1.12 @@ -165,16 +165,12 @@ `((when (find "COMMON-LISP" (package-use-list ,packname) :test #'string= :key #'package-name) (unuse-package "COMMON-LISP" ,packname) - (use-package "CS-COMMON-LISP" ,packname) - (setq use-list (delete "CS-COMMON-LISP" use-list - :test #'string=))))) + (use-package "CS-COMMON-LISP" ,packname)))) ((nil) `((when (find "CS-COMMON-LISP" (package-use-list ,packname) :test #'string= :key #'package-name) (unuse-package "CS-COMMON-LISP" ,packname) - (use-package "COMMON-LISP" ,packname) - (setq use-list (delete "COMMON-LISP" use-list - :test #'string=))))) + (use-package "COMMON-LISP" ,packname)))) ((:DEFAULT) '())) ;; Step 1 ,@(if shadow-list Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4138 retrieving revision 1.4139 diff -u -d -r1.4138 -r1.4139 --- ChangeLog 24 Jan 2005 19:07:57 -0000 1.4138 +++ ChangeLog 24 Jan 2005 22:00:53 -0000 1.4139 @@ -1,3 +1,7 @@ +2005-01-24 Sam Steingold <sd...@gn...> + + * defpackage.lisp (defpackage): duplicate USE-PACKAGE is OK + 2005-01-24 Bruno Haible <br...@cl...> * defpackage.lisp (defpackage): Let :case-sensitive and :case-inverted --__--__-- Message: 14 From: Sam Steingold <sd...@us...> To: cli...@li... Subject: clisp/src makemake.in,1.504,1.505 Date: Mon, 24 Jan 2005 22:48:03 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1878 Modified Files: makemake.in Log Message: removed anti-Perl escapade Index: makemake.in =================================================================== RCS file: /cvsroot/clisp/clisp/src/makemake.in,v retrieving revision 1.504 retrieving revision 1.505 diff -u -d -r1.504 -r1.505 --- makemake.in 24 Jan 2005 20:16:11 -0000 1.504 +++ makemake.in 24 Jan 2005 22:47:56 -0000 1.505 @@ -1881,10 +1881,9 @@ echol "MODULES = ${MODULES} "`set | grep '^with_module_' | sed -e 's,^with_module_,,' -e 's,=.*$,,'` echol echol "# List of add-on modules that are already hardwired in the base linking set" -# We put i18n into 'base' because it's essential for internationalized programs. -# We put syscalls into 'base' because it is very useful for scripting. -# We put regexp into 'base' because it is useful for scripting and text processing, -# and we don't want P*rl to take over 100% of CPU time. +# i18n: essential for internationalized programs +# syscalls: very useful for scripting +# regexp: useful for scripting and text processing if [ -n "$USE_GETTEXT" ]; then echol "BASE_MODULES = i18n syscalls regexp" else --__--__-- _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest |