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/print.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/print.c')
| -rw-r--r-- | src/print.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/print.c b/src/print.c index 2b1d1fec726..998ff2dc0c6 100644 --- a/src/print.c +++ b/src/print.c | |||
| @@ -261,7 +261,7 @@ printchar_to_stream (unsigned int ch, FILE *stream) | |||
| 261 | break; | 261 | break; |
| 262 | if (! (i < n)) | 262 | if (! (i < n)) |
| 263 | break; | 263 | break; |
| 264 | ch = XFASTINT (AREF (dv, i)); | 264 | ch = XFIXNAT (AREF (dv, i)); |
| 265 | } | 265 | } |
| 266 | } | 266 | } |
| 267 | 267 | ||
| @@ -522,7 +522,7 @@ PRINTCHARFUN defaults to the value of `standard-output' (which see). */) | |||
| 522 | printcharfun = Vstandard_output; | 522 | printcharfun = Vstandard_output; |
| 523 | CHECK_FIXNUM (character); | 523 | CHECK_FIXNUM (character); |
| 524 | PRINTPREPARE; | 524 | PRINTPREPARE; |
| 525 | printchar (XINT (character), printcharfun); | 525 | printchar (XFIXNUM (character), printcharfun); |
| 526 | PRINTFINISH; | 526 | PRINTFINISH; |
| 527 | return character; | 527 | return character; |
| 528 | } | 528 | } |
| @@ -772,7 +772,7 @@ to make it write to the debugging output. */) | |||
| 772 | (Lisp_Object character) | 772 | (Lisp_Object character) |
| 773 | { | 773 | { |
| 774 | CHECK_FIXNUM (character); | 774 | CHECK_FIXNUM (character); |
| 775 | printchar_to_stream (XINT (character), stderr); | 775 | printchar_to_stream (XFIXNUM (character), stderr); |
| 776 | return character; | 776 | return character; |
| 777 | } | 777 | } |
| 778 | 778 | ||
| @@ -1408,8 +1408,8 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag, | |||
| 1408 | Negative values of print-length are invalid. Treat them | 1408 | Negative values of print-length are invalid. Treat them |
| 1409 | like a print-length of nil. */ | 1409 | like a print-length of nil. */ |
| 1410 | if (FIXNATP (Vprint_length) | 1410 | if (FIXNATP (Vprint_length) |
| 1411 | && XFASTINT (Vprint_length) < size_in_bytes) | 1411 | && XFIXNAT (Vprint_length) < size_in_bytes) |
| 1412 | size_in_bytes = XFASTINT (Vprint_length); | 1412 | size_in_bytes = XFIXNAT (Vprint_length); |
| 1413 | 1413 | ||
| 1414 | for (ptrdiff_t i = 0; i < size_in_bytes; i++) | 1414 | for (ptrdiff_t i = 0; i < size_in_bytes; i++) |
| 1415 | { | 1415 | { |
| @@ -1521,8 +1521,8 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag, | |||
| 1521 | ptrdiff_t size = real_size; | 1521 | ptrdiff_t size = real_size; |
| 1522 | 1522 | ||
| 1523 | /* Don't print more elements than the specified maximum. */ | 1523 | /* Don't print more elements than the specified maximum. */ |
| 1524 | if (FIXNATP (Vprint_length) && XFASTINT (Vprint_length) < size) | 1524 | if (FIXNATP (Vprint_length) && XFIXNAT (Vprint_length) < size) |
| 1525 | size = XFASTINT (Vprint_length); | 1525 | size = XFIXNAT (Vprint_length); |
| 1526 | 1526 | ||
| 1527 | printchar ('(', printcharfun); | 1527 | printchar ('(', printcharfun); |
| 1528 | for (ptrdiff_t i = 0; i < size; i++) | 1528 | for (ptrdiff_t i = 0; i < size; i++) |
| @@ -1652,8 +1652,8 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag, | |||
| 1652 | 1652 | ||
| 1653 | /* Don't print more elements than the specified maximum. */ | 1653 | /* Don't print more elements than the specified maximum. */ |
| 1654 | ptrdiff_t n | 1654 | ptrdiff_t n |
| 1655 | = (FIXNATP (Vprint_length) && XFASTINT (Vprint_length) < size | 1655 | = (FIXNATP (Vprint_length) && XFIXNAT (Vprint_length) < size |
| 1656 | ? XFASTINT (Vprint_length) : size); | 1656 | ? XFIXNAT (Vprint_length) : size); |
| 1657 | 1657 | ||
| 1658 | print_c_string ("#s(", printcharfun); | 1658 | print_c_string ("#s(", printcharfun); |
| 1659 | for (ptrdiff_t i = 0; i < n; i ++) | 1659 | for (ptrdiff_t i = 0; i < n; i ++) |
| @@ -1714,8 +1714,8 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag, | |||
| 1714 | 1714 | ||
| 1715 | /* Don't print more elements than the specified maximum. */ | 1715 | /* Don't print more elements than the specified maximum. */ |
| 1716 | if (FIXNATP (Vprint_length) | 1716 | if (FIXNATP (Vprint_length) |
| 1717 | && XFASTINT (Vprint_length) < size) | 1717 | && XFIXNAT (Vprint_length) < size) |
| 1718 | size = XFASTINT (Vprint_length); | 1718 | size = XFIXNAT (Vprint_length); |
| 1719 | 1719 | ||
| 1720 | for (int i = idx; i < size; i++) | 1720 | for (int i = idx; i < size; i++) |
| 1721 | { | 1721 | { |
| @@ -1807,7 +1807,7 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) | |||
| 1807 | Lisp_Object num = Fgethash (obj, Vprint_number_table, Qnil); | 1807 | Lisp_Object num = Fgethash (obj, Vprint_number_table, Qnil); |
| 1808 | if (FIXNUMP (num)) | 1808 | if (FIXNUMP (num)) |
| 1809 | { | 1809 | { |
| 1810 | EMACS_INT n = XINT (num); | 1810 | EMACS_INT n = XFIXNUM (num); |
| 1811 | if (n < 0) | 1811 | if (n < 0) |
| 1812 | { /* Add a prefix #n= if OBJ has not yet been printed; | 1812 | { /* Add a prefix #n= if OBJ has not yet been printed; |
| 1813 | that is, its status field is nil. */ | 1813 | that is, its status field is nil. */ |
| @@ -1832,7 +1832,7 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) | |||
| 1832 | { | 1832 | { |
| 1833 | case_Lisp_Int: | 1833 | case_Lisp_Int: |
| 1834 | { | 1834 | { |
| 1835 | int len = sprintf (buf, "%"pI"d", XINT (obj)); | 1835 | int len = sprintf (buf, "%"pI"d", XFIXNUM (obj)); |
| 1836 | strout (buf, len, len, printcharfun); | 1836 | strout (buf, len, len, printcharfun); |
| 1837 | } | 1837 | } |
| 1838 | break; | 1838 | break; |
| @@ -2008,7 +2008,7 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) | |||
| 2008 | case Lisp_Cons: | 2008 | case Lisp_Cons: |
| 2009 | /* If deeper than spec'd depth, print placeholder. */ | 2009 | /* If deeper than spec'd depth, print placeholder. */ |
| 2010 | if (FIXNUMP (Vprint_level) | 2010 | if (FIXNUMP (Vprint_level) |
| 2011 | && print_depth > XINT (Vprint_level)) | 2011 | && print_depth > XFIXNUM (Vprint_level)) |
| 2012 | print_c_string ("...", printcharfun); | 2012 | print_c_string ("...", printcharfun); |
| 2013 | else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj))) | 2013 | else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj))) |
| 2014 | && EQ (XCAR (obj), Qquote)) | 2014 | && EQ (XCAR (obj), Qquote)) |
| @@ -2050,7 +2050,7 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) | |||
| 2050 | /* Negative values of print-length are invalid in CL. | 2050 | /* Negative values of print-length are invalid in CL. |
| 2051 | Treat them like nil, as CMUCL does. */ | 2051 | Treat them like nil, as CMUCL does. */ |
| 2052 | printmax_t print_length = (FIXNATP (Vprint_length) | 2052 | printmax_t print_length = (FIXNATP (Vprint_length) |
| 2053 | ? XFASTINT (Vprint_length) | 2053 | ? XFIXNAT (Vprint_length) |
| 2054 | : TYPE_MAXIMUM (printmax_t)); | 2054 | : TYPE_MAXIMUM (printmax_t)); |
| 2055 | 2055 | ||
| 2056 | printmax_t i = 0; | 2056 | printmax_t i = 0; |