From bc9cc21d34ae71dc38bd20f224c4b3ac073bcb50 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Sat, 26 Mar 2016 19:24:25 -0700
Subject: 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.
---
 src/bytecode.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/bytecode.c')

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
-- 
cgit v1.2.1