comparison lisp/cl.el @ 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 e29fcfd8df5f
children 8431b52e43b1
comparison
equal deleted inserted replaced
4869:e533a9912ef1 4885:6772ce4d982b
121 121
122 122
123 ;;; Predicates. 123 ;;; Predicates.
124 124
125 (defun eql (a b) ; See compiler macro in cl-macs.el 125 (defun eql (a b) ; See compiler macro in cl-macs.el
126 "Return t if the two args are the same Lisp object. 126 "Return t if the arguments are the same Lisp object, or numerically equal.
127 Floating-point numbers of equal value are `eql', but they may not be `eq'." 127
128 (or (eq a b) 128 They must be of the same type; the difference between `eq' and `eql' is most
129 (and (numberp a) (numberp b) (equal a b)))) 129 relevant when it comes to the non-fixnum number types. In this
130 implementation, fixnums of the same numeric value are always `eq', but this
131 is not true for other numeric types, among them floats, bignums and ratios,
132 if available.
133
134 See also `=' (which doesn't require that its arguments be of the same type,
135 but only accepts numeric arguments, characters and markers) and `equal'."
136 (or (eq a b) (and (numberp a) (equal a b))))
130 137
131 ;;; Generalized variables. These macros are defined here so that they 138 ;;; Generalized variables. These macros are defined here so that they
132 ;;; can safely be used in .emacs files. 139 ;;; can safely be used in .emacs files.
133 140
134 (defmacro incf (place &optional x) 141 (defmacro incf (place &optional x)
315 (setq *gensym-counter* (1+ *gensym-counter*))) 322 (setq *gensym-counter* (1+ *gensym-counter*)))
316 (intern name))) 323 (intern name)))
317 324
318 ;;; Numbers. 325 ;;; Numbers.
319 326
320 ;; XEmacs change: use floatp, which is right even in the presence of ratios 327 ;; XEmacs change: ditch floatp-safe.
321 ;; and bigfloats
322 (defun floatp-safe (object)
323 "Return t if OBJECT is a floating point number."
324 (floatp object))
325 328
326 (defun plusp (number) 329 (defun plusp (number)
327 "Return t if NUMBER is positive." 330 "Return t if NUMBER is positive."
328 (> number 0)) 331 (> number 0))
329 332
341 344
342 ;; XEmacs addition 345 ;; XEmacs addition
343 (defalias 'cl-abs 'abs) 346 (defalias 'cl-abs 'abs)
344 347
345 (defvar *random-state* (vector 'cl-random-state-tag -1 30 (cl-random-time))) 348 (defvar *random-state* (vector 'cl-random-state-tag -1 30 (cl-random-time)))
346
347 ;; XEmacs: These constants are defined in C when 'number-types is provided.
348 ;; They are always defined in C on Emacs. Maybe we should, too.
349 (unless (featurep 'number-types)
350 ;;; We use `eval' in case VALBITS differs from compile-time to load-time.
351 (defconst most-positive-fixnum (eval '(lsh -1 -1))
352 "The integer closest in value to positive infinity.")
353 (defconst most-negative-fixnum (eval '(- -1 (lsh -1 -1)))
354 "The integer closest in value to negative infinity."))
355 349
356 ;;; The following are set by code in cl-extra.el 350 ;;; The following are set by code in cl-extra.el
357 (defconst most-positive-float nil 351 (defconst most-positive-float nil
358 "The float closest in value to positive infinity.") 352 "The float closest in value to positive infinity.")
359 (defconst most-negative-float nil 353 (defconst most-negative-float nil
614 608
615 (defun subst (cl-new cl-old cl-tree &rest cl-keys) 609 (defun subst (cl-new cl-old cl-tree &rest cl-keys)
616 "Substitute NEW for OLD everywhere in TREE (non-destructively). 610 "Substitute NEW for OLD everywhere in TREE (non-destructively).
617 Return a copy of TREE with all elements `eql' to OLD replaced by NEW. 611 Return a copy of TREE with all elements `eql' to OLD replaced by NEW.
618 Keywords supported: :test :test-not :key" 612 Keywords supported: :test :test-not :key"
619 (if (or cl-keys (and (numberp cl-old) (not (integerp cl-old)))) 613 (if (or cl-keys (and (numberp cl-old) (not (fixnump cl-old))))
620 (apply 'sublis (list (cons cl-old cl-new)) cl-tree cl-keys) 614 (apply 'sublis (list (cons cl-old cl-new)) cl-tree cl-keys)
621 (cl-do-subst cl-new cl-old cl-tree))) 615 (cl-do-subst cl-new cl-old cl-tree)))
622 616
623 (defun cl-do-subst (cl-new cl-old cl-tree) 617 (defun cl-do-subst (cl-new cl-old cl-tree)
624 (cond ((eq cl-tree cl-old) cl-new) 618 (cond ((eq cl-tree cl-old) cl-new)