comparison src/number.c @ 4885:6772ce4d982b

Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums lisp/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Correct the semantics of #'member*, #'eql, #'assoc* in the presence of bignums; change the integerp byte code to fixnump semantics. * bytecomp.el (fixnump, integerp, byte-compile-integerp): Change the integerp byte code to fixnump; add a byte-compile method to integerp using fixnump and numberp and avoiding a funcall most of the time, since in the non-core contexts where integerp is used, it's mostly distinguishing between fixnums and things that are not numbers at all. * byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops) (byte-compile-side-effect-and-error-free-ops): Replace the integerp bytecode with fixnump; add fixnump to the side-effect-free-fns. Add the other extended number type predicates to the list in passing. * obsolete.el (floatp-safe): Mark this as obsolete. * cl.el (eql): Go into more detail in the docstring here. Don't bother checking whether both arguments are numbers; one is enough, #'equal will fail correctly if they have distinct types. (subst): Replace a call to #'integerp (deciding whether to use #'memq or not) with one to #'fixnump. Delete most-positive-fixnum, most-negative-fixnum from this file; they're now always in C, so they can't be modified from Lisp. * cl-seq.el (member*, assoc*, rassoc*): Correct these functions in the presence of bignums. * cl-macs.el (cl-make-type-test): The type test for a fixnum is now fixnump. Ditch floatp-safe, use floatp instead. (eql): Correct this compiler macro in the presence of bignums. (assoc*): Correct this compiler macro in the presence of bignums. * simple.el (undo): Change #'integerp to #'fixnump here, since we use #'delq with the same value as ELT a few lines down. src/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Fix problems with #'eql, extended number types, and the hash table implementation; change the Bintegerp bytecode to fixnump semantics even on bignum builds, since #'integerp can have a fast implementation in terms of #'fixnump for most of its extant uses, but not vice-versa. * lisp.h: Always #include number.h; we want the macros provided in it, even if the various number types are not available. * number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its argument is of non-immediate number type. Equivalent to FLOATP if WITH_NUMBER_TYPES is not defined. * elhash.c (lisp_object_eql_equal, lisp_object_eql_hash): Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP, giving more correct behaviour in the presence of the extended number types. * bytecode.c (Bfixnump, execute_optimized_program): Rename Bintegerp to Bfixnump; change its semantics to reflect the new name on builds with bignum support. * data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data): Always make #'fixnump available, even on non-BIGNUM builds; always implement #'integerp in this file, even on BIGNUM builds. Move most-positive-fixnum, most-negative-fixnum here from number.c, so they are Lisp constants even on builds without number types, and attempts to change or bind them error. Use the NUMBERP and INTEGERP macros even on builds without extended number types. * data.c (fixnum_char_or_marker_to_int): Rename this function from integer_char_or_marker_to_int, to better reflect the arguments it accepts. * number.c (Fevenp, Foddp, syms_of_number): Never provide #'integerp in this file. Remove #'oddp, #'evenp; their implementations are overridden by those in cl.el. * number.c (vars_of_number): most-positive-fixnum, most-negative-fixnum are no longer here. man/ChangeLog addition: 2010-01-23 Aidan Kehoe <kehoea@parhasard.net> Generally: be careful to say fixnum, not integer, when talking about fixed-precision integral types. I'm sure I've missed instances, both here and in the docstrings, but this is a decent start. * lispref/text.texi (Columns): Document where only fixnums, not integers generally, are accepted. (Registers): Remove some ancient char-int confoundance here. * lispref/strings.texi (Creating Strings, Creating Strings): Be more exact in describing where fixnums but not integers in general are accepted. (Creating Strings): Use a more contemporary example to illustrate how concat deals with lists including integers about #xFF. Delete some obsolete documentation on same. (Char Table Types): Document that only fixnums are accepted as values in syntax tables. * lispref/searching.texi (String Search, Search and Replace): Be exact in describing where fixnums but not integers in general are accepted. * lispref/range-tables.texi (Range Tables): Be exact in describing them; only fixnums are accepted to describe ranges. * lispref/os.texi (Killing XEmacs, User Identification) (Time of Day, Time Conversion): Be more exact about using fixnum where only fixed-precision integers are accepted. * lispref/objects.texi (Integer Type): Be more exact (and up-to-date) about the possible values for integers. Cross-reference to documentation of the bignum extension. (Equality Predicates): (Range Table Type): (Array Type): Use fixnum, not integer, to describe a fixed-precision integer. (Syntax Table Type): Correct some English syntax here. * lispref/numbers.texi (Numbers): Change the phrasing here to use fixnum to mean the fixed-precision integers normal in emacs. Document that our terminology deviates from that of Common Lisp, and that we're working on it. (Compatibility Issues): Reiterate the Common Lisp versus Emacs Lisp compatibility issues. (Comparison of Numbers, Arithmetic Operations): * lispref/commands.texi (Command Loop Info, Working With Events): * lispref/buffers.texi (Modification Time): Be more exact in describing where fixnums but not integers in general are accepted.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 24 Jan 2010 15:21:27 +0000
parents 2fc0e2f18322
children 1e9078742fa7
comparison
equal deleted inserted replaced
4869:e533a9912ef1 4885:6772ce4d982b
30 #define USED_IF_BIGFLOAT(decl) UNUSED (decl) 30 #define USED_IF_BIGFLOAT(decl) UNUSED (decl)
31 #endif 31 #endif
32 32
33 Lisp_Object Qrationalp, Qfloatingp, Qrealp; 33 Lisp_Object Qrationalp, Qfloatingp, Qrealp;
34 Lisp_Object Vdefault_float_precision; 34 Lisp_Object Vdefault_float_precision;
35 Fixnum Vmost_negative_fixnum, Vmost_positive_fixnum; 35
36 static Lisp_Object Qunsupported_type; 36 static Lisp_Object Qunsupported_type;
37 static Lisp_Object Vbigfloat_max_prec; 37 static Lisp_Object Vbigfloat_max_prec;
38 static int number_initialized; 38 static int number_initialized;
39 39
40 #ifdef HAVE_BIGNUM 40 #ifdef HAVE_BIGNUM
137 { 137 {
138 return BIGNUMP (object) ? Qt : Qnil; 138 return BIGNUMP (object) ? Qt : Qnil;
139 } 139 }
140 140
141 141
142 /********************************* Integers *********************************/
143 DEFUN ("integerp", Fintegerp, 1, 1, 0, /*
144 Return t if OBJECT is an integer, nil otherwise.
145 */
146 (object))
147 {
148 return INTEGERP (object) ? Qt : Qnil;
149 }
150
151 DEFUN ("evenp", Fevenp, 1, 1, 0, /*
152 Return t if INTEGER is even, nil otherwise.
153 */
154 (integer))
155 {
156 CONCHECK_INTEGER (integer);
157 return (BIGNUMP (integer)
158 ? bignum_evenp (XBIGNUM_DATA (integer))
159 : XTYPE (integer) == Lisp_Type_Int_Even) ? Qt : Qnil;
160 }
161
162 DEFUN ("oddp", Foddp, 1, 1, 0, /*
163 Return t if INTEGER is odd, nil otherwise.
164 */
165 (integer))
166 {
167 CONCHECK_INTEGER (integer);
168 return (BIGNUMP (integer)
169 ? bignum_oddp (XBIGNUM_DATA (integer))
170 : XTYPE (integer) == Lisp_Type_Int_Odd) ? Qt : Qnil;
171 }
172
173
174 /********************************** Ratios **********************************/ 142 /********************************** Ratios **********************************/
175 #ifdef HAVE_RATIO 143 #ifdef HAVE_RATIO
176 static void 144 static void
177 ratio_print (Lisp_Object obj, Lisp_Object printcharfun, 145 ratio_print (Lisp_Object obj, Lisp_Object printcharfun,
178 int UNUSED (escapeflag)) 146 int UNUSED (escapeflag))
266 #ifdef HAVE_RATIO 234 #ifdef HAVE_RATIO
267 return RATIOP (rational) 235 return RATIOP (rational)
268 ? make_bignum_bg (XRATIO_DENOMINATOR (rational)) 236 ? make_bignum_bg (XRATIO_DENOMINATOR (rational))
269 : make_int (1); 237 : make_int (1);
270 #else 238 #else
271 return rational; 239 return make_int (1);
272 #endif 240 #endif
273 } 241 }
274 242
275 243
276 /******************************** Bigfloats *********************************/ 244 /******************************** Bigfloats *********************************/
806 DEFSYMBOL (Qratiop); 774 DEFSYMBOL (Qratiop);
807 DEFSYMBOL (Qbigfloatp); 775 DEFSYMBOL (Qbigfloatp);
808 776
809 /* Functions */ 777 /* Functions */
810 DEFSUBR (Fbignump); 778 DEFSUBR (Fbignump);
811 DEFSUBR (Fintegerp);
812 DEFSUBR (Fevenp);
813 DEFSUBR (Foddp);
814 DEFSUBR (Fratiop); 779 DEFSUBR (Fratiop);
815 DEFSUBR (Frationalp); 780 DEFSUBR (Frationalp);
816 DEFSUBR (Fnumerator); 781 DEFSUBR (Fnumerator);
817 DEFSUBR (Fdenominator); 782 DEFSUBR (Fdenominator);
818 DEFSUBR (Fbigfloatp); 783 DEFSUBR (Fbigfloatp);
851 Vbigfloat_max_prec = make_int (EMACS_INT_MAX); 816 Vbigfloat_max_prec = make_int (EMACS_INT_MAX);
852 #else 817 #else
853 Vbigfloat_max_prec = make_int (0); 818 Vbigfloat_max_prec = make_int (0);
854 #endif /* HAVE_BIGFLOAT */ 819 #endif /* HAVE_BIGFLOAT */
855 820
856 DEFVAR_CONST_INT ("most-negative-fixnum", &Vmost_negative_fixnum /*
857 The fixnum closest in value to negative infinity.
858 */);
859 Vmost_negative_fixnum = EMACS_INT_MIN;
860
861 DEFVAR_CONST_INT ("most-positive-fixnum", &Vmost_positive_fixnum /*
862 The fixnum closest in value to positive infinity.
863 */);
864 Vmost_positive_fixnum = EMACS_INT_MAX;
865
866 Fprovide (intern ("number-types")); 821 Fprovide (intern ("number-types"));
867 #ifdef HAVE_BIGNUM 822 #ifdef HAVE_BIGNUM
868 Fprovide (intern ("bignum")); 823 Fprovide (intern ("bignum"));
869 #endif 824 #endif
870 #ifdef HAVE_RATIO 825 #ifdef HAVE_RATIO