diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-03-26 16:12:21 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-03-26 16:13:28 -0700 |
| commit | 57f5a63d85f6c3ea1d8b428b12a8db743de3b0bc (patch) | |
| tree | a13f3efe7f443b1235c9ad2ed987586b0bc394ed /src/lisp.h | |
| parent | d28b00476890f791a89b65007e5f20682b3eaa0d (diff) | |
| download | emacs-57f5a63d85f6c3ea1d8b428b12a8db743de3b0bc.tar.gz | |
Refactor and fix typo in CHECK_*_COERCE_MARKER
* src/data.c (check_integer_coerce_marker)
(check_number_coerce_marker): New functions.
Also, fix a typo in the former, by having it use
Qinteger_or_marker_p not Qnumber_or_marker_p.
(arithcompare, floatop_arith_driver, bignum_arith_driver)
(arith_driver, Fplus, Fminus, Ftimes, Fquo, Frem, Fmod)
(minmax_driver, Flogand, Flogior, Flogxor, Fadd1, Fsub1):
Use them in place of the similarly-named macros.
* src/lisp.h (CHECK_NUMBER_COERCE_MARKER)
(CHECK_INTEGER_COERCE_MARKER): Remove; no longer used.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/lisp.h b/src/lisp.h index cd6282390f7..49923be702a 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3039,22 +3039,6 @@ CHECK_INTEGER (Lisp_Object x) { CHECK_TYPE (INTEGERP (x), Qnumberp, x); } - -#define CHECK_NUMBER_COERCE_MARKER(x) \ - do { \ - if (MARKERP (x)) \ - XSETFASTINT (x, marker_position (x)); \ - else \ - CHECK_TYPE (NUMBERP (x), Qnumber_or_marker_p, x); \ - } while (false) - -#define CHECK_INTEGER_COERCE_MARKER(x) \ - do { \ - if (MARKERP (x)) \ - XSETFASTINT (x, marker_position (x)); \ - else \ - CHECK_TYPE (INTEGERP (x), Qnumber_or_marker_p, x); \ - } while (false) /* If we're not dumping using the legacy dumper and we might be using |