aboutsummaryrefslogtreecommitdiffstats
path: root/src/search.c
diff options
context:
space:
mode:
authorTom Tromey2018-08-07 18:08:53 -0600
committerTom Tromey2018-08-07 18:08:53 -0600
commitd1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8 (patch)
tree04c920acf142f686d3cac11080b17a2fb0dfc9af /src/search.c
parent68ebff23f7057090da260830500cb278f7b886a5 (diff)
downloademacs-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/search.c')
-rw-r--r--src/search.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/search.c b/src/search.c
index 72374c8b9b4..5385c890f98 100644
--- a/src/search.c
+++ b/src/search.c
@@ -402,7 +402,7 @@ string_match_1 (Lisp_Object regexp, Lisp_Object string, Lisp_Object start,
402 ptrdiff_t len = SCHARS (string); 402 ptrdiff_t len = SCHARS (string);
403 403
404 CHECK_FIXNUM (start); 404 CHECK_FIXNUM (start);
405 pos = XINT (start); 405 pos = XFIXNUM (start);
406 if (pos < 0 && -pos <= len) 406 if (pos < 0 && -pos <= len)
407 pos = len + pos; 407 pos = len + pos;
408 else if (0 > pos || pos > len) 408 else if (0 > pos || pos > len)
@@ -1037,7 +1037,7 @@ search_command (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror,
1037 if (!NILP (count)) 1037 if (!NILP (count))
1038 { 1038 {
1039 CHECK_FIXNUM (count); 1039 CHECK_FIXNUM (count);
1040 n *= XINT (count); 1040 n *= XFIXNUM (count);
1041 } 1041 }
1042 1042
1043 CHECK_STRING (string); 1043 CHECK_STRING (string);
@@ -1051,7 +1051,7 @@ search_command (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror,
1051 else 1051 else
1052 { 1052 {
1053 CHECK_FIXNUM_COERCE_MARKER (bound); 1053 CHECK_FIXNUM_COERCE_MARKER (bound);
1054 lim = XINT (bound); 1054 lim = XFIXNUM (bound);
1055 if (n > 0 ? lim < PT : lim > PT) 1055 if (n > 0 ? lim < PT : lim > PT)
1056 error ("Invalid search bound (wrong side of point)"); 1056 error ("Invalid search bound (wrong side of point)");
1057 if (lim > ZV) 1057 if (lim > ZV)
@@ -1153,7 +1153,7 @@ do \
1153 Lisp_Object temp; \ 1153 Lisp_Object temp; \
1154 temp = Faref (trt, make_fixnum (d)); \ 1154 temp = Faref (trt, make_fixnum (d)); \
1155 if (FIXNUMP (temp)) \ 1155 if (FIXNUMP (temp)) \
1156 out = XINT (temp); \ 1156 out = XFIXNUM (temp); \
1157 else \ 1157 else \
1158 out = d; \ 1158 out = d; \
1159 } \ 1159 } \
@@ -2421,9 +2421,9 @@ since only regular expressions have distinguished subexpressions. */)
2421 else 2421 else
2422 { 2422 {
2423 CHECK_FIXNUM (subexp); 2423 CHECK_FIXNUM (subexp);
2424 if (! (0 <= XINT (subexp) && XINT (subexp) < search_regs.num_regs)) 2424 if (! (0 <= XFIXNUM (subexp) && XFIXNUM (subexp) < search_regs.num_regs))
2425 args_out_of_range (subexp, make_fixnum (search_regs.num_regs)); 2425 args_out_of_range (subexp, make_fixnum (search_regs.num_regs));
2426 sub = XINT (subexp); 2426 sub = XFIXNUM (subexp);
2427 } 2427 }
2428 2428
2429 if (NILP (string)) 2429 if (NILP (string))
@@ -2810,7 +2810,7 @@ match_limit (Lisp_Object num, bool beginningp)
2810 EMACS_INT n; 2810 EMACS_INT n;
2811 2811
2812 CHECK_FIXNUM (num); 2812 CHECK_FIXNUM (num);
2813 n = XINT (num); 2813 n = XFIXNUM (num);
2814 if (n < 0) 2814 if (n < 0)
2815 args_out_of_range (num, make_fixnum (0)); 2815 args_out_of_range (num, make_fixnum (0));
2816 if (search_regs.num_regs <= 0) 2816 if (search_regs.num_regs <= 0)
@@ -2989,7 +2989,7 @@ If optional arg RESEAT is non-nil, make markers on LIST point nowhere. */)
2989 2989
2990 /* Allocate registers if they don't already exist. */ 2990 /* Allocate registers if they don't already exist. */
2991 { 2991 {
2992 EMACS_INT length = XFASTINT (Flength (list)) / 2; 2992 EMACS_INT length = XFIXNAT (Flength (list)) / 2;
2993 2993
2994 if (length > search_regs.num_regs) 2994 if (length > search_regs.num_regs)
2995 { 2995 {
@@ -3055,15 +3055,15 @@ If optional arg RESEAT is non-nil, make markers on LIST point nowhere. */)
3055 XSETFASTINT (marker, 0); 3055 XSETFASTINT (marker, 0);
3056 3056
3057 CHECK_FIXNUM_COERCE_MARKER (marker); 3057 CHECK_FIXNUM_COERCE_MARKER (marker);
3058 if ((XINT (from) < 0 3058 if ((XFIXNUM (from) < 0
3059 ? TYPE_MINIMUM (regoff_t) <= XINT (from) 3059 ? TYPE_MINIMUM (regoff_t) <= XFIXNUM (from)
3060 : XINT (from) <= TYPE_MAXIMUM (regoff_t)) 3060 : XFIXNUM (from) <= TYPE_MAXIMUM (regoff_t))
3061 && (XINT (marker) < 0 3061 && (XFIXNUM (marker) < 0
3062 ? TYPE_MINIMUM (regoff_t) <= XINT (marker) 3062 ? TYPE_MINIMUM (regoff_t) <= XFIXNUM (marker)
3063 : XINT (marker) <= TYPE_MAXIMUM (regoff_t))) 3063 : XFIXNUM (marker) <= TYPE_MAXIMUM (regoff_t)))
3064 { 3064 {
3065 search_regs.start[i] = XINT (from); 3065 search_regs.start[i] = XFIXNUM (from);
3066 search_regs.end[i] = XINT (marker); 3066 search_regs.end[i] = XFIXNUM (marker);
3067 } 3067 }
3068 else 3068 else
3069 { 3069 {