|
From: <cli...@li...> - 2005-06-14 03:15:51
|
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 backquote.lisp,2.21,2.22 ChangeLog,1.4698,1.4699 (Bruno Haible) 2. clisp/src clos-class3.lisp,1.84,1.85 (Bruno Haible) 3. clisp/src NEWS,1.251,1.252 (Bruno Haible) 4. clisp/src constobj.d,1.175,1.176 error.d,1.131,1.132 ChangeLog,1.4699,1.4700 (Bruno Haible) 5. clisp/src defs1.lisp,1.55,1.56 compiler.lisp,1.282,1.283 ChangeLog,1.4700,1.4701 (Bruno Haible) 6. clisp/modules/syscalls calls.c,1.127,1.128 (Bruno Haible) 7. clisp/src ChangeLog,1.4701,1.4702 genclisph.d,1.194,1.195 (Bruno Haible) 8. clisp/utils modprep.lisp,1.45,1.46 (Bruno Haible) --__--__-- Message: 1 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src backquote.lisp,2.21,2.22 ChangeLog,1.4698,1.4699 Date: Mon, 13 Jun 2005 13:04:31 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7025/src Modified Files: backquote.lisp ChangeLog Log Message: Simplify code, to not use (sys::%unbound). Index: backquote.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/backquote.lisp,v retrieving revision 2.21 retrieving revision 2.22 diff -u -d -r2.21 -r2.22 --- backquote.lisp 13 May 2005 15:43:37 -0000 2.21 +++ backquote.lisp 13 Jun 2005 13:04:12 -0000 2.22 @@ -69,11 +69,11 @@ (when (consp object) (let ((head (first object))) (when (or (eq head 'SPLICE) (eq head 'NSPLICE)) - (bq-non-list-splice-error head :in-reader t :stream stream))) + (bq-non-list-splice-error head stream))) (when (bq-member 'SPLICE object) - (bq-dotted-splice-error 'SPLICE :in-reader t :stream stream)) + (bq-dotted-splice-error 'SPLICE stream)) (when (bq-member 'NSPLICE object) - (bq-dotted-splice-error 'NSPLICE :in-reader t :stream stream))) + (bq-dotted-splice-error 'NSPLICE stream))) (list 'BACKQUOTE object))) ;;; Handle the read syntax , @@ -123,25 +123,37 @@ ;;; Signal error for `,.form or `,@form. ;;; It's undefined behaviour; we signal an error for it. -;;; If :in-reader is t, then add the prefix "READ: ", to flag the error as +;;; If stream is non-NIL, then add the prefix "READ: ", to flag the error as ;;; coming from the reader. -(defun bq-non-list-splice-error (sym &key in-reader (stream (sys::%unbound))) - (error-of-type 'reader-error - :stream stream - (if in-reader (TEXT "READ: ~@?") "~@?") - (if (eq sym 'SPLICE) - (TEXT "the syntax `,@form is invalid") - (TEXT "the syntax `,.form is invalid")))) +(defun bq-non-list-splice-error (sym &optional stream) + (let ((errmsg + (if (eq sym 'SPLICE) + (TEXT "the syntax `,@form is invalid") + (TEXT "the syntax `,.form is invalid")))) + (if stream + (error-of-type 'reader-error + :stream stream + (TEXT "READ: ~@?") + errmsg) + (error-of-type 'error + "~@?" + errmsg)))) ;;; Signal error for `(... . ,@form) or `(... . ,.form). ;;; It's undefined behaviour; we signal an error for it. -(defun bq-dotted-splice-error (sym &key in-reader (stream (sys::%unbound))) - (error-of-type 'reader-error - :stream stream - (if in-reader (TEXT "READ: ~@?") "~@?") - (if (eq sym 'SPLICE) - (TEXT "the syntax `( ... . ,@form) is invalid") - (TEXT "the syntax `( ... . ,.form) is invalid")))) +(defun bq-dotted-splice-error (sym &optional stream) + (let ((errmsg + (if (eq sym 'SPLICE) + (TEXT "the syntax `( ... . ,@form) is invalid") + (TEXT "the syntax `( ... . ,.form) is invalid")))) + (if stream + (error-of-type 'reader-error + :stream stream + (TEXT "READ: ~@?") + errmsg) + (error-of-type 'error + "~@?" + errmsg)))) ;;; ============================== Macroexpander ============================== Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4698 retrieving revision 1.4699 diff -u -d -r1.4698 -r1.4699 --- ChangeLog 10 Jun 2005 16:41:06 -0000 1.4698 +++ ChangeLog 13 Jun 2005 13:04:14 -0000 1.4699 @@ -1,3 +1,9 @@ +2005-06-12 Bruno Haible <br...@cl...> + + * backquote.lisp (bq-non-list-splice-error, bq-dotted-splice-error): + Change calling convention, to avoid use of sys::%unbound. + (backquote-reader): Update. + 2005-06-10 Sam Steingold <sd...@gn...> * modules/pari/pari.lisp: updated for pari 2.2.11 --__--__-- Message: 2 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src clos-class3.lisp,1.84,1.85 Date: Mon, 13 Jun 2005 13:05:04 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7488/src Modified Files: clos-class3.lisp Log Message: Restore comments that Sam broke. (One nice thing about Unicode is that it contains the various mathematical operators. Use the misc-fixed or efont-fixed/efont-biwidth fonts if you have nothing better.) Index: clos-class3.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/clos-class3.lisp,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- clos-class3.lisp 6 May 2005 19:54:22 -0000 1.84 +++ clos-class3.lisp 13 Jun 2005 13:05:01 -0000 1.85 @@ -1753,7 +1753,7 @@ ((slots slots) '()) ((size size) 1) &allow-other-keys) - ;; metaclass = <structure-class> + ;; metaclass â <structure-class> (declare (ignore generic-accessors generic-accessors-p direct-slots-as-lists direct-slots-as-metaobjects direct-default-initargs documentation documentation-p)) @@ -1991,7 +1991,7 @@ &aux (direct-superclasses (class-direct-superclasses class)) (name (class-name class)) (old-slot-location-table (class-slot-location-table class))) - ;; metaclass = <semi-standard-class> + ;; metaclass â <semi-standard-class> (if (standard-class-p class) (check-metaclass-mix name direct-superclasses #'standard-class-p 'STANDARD-CLASS) --__--__-- Message: 3 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src NEWS,1.251,1.252 Date: Mon, 13 Jun 2005 13:05:43 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8060/src Modified Files: NEWS Log Message: Typo in URL. Index: NEWS =================================================================== RCS file: /cvsroot/clisp/clisp/src/NEWS,v retrieving revision 1.251 retrieving revision 1.252 diff -u -d -r1.251 -r1.252 --- NEWS 31 May 2005 15:01:27 -0000 1.251 +++ NEWS 13 Jun 2005 13:05:22 -0000 1.252 @@ -221,7 +221,7 @@ * Global error handlers can now be installed and removed using EXT:SET-GLOBAL-HANDLER, EXT:WITHOUT-GLOBAL-HANDLERS, and -on-error command line option. - See <http://clisp.cons.org/impnotes.html#global-hanldler> and + See <http://clisp.cons.org/impnotes.html#global-handler> and <http://clisp.cons.org/clisp.html#opt-on-error> for details. * TRANSLATE-PATHNAME and TRANSLATE-LOGICAL-PATHNAME accept a new keyword --__--__-- Message: 4 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src constobj.d,1.175,1.176 error.d,1.131,1.132 ChangeLog,1.4699,1.4700 Date: Mon, 13 Jun 2005 13:08:19 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9190/src Modified Files: constobj.d error.d ChangeLog Log Message: type_designator_function_name -> type_function_name Index: error.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/error.d,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- error.d 6 Jun 2005 11:47:14 -0000 1.131 +++ error.d 13 Jun 2005 13:08:05 -0000 1.132 @@ -1367,8 +1367,8 @@ pushSTACK(NIL); /* no PLACE */ switch (errtype) { case type_error: - pushSTACK(obj); /* TYPE-ERROR slot DATUM */ - pushSTACK(O(type_designator_function_name)); /* slot EXPECTED-TYPE */ + pushSTACK(obj); /* TYPE-ERROR slot DATUM */ + pushSTACK(O(type_function_name)); /* slot EXPECTED-TYPE */ break; case source_program_error: pushSTACK(obj); /* SOURCE-PROGRAM-ERROR slot DETAIL */ Index: constobj.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/constobj.d,v retrieving revision 1.175 retrieving revision 1.176 diff -u -d -r1.175 -r1.176 --- constobj.d 14 May 2005 13:45:45 -0000 1.175 +++ constobj.d 13 Jun 2005 13:08:04 -0000 1.176 @@ -205,7 +205,6 @@ LISPOBJ(type_designator_base_char,"(EXT::DESIGNATOR BASE-CHAR)") #endif LISPOBJ(type_designator_function,"(OR FUNCTION SYMBOL (CONS (EQL SETF) (CONS SYMBOL NULL)) (CONS (EQL LAMBDA)))") - LISPOBJ(type_designator_function_name,"(OR SYMBOL (CONS (EQL SETF) (CONS SYMBOL NULL)))") # Upper bound for the number of structure classes present in the system: LISPOBJ(structure_class_count_max,"0") # Upper bound for the number of standard classes present in the system: @@ -356,6 +355,7 @@ # vector with conditions and simple-conditions: LISPOBJ(error_types,"#()") # for errors of type TYPE-ERROR: + LISPOBJ(type_function_name,"(OR SYMBOL (CONS (EQL SETF) (CONS SYMBOL NULL)))") LISPOBJ(type_uint8,"(INTEGER 0 255)") # or "(UNSIGNED-BYTE 8)" LISPOBJ(type_sint8,"(INTEGER -128 127)") # or "(SIGNED-BYTE 8)" LISPOBJ(type_uint16,"(INTEGER 0 65535)") # or "(UNSIGNED-BYTE 16)" Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4699 retrieving revision 1.4700 diff -u -d -r1.4699 -r1.4700 --- ChangeLog 13 Jun 2005 13:04:14 -0000 1.4699 +++ ChangeLog 13 Jun 2005 13:08:06 -0000 1.4700 @@ -1,5 +1,11 @@ 2005-06-12 Bruno Haible <br...@cl...> + * constobj.d: Rename O(type_designator_function_name) to + O(type_function_name). + * error.d: Update. + +2005-06-12 Bruno Haible <br...@cl...> + * backquote.lisp (bq-non-list-splice-error, bq-dotted-splice-error): Change calling convention, to avoid use of sys::%unbound. (backquote-reader): Update. --__--__-- Message: 5 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src defs1.lisp,1.55,1.56 compiler.lisp,1.282,1.283 ChangeLog,1.4700,1.4701 Date: Mon, 13 Jun 2005 13:09:19 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10052/src Modified Files: defs1.lisp compiler.lisp ChangeLog Log Message: Make PROVIDE, REQUIRE work as expected in case-inverted packages. Index: defs1.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/defs1.lisp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- defs1.lisp 10 May 2005 19:35:20 -0000 1.55 +++ defs1.lisp 13 Jun 2005 13:09:15 -0000 1.56 @@ -148,13 +148,22 @@ (defvar *modules* nil) +; Conversion from module name to string. +; cl-user::abc -> "ABC", cs-cl-user::abc -> "abc". +(defun module-name (name) + (if (and (symbolp name) + (symbol-package name) + (package-case-inverted-p (symbol-package name))) + (cs-cl:string name) + (string name))) + (defun provide (name) - (setq *modules* (adjoin (string name) *modules* :test #'string=))) + (setq *modules* (adjoin (module-name name) *modules* :test #'string=))) -(defun require (module-name &optional (pathname nil p-given) - &aux (mod-name (string module-name))) - (unless (member mod-name *modules* :test #'string=) - (unless p-given (setq pathname (pathname mod-name))) +(defun require (module-name &optional (pathname nil p-given)) + (setq module-name (module-name module-name)) + (unless (member module-name *modules* :test #'string=) + (unless p-given (setq pathname (pathname module-name))) (let (#+CLISP (*load-paths* *load-paths*) #-CLISP (*default-pathname-defaults* '#"")) #+CLISP (pushnew (merge-pathnames "dynmod/" *lib-directory*) *load-paths* Index: compiler.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/compiler.lisp,v retrieving revision 1.282 retrieving revision 1.283 diff -u -d -r1.282 -r1.283 --- compiler.lisp 30 May 2005 13:29:47 -0000 1.282 +++ compiler.lisp 13 Jun 2005 13:09:15 -0000 1.283 @@ -67,6 +67,7 @@ sys::double-float-p sys::long-float-p sys::search-file sys::date-format sys::line-number sys::%funtabref sys::inlinable sys::constant-inlinable + sys::module-name sys::*compiling* sys::*compiling-from-file* sys::*inline-functions* sys::*venv* sys::*fenv* sys::*benv* sys::*genv* sys::*denv* sys::*toplevel-environment* sys::*toplevel-denv* @@ -3391,14 +3392,14 @@ ;; auxiliary function: PROVIDE on file-compilation, cf. function PROVIDE (defun c-PROVIDE (module-name) - (pushnew (string module-name) *compiled-modules* :test #'string=)) + (pushnew (module-name module-name) *compiled-modules* :test #'string=)) ;; auxiliary function: REQUIRE on file-compilation, cf. function REQUIRE -(defun c-REQUIRE (module-name &optional (pathname nil p-given) - &aux (mod-name (string module-name))) - (unless (or (member mod-name *modules* :test #'string=) - (member mod-name *compiled-modules* :test #'string=)) - (unless p-given (setq pathname (pathname mod-name))) +(defun c-REQUIRE (module-name &optional (pathname nil p-given)) + (setq module-name (module-name module-name)) + (unless (or (member module-name *modules* :test #'string=) + (member module-name *compiled-modules* :test #'string=)) + (unless p-given (setq pathname (pathname module-name))) (flet ((load-lib (file) (let* ((*load-paths* (cons (make-pathname :name nil :type nil Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4700 retrieving revision 1.4701 diff -u -d -r1.4700 -r1.4701 --- ChangeLog 13 Jun 2005 13:08:06 -0000 1.4700 +++ ChangeLog 13 Jun 2005 13:09:16 -0000 1.4701 @@ -1,5 +1,12 @@ 2005-06-12 Bruno Haible <br...@cl...> + Make PROVIDE, REQUIRE work as expected in case-inverted packages. + * defs1.lisp (module-name): New function. + (provide, require): Use it instead of #'string. + * compiler.lisp (c-PROVIDE, c-REQUIRE): Likewise. + +2005-06-12 Bruno Haible <br...@cl...> + * constobj.d: Rename O(type_designator_function_name) to O(type_function_name). * error.d: Update. --__--__-- Message: 6 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/modules/syscalls calls.c,1.127,1.128 Date: Mon, 13 Jun 2005 13:13:17 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/modules/syscalls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11885/modules/syscalls Modified Files: calls.c Log Message: Avoid "gcc -missing-declarations" warnings. Index: calls.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/syscalls/calls.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- calls.c 7 Jun 2005 20:37:07 -0000 1.127 +++ calls.c 13 Jun 2005 13:13:14 -0000 1.128 @@ -1943,6 +1943,7 @@ static HMODULE ole32 = NULL; #endif +void module__syscalls__init_function_2 (module_t* module); void module__syscalls__init_function_2 (module_t* module) { #if defined(WIN32_NATIVE) kernel32 = LoadLibrary ("kernel32.dll"); --__--__-- Message: 7 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/src ChangeLog,1.4701,1.4702 genclisph.d,1.194,1.195 Date: Mon, 13 Jun 2005 13:13:18 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11885/src Modified Files: ChangeLog genclisph.d Log Message: Avoid "gcc -missing-declarations" warnings. Index: genclisph.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/genclisph.d,v retrieving revision 1.194 retrieving revision 1.195 diff -u -d -r1.194 -r1.195 --- genclisph.d 10 Jun 2005 15:24:45 -0000 1.194 +++ genclisph.d 13 Jun 2005 13:13:15 -0000 1.195 @@ -212,6 +212,7 @@ #include "gen.lispbibl.c" printf("#define LISPFUNN(name,req_anz) LISPFUN(name,sec,req_anz,0,norest,nokey,0,NIL)\n"); + /* In LISPFUN_B, emit the decl first, to avoid "gcc -missing-declarations" warnings. */ printf("#define LISPFUN_B(name,sec,req_anz,opt_anz,rest_flag,key_flag,key_anz,keywords) Values C_##name subr_##rest_flag##_function_args; Values C_##name subr_##rest_flag##_function_args\n"); printf("#define subr_norest_function_args (void)\n"); printf("#define subr_rest_function_args (uintC argcount, object* rest_args_pointer)\n"); Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.4701 retrieving revision 1.4702 diff -u -d -r1.4701 -r1.4702 --- ChangeLog 13 Jun 2005 13:09:16 -0000 1.4701 +++ ChangeLog 13 Jun 2005 13:13:14 -0000 1.4702 @@ -1,5 +1,10 @@ 2005-06-12 Bruno Haible <br...@cl...> + Avoid "gcc -missing-declarations" warnings. + * modules/syscalls/calls.c (module__syscalls__init_function_2): Declare. + +2005-06-12 Bruno Haible <br...@cl...> + Make PROVIDE, REQUIRE work as expected in case-inverted packages. * defs1.lisp (module-name): New function. (provide, require): Use it instead of #'string. --__--__-- Message: 8 From: Bruno Haible <ha...@us...> To: cli...@li... Subject: clisp/utils modprep.lisp,1.45,1.46 Date: Mon, 13 Jun 2005 13:13:18 +0000 Reply-To: cli...@li... Update of /cvsroot/clisp/clisp/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11885/utils Modified Files: modprep.lisp Log Message: Avoid "gcc -missing-declarations" warnings. Index: modprep.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/utils/modprep.lisp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- modprep.lisp 10 Jun 2005 15:24:44 -0000 1.45 +++ modprep.lisp 13 Jun 2005 13:13:16 -0000 1.46 @@ -1140,6 +1140,7 @@ (format out " { ~S, ~S }," (fundef-pack fd) (fundef-name fd)))) (formatln out " 0") (formatln out "};") (newline out) + ; Emit the decl first, to avoid "gcc -missing-declarations" warnings. (formatln out "void ~A (module_t* module);" *init-1-name*) (formatln out "void ~A (module_t* module)" *init-1-name*) (formatln out "{") @@ -1157,12 +1158,14 @@ (formatln out "}") (when *init-2-name* ; no init2 => define a dummy (newline out) + ; Emit the decl first, to avoid "gcc -missing-declarations" warnings. (formatln out "void ~A (module_t* module);" *init-2-name*) (formatln out "void ~A (module_t* module)" *init-2-name*) (formatln out "{") (formatln out "}")) (when *fini-name* ; no fini-func => define a dummy (newline out) + ; Emit the decl first, to avoid "gcc -missing-declarations" warnings. (formatln out "void ~A (module_t* module);" *fini-name*) (formatln out "void ~A (module_t* module)" *fini-name*) (formatln out "{") --__--__-- _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest |