diff options
| author | Tom Tromey | 2018-08-07 18:08:53 -0600 |
|---|---|---|
| committer | Tom Tromey | 2018-08-07 18:08:53 -0600 |
| commit | d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8 (patch) | |
| tree | 04c920acf142f686d3cac11080b17a2fb0dfc9af /src/alloc.c | |
| parent | 68ebff23f7057090da260830500cb278f7b886a5 (diff) | |
| download | emacs-d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8.tar.gz emacs-d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8.zip | |
More macro renamings for bignum
* src/alloc.c, src/bidi.c, src/buffer.c, src/buffer.h, src/bytecode.c,
src/callint.c, src/callproc.c, src/casefiddle.c, src/casetab.c,
src/category.c, src/ccl.c, src/character.c, src/character.h,
src/charset.c, src/charset.h, src/chartab.c, src/cmds.c, src/coding.c,
src/composite.c, src/composite.h, src/data.c, src/dbusbind.c,
src/decompress.c, src/dired.c, src/dispextern.h, src/dispnew.c,
src/disptab.h, src/doc.c, src/dosfns.c, src/editfns.c,
src/emacs-module.c, src/emacs.c, src/eval.c, src/fileio.c,
src/floatfns.c, src/fns.c, src/font.c, src/font.h, src/fontset.c,
src/frame.c, src/frame.h, src/fringe.c, src/ftcrfont.c, src/ftfont.c,
src/gfilenotify.c, src/gnutls.c, src/gtkutil.c, src/image.c,
src/indent.c, src/insdel.c, src/intervals.c, src/json.c,
src/keyboard.c, src/keymap.c, src/kqueue.c, src/lcms.c, src/lisp.h,
src/lread.c, src/macros.c, src/marker.c, src/menu.c, src/minibuf.c,
src/msdos.c, src/print.c, src/process.c, src/profiler.c, src/search.c,
src/sound.c, src/syntax.c, src/syntax.h, src/sysdep.c, src/term.c,
src/termhooks.h, src/textprop.c, src/undo.c, src/w32.c,
src/w32console.c, src/w32fns.c, src/w32font.c, src/w32inevt.c,
src/w32proc.c, src/w32select.c, src/w32term.c, src/w32term.h,
src/w32uniscribe.c, src/window.c, src/xdisp.c, src/xfaces.c,
src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c, src/xml.c,
src/xrdb.c, src/xselect.c, src/xsettings.c, src/xterm.c, src/xwidget.c
Rename XINT->XFIXNUM, XFASTINT->XFIXNAT, XUINT->XUFIXNUM.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/alloc.c b/src/alloc.c index 367bb73fc15..512fdadfb2e 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -2324,10 +2324,10 @@ a multibyte string even if INIT is an ASCII character. */) | |||
| 2324 | CHECK_FIXNAT (length); | 2324 | CHECK_FIXNAT (length); |
| 2325 | CHECK_CHARACTER (init); | 2325 | CHECK_CHARACTER (init); |
| 2326 | 2326 | ||
| 2327 | c = XFASTINT (init); | 2327 | c = XFIXNAT (init); |
| 2328 | if (ASCII_CHAR_P (c) && NILP (multibyte)) | 2328 | if (ASCII_CHAR_P (c) && NILP (multibyte)) |
| 2329 | { | 2329 | { |
| 2330 | nbytes = XINT (length); | 2330 | nbytes = XFIXNUM (length); |
| 2331 | val = make_uninit_string (nbytes); | 2331 | val = make_uninit_string (nbytes); |
| 2332 | if (nbytes) | 2332 | if (nbytes) |
| 2333 | { | 2333 | { |
| @@ -2339,7 +2339,7 @@ a multibyte string even if INIT is an ASCII character. */) | |||
| 2339 | { | 2339 | { |
| 2340 | unsigned char str[MAX_MULTIBYTE_LENGTH]; | 2340 | unsigned char str[MAX_MULTIBYTE_LENGTH]; |
| 2341 | ptrdiff_t len = CHAR_STRING (c, str); | 2341 | ptrdiff_t len = CHAR_STRING (c, str); |
| 2342 | EMACS_INT string_len = XINT (length); | 2342 | EMACS_INT string_len = XFIXNUM (length); |
| 2343 | unsigned char *p, *beg, *end; | 2343 | unsigned char *p, *beg, *end; |
| 2344 | 2344 | ||
| 2345 | if (INT_MULTIPLY_WRAPV (len, string_len, &nbytes)) | 2345 | if (INT_MULTIPLY_WRAPV (len, string_len, &nbytes)) |
| @@ -2416,7 +2416,7 @@ LENGTH must be a number. INIT matters only in whether it is t or nil. */) | |||
| 2416 | Lisp_Object val; | 2416 | Lisp_Object val; |
| 2417 | 2417 | ||
| 2418 | CHECK_FIXNAT (length); | 2418 | CHECK_FIXNAT (length); |
| 2419 | val = make_uninit_bool_vector (XFASTINT (length)); | 2419 | val = make_uninit_bool_vector (XFIXNAT (length)); |
| 2420 | return bool_vector_fill (val, init); | 2420 | return bool_vector_fill (val, init); |
| 2421 | } | 2421 | } |
| 2422 | 2422 | ||
| @@ -2896,7 +2896,7 @@ DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0, | |||
| 2896 | Lisp_Object val = Qnil; | 2896 | Lisp_Object val = Qnil; |
| 2897 | CHECK_FIXNAT (length); | 2897 | CHECK_FIXNAT (length); |
| 2898 | 2898 | ||
| 2899 | for (EMACS_INT size = XFASTINT (length); 0 < size; size--) | 2899 | for (EMACS_INT size = XFIXNAT (length); 0 < size; size--) |
| 2900 | { | 2900 | { |
| 2901 | val = Fcons (init, val); | 2901 | val = Fcons (init, val); |
| 2902 | rarely_quit (size); | 2902 | rarely_quit (size); |
| @@ -3440,7 +3440,7 @@ each initialized to INIT. */) | |||
| 3440 | (Lisp_Object type, Lisp_Object slots, Lisp_Object init) | 3440 | (Lisp_Object type, Lisp_Object slots, Lisp_Object init) |
| 3441 | { | 3441 | { |
| 3442 | CHECK_FIXNAT (slots); | 3442 | CHECK_FIXNAT (slots); |
| 3443 | EMACS_INT size = XFASTINT (slots) + 1; | 3443 | EMACS_INT size = XFIXNAT (slots) + 1; |
| 3444 | struct Lisp_Vector *p = allocate_record (size); | 3444 | struct Lisp_Vector *p = allocate_record (size); |
| 3445 | p->contents[0] = type; | 3445 | p->contents[0] = type; |
| 3446 | for (ptrdiff_t i = 1; i < size; i++) | 3446 | for (ptrdiff_t i = 1; i < size; i++) |
| @@ -3469,8 +3469,8 @@ See also the function `vector'. */) | |||
| 3469 | (Lisp_Object length, Lisp_Object init) | 3469 | (Lisp_Object length, Lisp_Object init) |
| 3470 | { | 3470 | { |
| 3471 | CHECK_FIXNAT (length); | 3471 | CHECK_FIXNAT (length); |
| 3472 | struct Lisp_Vector *p = allocate_vector (XFASTINT (length)); | 3472 | struct Lisp_Vector *p = allocate_vector (XFIXNAT (length)); |
| 3473 | for (ptrdiff_t i = 0; i < XFASTINT (length); i++) | 3473 | for (ptrdiff_t i = 0; i < XFIXNAT (length); i++) |
| 3474 | p->contents[i] = init; | 3474 | p->contents[i] = init; |
| 3475 | return make_lisp_ptr (p, Lisp_Vectorlike); | 3475 | return make_lisp_ptr (p, Lisp_Vectorlike); |
| 3476 | } | 3476 | } |
| @@ -3899,7 +3899,7 @@ make_event_array (ptrdiff_t nargs, Lisp_Object *args) | |||
| 3899 | are characters that are in 0...127, | 3899 | are characters that are in 0...127, |
| 3900 | after discarding the meta bit and all the bits above it. */ | 3900 | after discarding the meta bit and all the bits above it. */ |
| 3901 | if (!FIXNUMP (args[i]) | 3901 | if (!FIXNUMP (args[i]) |
| 3902 | || (XINT (args[i]) & ~(-CHAR_META)) >= 0200) | 3902 | || (XFIXNUM (args[i]) & ~(-CHAR_META)) >= 0200) |
| 3903 | return Fvector (nargs, args); | 3903 | return Fvector (nargs, args); |
| 3904 | 3904 | ||
| 3905 | /* Since the loop exited, we know that all the things in it are | 3905 | /* Since the loop exited, we know that all the things in it are |
| @@ -3910,9 +3910,9 @@ make_event_array (ptrdiff_t nargs, Lisp_Object *args) | |||
| 3910 | result = Fmake_string (make_fixnum (nargs), make_fixnum (0), Qnil); | 3910 | result = Fmake_string (make_fixnum (nargs), make_fixnum (0), Qnil); |
| 3911 | for (i = 0; i < nargs; i++) | 3911 | for (i = 0; i < nargs; i++) |
| 3912 | { | 3912 | { |
| 3913 | SSET (result, i, XINT (args[i])); | 3913 | SSET (result, i, XFIXNUM (args[i])); |
| 3914 | /* Move the meta bit to the right place for a string char. */ | 3914 | /* Move the meta bit to the right place for a string char. */ |
| 3915 | if (XINT (args[i]) & CHAR_META) | 3915 | if (XFIXNUM (args[i]) & CHAR_META) |
| 3916 | SSET (result, i, SREF (result, i) | 0x80); | 3916 | SSET (result, i, SREF (result, i) | 0x80); |
| 3917 | } | 3917 | } |
| 3918 | 3918 | ||