Re: documentation of integers, fixnums and bignums

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

Stefan Monnier wrote:
>>>> encode-char could potentially return a value that cannot be
>>>> represented as a fixnum.
>>> Can this still happen?  When?
>> When INDEX_TO_CODE_POINT returns a code point greater than
>> most-positive-fixnum, which can happen (in theory, at least) on 32-bit
>> platforms.
> 
> Can it, really?

I don't know of any way it could happen. So what you're saying is that we should 
install something like the attached patch?

Also, how about glyph-ids returned by font-variation-glyphs? Can they exceed 
fixnum range? If not, font-variation-glyphs could see a similar speedup.

[-- Attachment #2: encode-char.diff --]
[-- Type: text/x-patch, Size: 822 bytes --]

diff --git a/src/charset.c b/src/charset.c
index e11a8366d5..a5a5a944dc 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1870,8 +1870,7 @@ although this usage is obsolescent.  */)
 
 DEFUN ("encode-char", Fencode_char, Sencode_char, 2, 2, 0,
        doc: /* Encode the character CH into a code-point of CHARSET.
-Return the encoded code-point, a fixnum if its value is small enough,
-otherwise a bignum.
+Return the encoded code-point, a fixnum.
 Return nil if CHARSET doesn't support CH.  */)
   (Lisp_Object ch, Lisp_Object charset)
 {
@@ -1886,7 +1885,8 @@ Return nil if CHARSET doesn't support CH.  */)
   code = ENCODE_CHAR (charsetp, c);
   if (code == CHARSET_INVALID_CODE (charsetp))
     return Qnil;
-  return INT_TO_INTEGER (code);
+  eassert (!FIXNUM_OVERFLOW_P (code));
+  return make_fixnum (code);
 }