Menu
▾
▴
clisp-cvs Digest, Vol 26, Issue 33
|
From: <cli...@li...> - 2008-06-27 21:02:52
|
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/doc cl-ent.xml,1.133,1.134 (Sam Steingold) 2. clisp/src ChangeLog, 1.6312, 1.6313 constsym.d, 1.366, 1.367 control.d, 1.151, 1.152 eval.d, 1.255, 1.256 fsubr.d, 1.12, 1.13 io.d, 1.343, 1.344 lisparit.d, 1.100, 1.101 package.d, 1.112, 1.113 predtype.d, 1.145, 1.146 spvw.d, 1.433, 1.434 spvw_allocate.d, 1.29, 1.30 spvw_language.d, 1.39, 1.40 (Sam Steingold) 3. clisp/src ChangeLog,1.6313,1.6314 intdiv.d,1.24,1.25 (Sam Steingold) 4. clisp/src ChangeLog,1.6314,1.6315 intsqrt.d,1.24,1.25 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Fri, 27 Jun 2008 20:19:23 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/doc cl-ent.xml,1.133,1.134 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/doc In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20916/doc Modified Files: cl-ent.xml Log Message: (lispworks): updated Index: cl-ent.xml =================================================================== RCS file: /cvsroot/clisp/clisp/doc/cl-ent.xml,v retrieving revision 1.133 retrieving revision 1.134 diff -u -d -r1.133 -r1.134 --- cl-ent.xml 17 Jun 2008 14:07:14 -0000 1.133 +++ cl-ent.xml 27 Jun 2008 20:19:21 -0000 1.134 @@ -131,7 +131,7 @@ <!ENTITY openmcl '<ulink url="http://openmcl.clozure.com/"><command>OpenMCL</command></ulink>'> <!ENTITY sbcl '<ulink url="http://sbcl.sourceforge.net/"><command>SBCL</command></ulink>'> <!ENTITY acl '<ulink url="http://www.franz.com"><command>Allegro CL</command></ulink>'> -<!ENTITY lispworks '<ulink url="http://www.xanalys.com/software_tools/products/index.html"><command>LispWorks</command></ulink>'> +<!ENTITY lispworks '<ulink url="http://www.lispworks.com/products/lispworks.html"><command>LispWorks</command></ulink>'> <!-- *** Editors *** --> <!ENTITY emacs '<ulink url="http://www.gnu.org/software/emacs/">Emacs</ulink>'> ------------------------------ Message: 2 Date: Fri, 27 Jun 2008 20:55:18 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog, 1.6312, 1.6313 constsym.d, 1.366, 1.367 control.d, 1.151, 1.152 eval.d, 1.255, 1.256 fsubr.d, 1.12, 1.13 io.d, 1.343, 1.344 lisparit.d, 1.100, 1.101 package.d, 1.112, 1.113 predtype.d, 1.145, 1.146 spvw.d, 1.433, 1.434 spvw_allocate.d, 1.29, 1.30 spvw_language.d, 1.39, 1.40 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1498/src Modified Files: ChangeLog constsym.d control.d eval.d fsubr.d io.d lisparit.d package.d predtype.d spvw.d spvw_allocate.d spvw_language.d Log Message: (let*, *package*, *readtable*, *evalhook*, *applyhook*, *gc-statistics*) (*random-state*): use "star" instead of "stern" for C names Index: lisparit.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/lisparit.d,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- lisparit.d 22 Apr 2008 17:31:30 -0000 1.100 +++ lisparit.d 27 Jun 2008 20:55:15 -0000 1.101 @@ -1648,14 +1648,14 @@ error(type_error,GETTEXT("~S: argument should be a ~S, not ~S")); } } else { /* not specified -> default from *RANDOM-STATE* */ - obj = Symbol_value(S(random_state_stern)); /* value of *RANDOM-STATE* */ + obj = Symbol_value(S(random_state_star)); /* value of *RANDOM-STATE* */ if (random_state_p(obj)) { return obj; } else { pushSTACK(obj); /* TYPE-ERROR slot DATUM */ pushSTACK(S(random_state)); /* TYPE-ERROR slot EXPECTED-TYPE */ pushSTACK(obj); pushSTACK(S(random_state)); - pushSTACK(S(random_state_stern)); + pushSTACK(S(random_state_star)); pushSTACK(TheSubr(subr_self)->name); error(type_error,GETTEXT("~S: the value of ~S should be a ~S, not ~S")); } @@ -2072,7 +2072,7 @@ define_variable(S(read_default_float_format),S(single_float)); /* *READ-DEFAULT-FLOAT-FORMAT* := 'SINGLE-FLOAT */ { var object obj = make_random_state(T); /* new random Random-State */ - define_variable(S(random_state_stern),obj); /* =: *RANDOM-STATE* */ + define_variable(S(random_state_star),obj); /* =: *RANDOM-STATE* */ } /* SYS::*INHIBIT-FLOATING-POINT-UNDERFLOW* := NIL */ define_variable(S(inhibit_floating_point_underflow),NIL); Index: fsubr.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/fsubr.d,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- fsubr.d 14 Dec 2007 20:10:40 -0000 1.12 +++ fsubr.d 27 Jun 2008 20:55:14 -0000 1.13 @@ -56,7 +56,7 @@ LISPSPECFORM(prog1, 1,0,body) LISPSPECFORM(prog2, 2,0,body) LISPSPECFORM(let, 1,0,body) -LISPSPECFORM(letstern, 1,0,body) +LISPSPECFORM(letstar, 1,0,body) LISPSPECFORM(locally, 0,0,body) LISPSPECFORM(compiler_let, 1,0,body) LISPSPECFORM(progv, 2,0,body) Index: package.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/package.d,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- package.d 26 Mar 2008 21:02:44 -0000 1.112 +++ package.d 27 Jun 2008 20:55:15 -0000 1.113 @@ -1700,12 +1700,12 @@ < result: current package can trigger GC */ global maygc object get_current_package (void) { - var object pack = Symbol_value(S(packagestern)); /* value of *PACKAGE* */ + var object pack = Symbol_value(S(packagestar)); /* value of *PACKAGE* */ if (packagep(pack) && !pack_deletedp(pack)) { return pack; } else { var object newpack = /* reset *PACKAGE* */ - Symbol_value(S(packagestern)) = O(default_package); + Symbol_value(S(packagestar)) = O(default_package); /* get_current_package() is often called by the reader, so we need to save and restore the read buffers */ pushSTACK(O(token_buff_1)); O(token_buff_1) = NIL; @@ -1724,7 +1724,7 @@ funcall(L(cerror_of_type),9); O(token_buff_2) = popSTACK(); /* restore read buffers */ O(token_buff_1) = popSTACK(); - return Symbol_value(S(packagestern)); + return Symbol_value(S(packagestar)); } } @@ -2005,11 +2005,11 @@ being modified from a non-home package. See compiler.lisp:set-check-lock. can trigger GC */ -#define SYM_VAL_LOCK(symbol,pack) \ - (!nullp(pack) && !eq(pack,Symbol_value(S(packagestern))) /* non-home */ \ - && special_var_p(TheSymbol(symbol)) /* special */ \ - && !externalp(symbol,pack) /* for IN-PACKAGE forms */ \ - && !accessiblep(symbol,Symbol_value(S(packagestern)))) /* accessible */ +#define SYM_VAL_LOCK(symbol,pack) \ + (!nullp(pack) && !eq(pack,Symbol_value(S(packagestar))) /* non-home */ \ + && special_var_p(TheSymbol(symbol)) /* special */ \ + && !externalp(symbol,pack) /* for IN-PACKAGE forms */ \ + && !accessiblep(symbol,Symbol_value(S(packagestar)))) /* accessible */ global maygc void symbol_value_check_lock (object caller, object symbol) { var object pack = Symbol_package(symbol); if (SYM_VAL_LOCK(symbol,pack)) Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.6312 retrieving revision 1.6313 diff -u -d -r1.6312 -r1.6313 --- ChangeLog 26 Jun 2008 20:21:27 -0000 1.6312 +++ ChangeLog 27 Jun 2008 20:55:11 -0000 1.6313 @@ -1,3 +1,11 @@ +2008-06-27 Sam Steingold <sd...@gn...> + + * constsym.d, control.d, eval.d, fsubr.d, io.d, lisparit.d: + * package.d, predtype.d, spvw.d, spvw_allocate.d, spvw_language.d + (let*, *package*, *readtable*, *evalhook*, *applyhook*) + (*gc-statistics*, *random-state*): + use "star" instead of "stern" for C names + 2008-06-26 Sam Steingold <sd...@gn...> * utils/modprep.lisp (print-tables-1): use "..._of_list" instead @@ -707,11 +715,11 @@ 2008-05-13 Bruno Haible <br...@cl...> - * src/m4/pkg.m4: New file, from pkg-config-0.23. + * m4/pkg.m4: New file, from pkg-config-0.23. 2008-05-13 Bruno Haible <br...@cl...> - * src/m4/bold.m4 (BOLD_MSG): Fix underquoting. + * m4/bold.m4 (BOLD_MSG): Fix underquoting. 2008-05-13 Sam Steingold <sd...@gn...> @@ -1123,7 +1131,7 @@ * modules/syscalls/calls.c (GETGROUPS, %SETGROUPS): implemented * modules/syscalls/posix.lisp (GETGROUPS): export, add DEFSETF * modules/syscalls/configure.in: check for getgroups and setgroups - * src/lispbibl.d (llength1): export to clisp.h + * lispbibl.d (llength1): export to clisp.h 2008-03-29 Sam Steingold <sd...@gn...> @@ -1322,8 +1330,8 @@ 2008-03-12 Sam Steingold <sd...@gn...> - * src/glm4/lib-link.m4: updated from gnulib, discarding my changes - * src/m4/ffcall.m4 (CL_FFCALL): updated for the new AC_LIB_LINKFLAGS + * glm4/lib-link.m4: updated from gnulib, discarding my changes + * m4/ffcall.m4 (CL_FFCALL): updated for the new AC_LIB_LINKFLAGS 2008-03-12 Sam Steingold <sd...@gn...> @@ -1561,8 +1569,8 @@ 2008-02-24 Bruno Haible <br...@cl...> * Makefile.devel (GTK2_SVN_ROOT): New variable. - (src/m4/gtk-2.0.m4): New rule. - (src/aclocal.m4): Depend on it. + (m4/gtk-2.0.m4): New rule. + (aclocal.m4): Depend on it. 2008-02-24 Bruno Haible <br...@cl...> @@ -1592,7 +1600,7 @@ (build-aux-update): Depend on src/build-aux/ltmain.sh. (LIBTOOL_VERSION, LIBTOOL_SOURCE_FILE, LIBTOOL_SOURCE_URL): New variables. - (src/build-aux/ltmain.sh src/m4/libtool.m4): New rule. + (build-aux/ltmain.sh m4/libtool.m4): New rule. (EXCLUDE): Also exclude the LIBTOOL_SOURCE_FILE and its predecessors. 2008-02-24 Bruno Haible <br...@cl...> Index: eval.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/eval.d,v retrieving revision 1.255 retrieving revision 1.256 diff -u -d -r1.255 -r1.256 --- eval.d 24 Jun 2008 15:50:00 -0000 1.255 +++ eval.d 27 Jun 2008 20:55:14 -0000 1.256 @@ -1589,18 +1589,17 @@ > applyhook_value: value for *APPLYHOOK* changes STACK */ global void bindhooks (object evalhook_value, object applyhook_value) { - /* build frame: */ - { - var gcv_object_t* top_of_frame = STACK; /* Pointer to Frame */ - pushSTACK(Symbol_value(S(evalhookstern))); /* old value of *EVALHOOK* */ - pushSTACK(S(evalhookstern)); /* *EVALHOOK* */ - pushSTACK(Symbol_value(S(applyhookstern))); /* old value of *APPLYHOOK* */ - pushSTACK(S(applyhookstern)); /* *APPLYHOOK* */ + { /* build frame: */ + var gcv_object_t* top_of_frame = STACK; /* Pointer to Frame */ + pushSTACK(Symbol_value(S(evalhookstar))); /* old value of *EVALHOOK* */ + pushSTACK(S(evalhookstar)); /* *EVALHOOK* */ + pushSTACK(Symbol_value(S(applyhookstar))); /* old value of *APPLYHOOK* */ + pushSTACK(S(applyhookstar)); /* *APPLYHOOK* */ finish_frame(DYNBIND); } /* Frame got ready, now change the values of the variables: */ - Symbol_value(S(evalhookstern)) = evalhook_value; /* (SETQ *EVALHOOK* evalhook_value) */ - Symbol_value(S(applyhookstern)) = applyhook_value; /* (SETQ *APPLYHOOK* applyhook_value) */ + Symbol_value(S(evalhookstar)) = evalhook_value; /* (SETQ *EVALHOOK* evalhook_value) */ + Symbol_value(S(applyhookstar)) = applyhook_value; /* (SETQ *APPLYHOOK* applyhook_value) */ } /* UP: binds *EVALHOOK* and *APPLYHOOK* dynamically to NIL. @@ -2936,8 +2935,7 @@ goto start; }); var sp_jmp_buf my_jmp_buf; - /* build EVAL-frame: */ - { + { /* build EVAL-frame: */ var gcv_object_t* top_of_frame = STACK; /* Pointer to Frame */ pushSTACK(form); /* Form */ finish_entry_frame(EVAL,my_jmp_buf,, @@ -2949,12 +2947,11 @@ } }); } - /* Test for *EVALHOOK*: */ - { - var object evalhook_value = Symbol_value(S(evalhookstern)); /* *EVALHOOK* */ + { /* Test for *EVALHOOK*: */ + var object evalhook_value = Symbol_value(S(evalhookstar)); /* *EVALHOOK* */ if (nullp(evalhook_value)) { /* *EVALHOOK* = NIL ? */ /* yes -> continue evaluation normally */ - pushSTACK(Symbol_value(S(applyhookstern))); eval1(form); + pushSTACK(Symbol_value(S(applyhookstar))); eval1(form); } else { /* bind *EVALHOOK*, *APPLYHOOK* to NIL: */ bindhooks_NIL(); Index: spvw_allocate.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/spvw_allocate.d,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- spvw_allocate.d 17 Mar 2008 16:12:05 -0000 1.29 +++ spvw_allocate.d 27 Jun 2008 20:55:16 -0000 1.30 @@ -25,9 +25,9 @@ /* error-message because of full memory */ nonreturning_function(local, error_speicher_voll, (void)) { dynamic_bind(S(use_clcs),NIL); /* bind SYS::*USE-CLCS* to NIL */ - if (posfixnump(Symbol_value(S(gc_statistics_stern)))) { - /* bind SYS::*GC-STATISTICS* to 0 */ - dynamic_bind(S(gc_statistics_stern),Fixnum_0); + if (posfixnump(Symbol_value(S(gc_statistics_star)))) { + /* bind SYS::*GC-STATISTICS* to 0 */ + dynamic_bind(S(gc_statistics_star),Fixnum_0); } error(storage_condition,GETTEXT("No more room for LISP objects")); } Index: spvw_language.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/spvw_language.d,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- spvw_language.d 24 Apr 2008 22:32:43 -0000 1.39 +++ spvw_language.d 27 Jun 2008 20:55:16 -0000 1.40 @@ -285,8 +285,8 @@ } global maygc object CLOTEXT (const char* asciz) { - dynamic_bind(S(packagestern),O(default_package)); /* bind *PACKAGE* */ + dynamic_bind(S(packagestar),O(default_package)); /* bind *PACKAGE* */ pushSTACK(CLSTEXT(asciz)); funcall(L(read_from_string),1); - dynamic_unbind(S(packagestern)); + dynamic_unbind(S(packagestar)); return value1; } Index: constsym.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/constsym.d,v retrieving revision 1.366 retrieving revision 1.367 diff -u -d -r1.366 -r1.367 --- constsym.d 31 May 2008 22:16:02 -0000 1.366 +++ constsym.d 27 Jun 2008 20:55:14 -0000 1.367 @@ -60,7 +60,7 @@ LISPSYM(prog1,"PROG1",lisp) LISPSYM(prog2,"PROG2",lisp) LISPSYM(let,"LET",lisp) -LISPSYM(letstern,"LET*",lisp) +LISPSYM(letstar,"LET*",lisp) LISPSYM(locally,"LOCALLY",lisp) LISPSYM(compiler_let,"COMPILER-LET",ext) LISPSYM(progv,"PROGV",lisp) @@ -1419,7 +1419,7 @@ LISPSYM(Kinherited,"INHERITED",keyword) /* INTERN result in PACKAGE */ LISPSYM(do_symbols,"DO-SYMBOLS",lisp) /* error reporter in PACKAGE */ LISPSYM(do_external_symbols,"DO-EXTERNAL-SYMBOLS",lisp) /* error reporter in PACKAGE */ -LISPSYM(packagestern,"*PACKAGE*",lisp) /* variable in PACKAGE */ +LISPSYM(packagestar,"*PACKAGE*",lisp) /* variable in PACKAGE */ LISPSYM(internal_time_units_per_second,"INTERNAL-TIME-UNITS-PER-SECOND",lisp) /* constant in TIME */ LISPSYM(encode_universal_time,"ENCODE-UNIVERSAL-TIME",lisp) /* function in TIME */ LISPSYM(use_clcs,"*USE-CLCS*",system) /* variable in ERROR */ @@ -1584,7 +1584,7 @@ LISPSYM(read_base,"*READ-BASE*",lisp) /* IO variable */ LISPSYM(read_suppress,"*READ-SUPPRESS*",lisp) /* IO variable */ LISPSYM(read_eval,"*READ-EVAL*",lisp) /* IO variable */ -LISPSYM(readtablestern,"*READTABLE*",lisp) /* IO variable */ +LISPSYM(readtablestar,"*READTABLE*",lisp) /* IO variable */ LISPSYM(features,"*FEATURES*",lisp) /* IO variable */ LISPSYM(read_preserve_whitespace,"*READ-PRESERVE-WHITESPACE*",system) /* IO variable */ LISPSYM(read_line_number,"*READ-LINE-NUMBER*",system) /* IO variable */ @@ -1678,8 +1678,8 @@ #ifdef DEBUG_EVAL LISPSYM(funcall_trace_output,"*FUNCALL-TRACE-OUTPUT*",system) /* variable in EVAL */ #endif -LISPSYM(evalhookstern,"*EVALHOOK*",custom) /* variable in EVAL */ -LISPSYM(applyhookstern,"*APPLYHOOK*",custom) /* variable in EVAL */ +LISPSYM(evalhookstar,"*EVALHOOK*",custom) /* variable in EVAL */ +LISPSYM(applyhookstar,"*APPLYHOOK*",custom) /* variable in EVAL */ LISPSYM(macroexpand_hook,"*MACROEXPAND-HOOK*",lisp) /* variable in EVAL */ LISPSYM(lambda_parameters_limit,"LAMBDA-PARAMETERS-LIMIT",lisp) /* constant in EVAL */ LISPSYM(call_arguments_limit,"CALL-ARGUMENTS-LIMIT",lisp) /* constant in EVAL */ @@ -1776,7 +1776,7 @@ LISPSYM(deftype_expander,"DEFTYPE-EXPANDER",system) /* property in PREDTYPE */ LISPSYM(deftype_depth_limit,"*DEFTYPE-DEPTH-LIMIT*",custom) /* PREDTYPE variable */ LISPSYM(coerce_fixnum_char_ansi,"*COERCE-FIXNUM-CHAR-ANSI*",custom) /* variable for PREDTYPE */ -LISPSYM(gc_statistics_stern,"*GC-STATISTICS*",system) /* variable for PREDTYPE */ +LISPSYM(gc_statistics_star,"*GC-STATISTICS*",system) /* variable for PREDTYPE */ LISPSYM(recurse_count_gc_statistics,"*RECURSE-COUNT-GC-STATISTICS*",system) /* variable in PREDTYPE */ LISPSYM(traced_definition,"TRACED-DEFINITION",system) /* property in SYMBOL */ LISPSYM(gensym_counter,"*GENSYM-COUNTER*",lisp) /* variable in SYMBOL */ @@ -1824,7 +1824,7 @@ LISPSYM(default_float_format,"*DEFAULT-FLOAT-FORMAT*",custom) /* variable in LISPARIT */ LISPSYM(read_default_float_format,"*READ-DEFAULT-FLOAT-FORMAT*",lisp) /* variable in LISPARIT */ LISPSYM(write_float_decimal,"WRITE-FLOAT-DECIMAL",system) /* function for LISPARIT */ -LISPSYM(random_state_stern,"*RANDOM-STATE*",lisp) /* variable in LISPARIT */ +LISPSYM(random_state_star,"*RANDOM-STATE*",lisp) /* variable in LISPARIT */ #ifdef UNICODE LISPSYM(base64,"BASE64",charset) LISPSYM(unicode_16,"UNICODE-16",charset) Index: io.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/io.d,v retrieving revision 1.343 retrieving revision 1.344 diff -u -d -r1.343 -r1.344 --- io.d 22 Jun 2008 01:49:11 -0000 1.343 +++ io.d 27 Jun 2008 20:55:14 -0000 1.344 @@ -453,7 +453,7 @@ error_bad_readtable(); */ nonreturning_function(local, error_bad_readtable, (void)) { /* correct *READTABLE*: */ - var object sym = S(readtablestern); /* Symbol *READTABLE* */ + var object sym = S(readtablestar); /* Symbol *READTABLE* */ var object oldvalue = Symbol_value(sym); Symbol_value(sym) = O(standard_readtable); /* := CL standard readtable */ /* and report the error: */ @@ -469,13 +469,13 @@ < readtable : the current readtable */ #if 0 #define get_readtable(assignment) \ - { if (!readtablep(Symbol_value(S(readtablestern)))) \ + { if (!readtablep(Symbol_value(S(readtablestar)))) \ { error_bad_readtable(); } \ - assignment Symbol_value(S(readtablestern)); } + assignment Symbol_value(S(readtablestar)); } #else /* or (optimized): */ #define get_readtable(assignment) \ - { if (!(orecordp(Symbol_value(S(readtablestern))) \ - && (Record_type( assignment Symbol_value(S(readtablestern)) ) \ + { if (!(orecordp(Symbol_value(S(readtablestar))) \ + && (Record_type( assignment Symbol_value(S(readtablestar)) ) \ == Rectype_Readtable))) \ { error_bad_readtable(); }} #endif @@ -503,7 +503,7 @@ var object readtable = orig_readtable(); O(standard_readtable) = readtable; /* that is the standard-readtable, */ readtable = copy_readtable(readtable); /* one copy of it */ - define_variable(S(readtablestern),readtable); /* =: *READTABLE* */ + define_variable(S(readtablestar),readtable); /* =: *READTABLE* */ } /* initialize token_buff_1 and token_buff_2: */ O(token_buff_1) = NIL; @@ -3775,9 +3775,9 @@ local maygc Values feature (uintWL demandvalue) { var gcv_object_t* stream_ = test_no_infix(); /* n must be NIL */ dynamic_bind(S(read_suppress),NIL); /* bind *READ-SUPPRESS* to NIL */ - dynamic_bind(S(packagestern),O(keyword_package)); /* bind *PACKAGE* to #<PACKAGE KEYWORD> */ + dynamic_bind(S(packagestar),O(keyword_package)); /* bind *PACKAGE* to #<PACKAGE KEYWORD> */ var object expr = read_recursive_no_dot(stream_); /* read Feature-Expression */ - dynamic_unbind(S(packagestern)); + dynamic_unbind(S(packagestar)); dynamic_unbind(S(read_suppress)); /* interpret Feature-Expression: */ expr = make_references(expr); /* first unentangle references */ @@ -4152,9 +4152,9 @@ } else { unread_char(stream_,ch); dynamic_bind(S(read_suppress),NIL); /* bind *READ-SUPPRESS* to NIL */ - dynamic_bind(S(packagestern),O(charset_package)); /* bind *PACKAGE* to #<PACKAGE CHARSET> */ + dynamic_bind(S(packagestar),O(charset_package)); /* bind *PACKAGE* to #<PACKAGE CHARSET> */ var object expr = read_recursive_no_dot(stream_); /* read expression */ - dynamic_unbind(S(packagestern)); + dynamic_unbind(S(packagestar)); dynamic_unbind(S(read_suppress)); expr = make_references(expr); /* unentangle references */ pushSTACK(*stream_); pushSTACK(expr); pushSTACK(S(Kinput)); Index: spvw.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/spvw.d,v retrieving revision 1.433 retrieving revision 1.434 diff -u -d -r1.433 -r1.434 --- spvw.d 1 Jun 2008 20:13:26 -0000 1.433 +++ spvw.d 27 Jun 2008 20:55:16 -0000 1.434 @@ -1165,7 +1165,7 @@ /* common: */ define_constant(S(nil),S(nil)); /* NIL := NIL */ define_constant(S(t),S(t)); /* T := T */ - define_variable(S(gc_statistics_stern),Fixnum_minus1); /* SYS::*GC-STATISTICS* := -1 */ + define_variable(S(gc_statistics_star),Fixnum_minus1); /* SYS::*GC-STATISTICS* := -1 */ /* for EVAL/CONTROL: */ define_constant_UL1(S(lambda_parameters_limit),lp_limit_1); /* LAMBDA-PARAMETERS-LIMIT := lp_limit_1 + 1 */ define_constant_UL1(S(call_arguments_limit),ca_limit_1); /* CALL-ARGUMENTS-LIMIT := ca_limit_1 + 1 */ @@ -1173,15 +1173,15 @@ define_constant(S(jmpbuf_size),fixnum(jmpbufsize)); /* SYS::*JMPBUF-SIZE* := size of a jmp_buf */ define_constant(S(big_endian),(BIG_ENDIAN_P ? T : NIL)); /* SYS::*BIG-ENDIAN* := NIL resp. T */ define_variable(S(macroexpand_hook),L(funcall)); /* *MACROEXPAND-HOOK* := #'FUNCALL */ - define_variable(S(evalhookstern),NIL); /* *EVALHOOK* */ - define_variable(S(applyhookstern),NIL); /* *APPLYHOOK* */ + define_variable(S(evalhookstar),NIL); /* *EVALHOOK* */ + define_variable(S(applyhookstar),NIL); /* *APPLYHOOK* */ /* for HASHTABL: */ define_variable(S(eq_hashfunction),S(fasthash_eq)); /* EXT:*EQ-HASHFUNCTION* := 'EXT:FASTHASH-EQ */ define_variable(S(eql_hashfunction),S(fasthash_eql)); /* EXT:*EQL-HASHFUNCTION* := 'EXT:FASTHASH-EQL */ define_variable(S(equal_hashfunction),S(fasthash_equal)); /* EXT:*EQUAL-HASHFUNCTION* := 'EXT:FASTHASH-EQUAL */ define_variable(S(warn_on_hashtable_needing_rehash_after_gc),NIL); /* CUSTOM:*WARN-ON-HASHTABLE-NEEDING-REHASH-AFTER-GC* := NIL */ /* for PACKAGE: */ - define_variable(S(packagestern),Car(O(all_packages))); /* *PACKAGE* := '#<PACKAGE LISP> */ + define_variable(S(packagestar),Car(O(all_packages))); /* *PACKAGE* := '#<PACKAGE LISP> */ /* for SYMBOL: */ define_variable(S(gensym_counter),Fixnum_1); /* *GENSYM-COUNTER* := 1 */ /* for PATHNAME: */ @@ -1262,7 +1262,7 @@ define_variable(S(read_base),); - *READ-BASE* := 10 define_variable(S(read_suppress),); - *READ-SUPPRESS* := NIL define_variable(S(read_eval),); - *READ-EVAL* := T - define_variable(S(readtablestern),); - *READTABLE* */ + define_variable(S(readtablestar),); - *READTABLE* */ define_variable(S(read_preserve_whitespace),unbound); /* SYS::*READ-PRESERVE-WHITESPACE* */ define_variable(S(read_recursive_p),unbound); /* SYS::*READ-RECURSIVE-P* */ define_variable(S(read_reference_table),unbound); /* SYS::*READ-REFERENCE-TABLE* */ @@ -1323,8 +1323,8 @@ define_variable(S(device_prefix),NIL); /* CUSTOM:*DEVICE-PREFIX* */ #endif /* for EVAL: */ - define_variable(S(evalhookstern),NIL); /* *EVALHOOK* := NIL */ - define_variable(S(applyhookstern),NIL); /* *APPLYHOOK* := NIL */ + define_variable(S(evalhookstar),NIL); /* *EVALHOOK* := NIL */ + define_variable(S(applyhookstar),NIL); /* *APPLYHOOK* := NIL */ /* for MISC: */ define_constant(S(internal_time_units_per_second), /* INTERNAL-TIME-UNITS-PER-SECOND */ fixnum(ticks_per_second) ); /* := 200 resp. 1000000 */ @@ -3058,7 +3058,7 @@ } if (p->argv_modern) { /* (IN-PACKAGE "CS-COMMON-LISP-USER") */ - Symbol_value(S(packagestern)) = O(modern_user_package); + Symbol_value(S(packagestar)) = O(modern_user_package); /* (SETQ *PRINT-CASE* :DOWNCASE) */ Symbol_value(S(print_case)) = S(Kdowncase); } @@ -3205,7 +3205,7 @@ pushSTACK(packname); var object package = find_package(packname); if (!nullp(package)) { - Symbol_value(S(packagestern)) = package; + Symbol_value(S(packagestar)) = package; } else { pushSTACK(var_stream(S(standard_output),strmflags_wr_ch_B)); terpri(&STACK_0); Index: control.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/control.d,v retrieving revision 1.151 retrieving revision 1.152 diff -u -d -r1.151 -r1.152 --- control.d 24 Jun 2008 15:50:00 -0000 1.151 +++ control.d 27 Jun 2008 20:55:14 -0000 1.152 @@ -667,7 +667,7 @@ } } -LISPSPECFORM(letstern, 1,0,body) +LISPSPECFORM(letstar, 1,0,body) { /* (LET* ({varspec}) {decl} {form}), CLTL p. 111 */ /* separate {decl} {form} : */ if (parse_doc_decl(STACK_0,false)) { /* declaration (COMPILE) ? */ @@ -678,7 +678,7 @@ /* build variable binding frame, extend VAR_ENV : */ var gcv_object_t *bind_ptr, *spec_ptr; var uintC bind_count, spec_count; - make_variable_frame(S(letstern),popSTACK(),&bind_ptr,&bind_count, + make_variable_frame(S(letstar),popSTACK(),&bind_ptr,&bind_count, &spec_ptr,&spec_count); /* Then, evaluate the initialization forms and activate the bindings */ if (bind_count > 0) { Index: predtype.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/predtype.d,v retrieving revision 1.145 retrieving revision 1.146 diff -u -d -r1.145 -r1.146 --- predtype.d 14 Apr 2008 19:41:48 -0000 1.145 +++ predtype.d 27 Jun 2008 20:55:16 -0000 1.146 @@ -3135,7 +3135,7 @@ with_gc_statistics(fun); > fun: function, that triggers a GC */ global void with_gc_statistics (gc_function_t* fun) { - var object flag = Symbol_value(S(gc_statistics_stern)); + var object flag = Symbol_value(S(gc_statistics_star)); if (!posfixnump(flag)) { /* No need to do statistics, throw old ones away. */ O(gc_statistics_list) = NIL; fun(); @@ -3173,7 +3173,7 @@ if (posfixnum_to_V(Symbol_value(S(recurse_count_gc_statistics))) > 3) { /* recursion depth too big. */ danger = true; - dynamic_bind(S(gc_statistics_stern),Fixnum_0); + dynamic_bind(S(gc_statistics_star),Fixnum_0); } /* Allocate and fill result vector. */ heap_statistics_result(&locals); @@ -3183,7 +3183,7 @@ O(gc_statistics_list) = new_cons; } /* Done. */ - if (danger) { dynamic_unbind(S(gc_statistics_stern)); } + if (danger) { dynamic_unbind(S(gc_statistics_star)); } dynamic_unbind(S(recurse_count_gc_statistics)); skipSTACK(locals.structure_classes.count + locals.standard_classes.count); done_hs_locals(locals); ------------------------------ Message: 3 Date: Fri, 27 Jun 2008 20:58:28 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.6313,1.6314 intdiv.d,1.24,1.25 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2938/src Modified Files: ChangeLog intdiv.d Log Message: (UDS_divide_): rename local variable q_stern -> q_star Index: intdiv.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/intdiv.d,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- intdiv.d 13 Dec 2007 22:27:46 -0000 1.24 +++ intdiv.d 27 Jun 2008 20:58:26 -0000 1.25 @@ -177,18 +177,18 @@ # r_MSDptr = Pointer auf r[n+j] = Pointer auf q[j], # r_ptr = Pointer oberhalb von r[j]. do { - var uintD q_stern; + var uintD q_star; var uintD c1; if (r_MSDptr[0] < b_msd) { # r[j+n] < b[n-1] ? # Dividiere r[j+n]*beta+r[j+n-1] durch b[n-1], ohne Ãberlauf: #if HAVE_DD - divuD(highlowDD(r_MSDptr[0],r_MSDptr[1]),b_msd, q_stern=,c1=); + divuD(highlowDD(r_MSDptr[0],r_MSDptr[1]),b_msd, q_star=,c1=); #else - divuD(r_MSDptr[0],r_MSDptr[1],b_msd, q_stern=,c1=); + divuD(r_MSDptr[0],r_MSDptr[1],b_msd, q_star=,c1=); #endif } else { # Ãberlauf, also r[j+n]*beta+r[j+n-1] >= beta*b[n-1] - q_stern = bitm(intDsize)-1; # q* = beta-1 + q_star = bitm(intDsize)-1; # q* = beta-1 # Teste ob r[j+n]*beta+r[j+n-1] - (beta-1)*b[n-1] >= beta # <==> r[j+n]*beta+r[j+n-1] + b[n-1] >= beta*b[n-1]+beta # <==> b[n-1] < floor((r[j+n]*beta+r[j+n-1]+b[n-1])/beta) {<= beta !} ist. @@ -201,21 +201,21 @@ goto subtract; # ja -> direkt in die Subtraktion } } - # q_stern = q*, + # q_star = q*, # c1 = (r[j+n]*beta+r[j+n-1]) - q* * b[n-1] (>=0, <beta). #if HAVE_DD { var uintDD c2 = highlowDD(c1,r_MSDptr[2]); # c1*beta+r[j+n-2] - var uintDD c3 = muluD(b_2msd,q_stern); # b[n-2] * q* + var uintDD c3 = muluD(b_2msd,q_star); # b[n-2] * q* # Solange c2 < c3, c2 erhöhen, c3 erniedrigen: # Rechne dabei mit c3-c2: # solange >0, um b[n-1]*beta+b[n-2] erniedrigen. # Dies kann wegen b[n-1]*beta+b[n-2] >= beta^2/2 # höchstens zwei mal auftreten. if (c3 > c2) { - q_stern = q_stern-1; # q* := q* - 1 + q_star = q_star-1; # q* := q* - 1 if (c3-c2 > b_msdd) - q_stern = q_stern-1; # q* := q* - 1 + q_star = q_star-1; # q* := q* - 1 } } #else @@ -225,32 +225,32 @@ var uintD c2lo = r_MSDptr[2]; # c2hi*beta+c2lo = c1*beta+r[j+n-2] var uintD c3hi; var uintD c3lo; - muluD(b_2msd,q_stern, c3hi=,c3lo=); # c3hi*beta+c3lo = b[n-2] * q* + muluD(b_2msd,q_star, c3hi=,c3lo=); # c3hi*beta+c3lo = b[n-2] * q* if ((c3hi > c2hi) || ((c3hi == c2hi) && (c3lo > c2lo))) { - q_stern = q_stern-1; # q* := q* - 1 + q_star = q_star-1; # q* := q* - 1 c3hi -= c2hi; if (c3lo < c2lo) c3hi--; c3lo -= c2lo; # c3 := c3-c2 if ((c3hi > b_msd) || ((c3hi == b_msd) && (c3lo > b_2msd))) - q_stern = q_stern-1; # q* := q* - 1 + q_star = q_star-1; # q* := q* - 1 } } #undef c2hi #endif - if (!(q_stern==0)) + if (!(q_star==0)) subtract: { # Subtraktionsschleife: r := r - b * q* * beta^j - var uintD carry = mulusub_loop_down(q_stern,b_LSDptr,r_ptr,b_len); + var uintD carry = mulusub_loop_down(q_star,b_LSDptr,r_ptr,b_len); # Noch r_ptr[-b_len-1] -= carry, d.h. r_MSDptr[0] -= carry # durchführen und danach r_MSDptr[0] vergessen: if (carry > r_MSDptr[0]) { # Subtraktion ergab Ãbertrag - q_stern = q_stern-1; # q* := q* - 1 + q_star = q_star-1; # q* := q* - 1 addto_loop_down(b_LSDptr,r_ptr,b_len); # Additionsschleife # r[n+j] samt Carry kann vergessen werden... } } # Berechnung von q* ist fertig. - *r_MSDptr++ = q_stern; # als q[j] ablegen + *r_MSDptr++ = q_star; # als q[j] ablegen r_ptr++; } while (--j != 0); # Nun ist q = [q[m-n],..,q[0]] = q_MSDptr/q_len/r_MSDptr Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.6313 retrieving revision 1.6314 diff -u -d -r1.6313 -r1.6314 --- ChangeLog 27 Jun 2008 20:55:11 -0000 1.6313 +++ ChangeLog 27 Jun 2008 20:58:26 -0000 1.6314 @@ -5,6 +5,7 @@ (let*, *package*, *readtable*, *evalhook*, *applyhook*) (*gc-statistics*, *random-state*): use "star" instead of "stern" for C names + * intdiv.d (UDS_divide_): rename local variable q_stern -> q_star 2008-06-26 Sam Steingold <sd...@gn...> ------------------------------ Message: 4 Date: Fri, 27 Jun 2008 20:59:28 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.6314,1.6315 intsqrt.d,1.24,1.25 To: cli...@li... Message-ID: <E1K...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3344/src Modified Files: ChangeLog intsqrt.d Log Message: (UDS_sqrt_): rename local variable b_stern -> b_star Index: intsqrt.d =================================================================== RCS file: /cvsroot/clisp/clisp/src/intsqrt.d,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- intsqrt.d 13 Dec 2007 22:27:46 -0000 1.24 +++ intsqrt.d 27 Jun 2008 20:59:26 -0000 1.25 @@ -276,7 +276,7 @@ # b_MSDptr = Pointer auf b[n], b_ptr = Pointer hinter b[n-j]. # a_mptr = Pointer auf a[2n-j], a_lptr = Pointer hinter a[2n-2j]. # Bestimme b* : - var uintD b_stern; + var uintD b_star; { var uintD a_1d = a_mptr[0]; # a[2n-j], =0 oder =1 var uintD a_2d = a_mptr[1]; # a[2n-j-1] @@ -287,30 +287,30 @@ var uintDD a_123dd = highlowDD(a_2d,a_3d); a_123dd = a_123dd>>1; if (!(a_1d==0)) { a_123dd |= bit(2*intDsize-1); } if (highD(a_123dd) >= b_msd) - b_stern = bitm(intDsize)-1; # bei Ãberlauf: beta-1 + b_star = bitm(intDsize)-1; # bei Ãberlauf: beta-1 else - divuD(a_123dd,b_msd, b_stern=,); + divuD(a_123dd,b_msd, b_star=,); #else a_3d = a_3d>>1; if (!((a_2d & bit(0)) ==0)) { a_3d |= bit(intDsize-1); } a_2d = a_2d>>1; if (!(a_1d==0)) { a_2d |= bit(intDsize-1); } if (a_2d >= b_msd) - b_stern = bitm(intDsize)-1; # bei Ãberlauf: beta-1 + b_star = bitm(intDsize)-1; # bei Ãberlauf: beta-1 else - divuD(a_2d,a_3d,b_msd, b_stern=,); + divuD(a_2d,a_3d,b_msd, b_star=,); #endif } - # b_stern = b* in der ersten Schätzung. + # b_star = b* in der ersten Schätzung. a_lptr++; # Pointer hinter a[2n-2j-1] # Subtraktion [a[2n-j],...,a[2n-2j-1]] -= b* * [b[n],b[n-1],...,b[n-j]] : { - var uintD carry = mulusub_loop_down(b_stern,b_ptr,a_lptr,j+1); + var uintD carry = mulusub_loop_down(b_star,b_ptr,a_lptr,j+1); if (a_mptr[0] >= carry) { a_mptr[0] -= carry; } else { a_mptr[0] -= carry; # a[2n-j] wird <0 # negativer Ãbertrag -> b* nach unten korrigieren: while (1) { - b_stern = b_stern-1; # b* := b* - 1 + b_star = b_star-1; # b* := b* - 1 # erhöhe [a[2n-j],...,a[2n-2j-1]] um [b[n],...,b[n-j]]: if (!(( addto_loop_down(b_ptr,a_lptr,j+1) ==0))) if ((a_mptr[0] += 1) ==0) # Ãbertrag zu a[2n-j] @@ -318,61 +318,61 @@ } } } - # b_stern = b* in der zweiten Schätzung. + # b_star = b* in der zweiten Schätzung. a_mptr++; # Pointer auf a[2n-j-1] a_lptr++; # Pointer hinter a[2n-2j-2] # Ziehe b* ^ 2 von [a[2n-j],...,a[2n-2j-2]] ab: #if HAVE_DD { - var uintDD b_stern_2 = muluD(b_stern,b_stern); + var uintDD b_star_2 = muluD(b_star,b_star); var uintDD a_12dd = highlowDD(a_lptr[-2],a_lptr[-1]); # a[2n-2j-1]*beta+a[2n-2j-2] - var uintDD a_12dd_new = a_12dd - b_stern_2; + var uintDD a_12dd_new = a_12dd - b_star_2; a_lptr[-2] = highD(a_12dd_new); a_lptr[-1] = lowD(a_12dd_new); - if (a_12dd >= b_stern_2) - goto b_stern_ok; + if (a_12dd >= b_star_2) + goto b_star_ok; } #else { - var uintD b_stern_2_hi; - var uintD b_stern_2_lo; - muluD(b_stern,b_stern, b_stern_2_hi=,b_stern_2_lo=); + var uintD b_star_2_hi; + var uintD b_star_2_lo; + muluD(b_star,b_star, b_star_2_hi=,b_star_2_lo=); var uintD a_1d = a_lptr[-2]; # a[2n-2j-1] var uintD a_2d = a_lptr[-1]; # a[2n-2j-2] - var uintD a_1d_new = a_1d - b_stern_2_hi; - var uintD a_2d_new = a_2d - b_stern_2_lo; - if (a_2d < b_stern_2_lo) + var uintD a_1d_new = a_1d - b_star_2_hi; + var uintD a_2d_new = a_2d - b_star_2_lo; + if (a_2d < b_star_2_lo) a_1d_new -= 1; a_lptr[-2] = a_1d_new; a_lptr[-1] = a_2d_new; - if ((a_1d > b_stern_2_hi) - || ((a_1d == b_stern_2_hi) && (a_2d >= b_stern_2_lo)) + if ((a_1d > b_star_2_hi) + || ((a_1d == b_star_2_hi) && (a_2d >= b_star_2_lo)) ) - goto b_stern_ok; + goto b_star_ok; } #endif if (true) { # muss noch [a[2n-j],...,a[2n-2j]] um 1 erniedrigen: if ( dec_loop_down(&a_lptr[-2],j+1) ==0) - goto b_stern_ok; + goto b_star_ok; # Subtraktion von b*^2 lieferte negativen Carry - b_stern = b_stern-1; # b* := b* - 1 + b_star = b_star-1; # b* := b* - 1 # Workaround gcc-2.7.0 bug on i386 and gcc-2.5.8 bug on hppa. #if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7) - *&b_stern = *&b_stern; + *&b_star = *&b_star; #endif # erhöhe [a[2n-j-1],...,a[2n-2j-2]] um [b[n],...,b[n-j],0] + 2 * b* + 1 - if ((sintD)b_stern < 0) + if ((sintD)b_star < 0) b_ptr[-1] |= bit(0); # höchstes Bit von b* in b[n-j] ablegen - b_ptr[0] = (uintD)(b_stern<<1)+1; # niedrige Bits von b* und eine 1 als b[n-j-1] ablegen + b_ptr[0] = (uintD)(b_star<<1)+1; # niedrige Bits von b* und eine 1 als b[n-j-1] ablegen addto_loop_down(&b_ptr[1],a_lptr,j+2); # (a[2n-j] wird nicht mehr gebraucht.) b_ptr[0] -= 1; # niedrige Bits von b* in b[n-j-1] ablegen b_ptr++; } else { - b_stern_ok: + b_star_ok: # b* als b[n-j-1] ablegen: - if ((sintD)b_stern < 0) + if ((sintD)b_star < 0) b_ptr[-1] |= bit(0); # höchstes Bit von b* in b[n-j] ablegen - b_ptr[0] = (uintD)(b_stern<<1); # niedrige Bits von b* als b[n-j-1] ablegen + b_ptr[0] = (uintD)(b_star<<1); # niedrige Bits von b* als b[n-j-1] ablegen b_ptr++; } } Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.6314 retrieving revision 1.6315 diff -u -d -r1.6314 -r1.6315 --- ChangeLog 27 Jun 2008 20:58:26 -0000 1.6314 +++ ChangeLog 27 Jun 2008 20:59:24 -0000 1.6315 @@ -6,6 +6,7 @@ (*gc-statistics*, *random-state*): use "star" instead of "stern" for C names * intdiv.d (UDS_divide_): rename local variable q_stern -> q_star + * intsqrt.d (UDS_sqrt_): rename local variable b_stern -> b_star 2008-06-26 Sam Steingold <sd...@gn...> ------------------------------ ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 26, Issue 33 ***************************************** |