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/character.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/character.c')
| -rw-r--r-- | src/character.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/character.c b/src/character.c index f9b32e7a5b2..97698d77890 100644 --- a/src/character.c +++ b/src/character.c | |||
| @@ -206,7 +206,7 @@ translate_char (Lisp_Object table, int c) | |||
| 206 | 206 | ||
| 207 | ch = CHAR_TABLE_REF (table, c); | 207 | ch = CHAR_TABLE_REF (table, c); |
| 208 | if (CHARACTERP (ch)) | 208 | if (CHARACTERP (ch)) |
| 209 | c = XINT (ch); | 209 | c = XFIXNUM (ch); |
| 210 | } | 210 | } |
| 211 | else | 211 | else |
| 212 | { | 212 | { |
| @@ -244,7 +244,7 @@ DEFUN ("unibyte-char-to-multibyte", Funibyte_char_to_multibyte, | |||
| 244 | int c; | 244 | int c; |
| 245 | 245 | ||
| 246 | CHECK_CHARACTER (ch); | 246 | CHECK_CHARACTER (ch); |
| 247 | c = XFASTINT (ch); | 247 | c = XFIXNAT (ch); |
| 248 | if (c >= 0x100) | 248 | if (c >= 0x100) |
| 249 | error ("Not a unibyte character: %d", c); | 249 | error ("Not a unibyte character: %d", c); |
| 250 | MAKE_CHAR_MULTIBYTE (c); | 250 | MAKE_CHAR_MULTIBYTE (c); |
| @@ -260,7 +260,7 @@ If the multibyte character does not represent a byte, return -1. */) | |||
| 260 | int cm; | 260 | int cm; |
| 261 | 261 | ||
| 262 | CHECK_CHARACTER (ch); | 262 | CHECK_CHARACTER (ch); |
| 263 | cm = XFASTINT (ch); | 263 | cm = XFIXNAT (ch); |
| 264 | if (cm < 256) | 264 | if (cm < 256) |
| 265 | /* Can't distinguish a byte read from a unibyte buffer from | 265 | /* Can't distinguish a byte read from a unibyte buffer from |
| 266 | a latin1 char, so let's let it slide. */ | 266 | a latin1 char, so let's let it slide. */ |
| @@ -291,7 +291,7 @@ char_width (int c, struct Lisp_Char_Table *dp) | |||
| 291 | ch = AREF (disp, i); | 291 | ch = AREF (disp, i); |
| 292 | if (CHARACTERP (ch)) | 292 | if (CHARACTERP (ch)) |
| 293 | { | 293 | { |
| 294 | int w = CHARACTER_WIDTH (XFASTINT (ch)); | 294 | int w = CHARACTER_WIDTH (XFIXNAT (ch)); |
| 295 | if (INT_ADD_WRAPV (width, w, &width)) | 295 | if (INT_ADD_WRAPV (width, w, &width)) |
| 296 | string_overflow (); | 296 | string_overflow (); |
| 297 | } | 297 | } |
| @@ -312,7 +312,7 @@ usage: (char-width CHAR) */) | |||
| 312 | ptrdiff_t width; | 312 | ptrdiff_t width; |
| 313 | 313 | ||
| 314 | CHECK_CHARACTER (ch); | 314 | CHECK_CHARACTER (ch); |
| 315 | c = XINT (ch); | 315 | c = XFIXNUM (ch); |
| 316 | width = char_width (c, buffer_display_table ()); | 316 | width = char_width (c, buffer_display_table ()); |
| 317 | return make_fixnum (width); | 317 | return make_fixnum (width); |
| 318 | } | 318 | } |
| @@ -855,7 +855,7 @@ usage: (string &rest CHARACTERS) */) | |||
| 855 | for (i = 0; i < n; i++) | 855 | for (i = 0; i < n; i++) |
| 856 | { | 856 | { |
| 857 | CHECK_CHARACTER (args[i]); | 857 | CHECK_CHARACTER (args[i]); |
| 858 | c = XINT (args[i]); | 858 | c = XFIXNUM (args[i]); |
| 859 | p += CHAR_STRING (c, p); | 859 | p += CHAR_STRING (c, p); |
| 860 | } | 860 | } |
| 861 | 861 | ||
| @@ -878,7 +878,7 @@ usage: (unibyte-string &rest BYTES) */) | |||
| 878 | for (i = 0; i < n; i++) | 878 | for (i = 0; i < n; i++) |
| 879 | { | 879 | { |
| 880 | CHECK_RANGED_INTEGER (args[i], 0, 255); | 880 | CHECK_RANGED_INTEGER (args[i], 0, 255); |
| 881 | *p++ = XINT (args[i]); | 881 | *p++ = XFIXNUM (args[i]); |
| 882 | } | 882 | } |
| 883 | 883 | ||
| 884 | str = make_string_from_bytes ((char *) buf, n, p - buf); | 884 | str = make_string_from_bytes ((char *) buf, n, p - buf); |
| @@ -897,7 +897,7 @@ usage: (char-resolve-modifiers CHAR) */) | |||
| 897 | EMACS_INT c; | 897 | EMACS_INT c; |
| 898 | 898 | ||
| 899 | CHECK_FIXNUM (character); | 899 | CHECK_FIXNUM (character); |
| 900 | c = XINT (character); | 900 | c = XFIXNUM (character); |
| 901 | return make_fixnum (char_resolve_modifier_mask (c)); | 901 | return make_fixnum (char_resolve_modifier_mask (c)); |
| 902 | } | 902 | } |
| 903 | 903 | ||
| @@ -926,9 +926,9 @@ character is not ASCII nor 8-bit character, an error is signaled. */) | |||
| 926 | else | 926 | else |
| 927 | { | 927 | { |
| 928 | CHECK_FIXNUM_COERCE_MARKER (position); | 928 | CHECK_FIXNUM_COERCE_MARKER (position); |
| 929 | if (XINT (position) < BEGV || XINT (position) >= ZV) | 929 | if (XFIXNUM (position) < BEGV || XFIXNUM (position) >= ZV) |
| 930 | args_out_of_range_3 (position, make_fixnum (BEGV), make_fixnum (ZV)); | 930 | args_out_of_range_3 (position, make_fixnum (BEGV), make_fixnum (ZV)); |
| 931 | pos = XFASTINT (position); | 931 | pos = XFIXNAT (position); |
| 932 | p = CHAR_POS_ADDR (pos); | 932 | p = CHAR_POS_ADDR (pos); |
| 933 | } | 933 | } |
| 934 | if (NILP (BVAR (current_buffer, enable_multibyte_characters))) | 934 | if (NILP (BVAR (current_buffer, enable_multibyte_characters))) |
| @@ -944,9 +944,9 @@ character is not ASCII nor 8-bit character, an error is signaled. */) | |||
| 944 | else | 944 | else |
| 945 | { | 945 | { |
| 946 | CHECK_FIXNAT (position); | 946 | CHECK_FIXNAT (position); |
| 947 | if (XINT (position) >= SCHARS (string)) | 947 | if (XFIXNUM (position) >= SCHARS (string)) |
| 948 | args_out_of_range (string, position); | 948 | args_out_of_range (string, position); |
| 949 | pos = XFASTINT (position); | 949 | pos = XFIXNAT (position); |
| 950 | p = SDATA (string) + string_char_to_byte (string, pos); | 950 | p = SDATA (string) + string_char_to_byte (string, pos); |
| 951 | } | 951 | } |
| 952 | if (! STRING_MULTIBYTE (string)) | 952 | if (! STRING_MULTIBYTE (string)) |
| @@ -967,7 +967,7 @@ alphabeticp (int c) | |||
| 967 | Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); | 967 | Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); |
| 968 | if (! FIXNUMP (category)) | 968 | if (! FIXNUMP (category)) |
| 969 | return false; | 969 | return false; |
| 970 | EMACS_INT gen_cat = XINT (category); | 970 | EMACS_INT gen_cat = XFIXNUM (category); |
| 971 | 971 | ||
| 972 | /* See UTS #18. There are additional characters that should be | 972 | /* See UTS #18. There are additional characters that should be |
| 973 | here, those designated as Other_uppercase, Other_lowercase, | 973 | here, those designated as Other_uppercase, Other_lowercase, |
| @@ -990,7 +990,7 @@ alphanumericp (int c) | |||
| 990 | Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); | 990 | Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); |
| 991 | if (! FIXNUMP (category)) | 991 | if (! FIXNUMP (category)) |
| 992 | return false; | 992 | return false; |
| 993 | EMACS_INT gen_cat = XINT (category); | 993 | EMACS_INT gen_cat = XFIXNUM (category); |
| 994 | 994 | ||
| 995 | /* See UTS #18. Same comment as for alphabeticp applies. FIXME. */ | 995 | /* See UTS #18. Same comment as for alphabeticp applies. FIXME. */ |
| 996 | return (gen_cat == UNICODE_CATEGORY_Lu | 996 | return (gen_cat == UNICODE_CATEGORY_Lu |
| @@ -1012,7 +1012,7 @@ graphicp (int c) | |||
| 1012 | Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); | 1012 | Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); |
| 1013 | if (! FIXNUMP (category)) | 1013 | if (! FIXNUMP (category)) |
| 1014 | return false; | 1014 | return false; |
| 1015 | EMACS_INT gen_cat = XINT (category); | 1015 | EMACS_INT gen_cat = XFIXNUM (category); |
| 1016 | 1016 | ||
| 1017 | /* See UTS #18. */ | 1017 | /* See UTS #18. */ |
| 1018 | return (!(gen_cat == UNICODE_CATEGORY_Zs /* space separator */ | 1018 | return (!(gen_cat == UNICODE_CATEGORY_Zs /* space separator */ |
| @@ -1030,7 +1030,7 @@ printablep (int c) | |||
| 1030 | Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); | 1030 | Lisp_Object category = CHAR_TABLE_REF (Vunicode_category_table, c); |
| 1031 | if (! FIXNUMP (category)) | 1031 | if (! FIXNUMP (category)) |
| 1032 | return false; | 1032 | return false; |
| 1033 | EMACS_INT gen_cat = XINT (category); | 1033 | EMACS_INT gen_cat = XFIXNUM (category); |
| 1034 | 1034 | ||
| 1035 | /* See UTS #18. */ | 1035 | /* See UTS #18. */ |
| 1036 | return (!(gen_cat == UNICODE_CATEGORY_Cc /* control */ | 1036 | return (!(gen_cat == UNICODE_CATEGORY_Cc /* control */ |
| @@ -1047,7 +1047,7 @@ blankp (int c) | |||
| 1047 | if (! FIXNUMP (category)) | 1047 | if (! FIXNUMP (category)) |
| 1048 | return false; | 1048 | return false; |
| 1049 | 1049 | ||
| 1050 | return XINT (category) == UNICODE_CATEGORY_Zs; /* separator, space */ | 1050 | return XFIXNUM (category) == UNICODE_CATEGORY_Zs; /* separator, space */ |
| 1051 | } | 1051 | } |
| 1052 | 1052 | ||
| 1053 | 1053 | ||