diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-26 19:24:25 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-26 19:24:46 -0700 |
| commit | bc9cc21d34ae71dc38bd20f224c4b3ac073bcb50 (patch) | |
| tree | 259f54589caf61669955e0708b6800101db465b2 /src/bytecode.c | |
| parent | efb1883244f551cfb43fa9d85e3df8cc334fb232 (diff) | |
| download | emacs-bc9cc21d34ae71dc38bd20f224c4b3ac073bcb50.tar.gz | |
func-arity minor improvements
* src/bytecode.c (get_byte_code_arity): Omit unnecessary
runtime test for integer argument, unless debugging.
Use EMACS_INT for Emacs integers.
* src/eval.c (Ffunc_arity): Omit unused locals.
Avoid side effects in ‘if’ expr.
(lambda_arity): Use bool for boolean, and EMACS_INT for Emacs ints.
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 4ff15d2912a..fb9f617b514 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -1991,18 +1991,14 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth, Lisp_Object get_byte_code_arity (Lisp_Object args_template) { - if (INTEGERP (args_template)) - { - ptrdiff_t at = XINT (args_template); - bool rest = (at & 128) != 0; - int mandatory = at & 127; - ptrdiff_t nonrest = at >> 8; - - return Fcons (make_number (mandatory), - rest ? Qmany : make_number (nonrest)); - } - else - error ("Unknown args template!"); + eassert (NATNUMP (args_template)); + EMACS_INT at = XINT (args_template); + bool rest = (at & 128) != 0; + int mandatory = at & 127; + EMACS_INT nonrest = at >> 8; + + return Fcons (make_number (mandatory), + rest ? Qmany : make_number (nonrest)); } void |