From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lee Duhem Newsgroups: gmane.emacs.devel Subject: [PATCH] src/eval.c (Fapply): Remove unnecessary goto Date: Tue, 25 Nov 2014 11:21:00 +0800 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1416885687 374 80.91.229.3 (25 Nov 2014 03:21:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 25 Nov 2014 03:21:27 +0000 (UTC) To: Emacs Devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 25 04:21:17 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xt6gm-0005hn-Vf for ged-emacs-devel@m.gmane.org; Tue, 25 Nov 2014 04:21:17 +0100 Original-Received: from localhost ([::1]:55306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xt6gl-0006Da-Og for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2014 22:21:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xt6gd-0006DU-RJ for emacs-devel@gnu.org; Mon, 24 Nov 2014 22:21:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xt6gW-0000lE-Sq for emacs-devel@gnu.org; Mon, 24 Nov 2014 22:21:07 -0500 Original-Received: from mail-qa0-x22e.google.com ([2607:f8b0:400d:c00::22e]:41915) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xt6gW-0000l9-Nt for emacs-devel@gnu.org; Mon, 24 Nov 2014 22:21:00 -0500 Original-Received: by mail-qa0-f46.google.com with SMTP id u7so7285835qaz.19 for ; Mon, 24 Nov 2014 19:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=5WnadIXlSlom/mp559tEsk+fkjwiz1tkfGb76oQU8jg=; b=ZsJ/7Q6YFRYoDiZ1tdvbQf5FSUOtSFgUd1FOxFWnBctwcMV8Z03vDGCWZs/DoG6qRU fCMGofIYFapHlNSm5WhUz7WbyomAEyNEFKo0JiOLqsQIIA6w5XZNDUcSlJx9nccMCxN6 lR1tQ/7wPjlbD3rCAgFfOOjVY7NSdlDtbJ8YS3vWVNHw7cfcq2LJCdS+hsxD40Wf/ovN gY3Z6kXTvSeJv7TGy6IjcpxxfmAbx1xlUuNQreRGuv254T1NL4admwCEhFbW4WZJrw5A o9qC5OjAoaPslr3i2Qt6qAAfLygXFF+iTioN371t4tHoUcjk1SIxggz/NtPJo0kGQx0a FVWA== X-Received: by 10.224.120.67 with SMTP id c3mr34249882qar.3.1416885660359; Mon, 24 Nov 2014 19:21:00 -0800 (PST) Original-Received: by 10.140.37.37 with HTTP; Mon, 24 Nov 2014 19:21:00 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::22e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178216 Archived-At: --- src/ChangeLog | 4 ++++ src/eval.c | 12 ++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 448de36..663ca9e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-25 Lee Duhem + + * eval.c (Fapply): Remove unnecessary goto. + 2014-11-24 Lars Magne Ingebrigtsen * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings. diff --git a/src/eval.c b/src/eval.c index 77b1db9..45e5389 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2298,19 +2298,15 @@ usage: (apply FUNCTION &rest ARGUMENTS) */) if (SYMBOLP (fun) && !NILP (fun) && (fun = XSYMBOL (fun)->function, SYMBOLP (fun))) fun = indirect_function (fun); + if (NILP (fun)) { /* Let funcall get the error. */ fun = args[0]; - goto funcall; } - - if (SUBRP (fun)) + else if (SUBRP (fun)) { - if (numargs < XSUBR (fun)->min_args - || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs)) - goto funcall; /* Let funcall get the error. */ - else if (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args > numargs) + if (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args > numargs) { /* Avoid making funcall cons up a yet another new vector of arguments by explicitly supplying nil's for optional values. */ @@ -2320,7 +2316,7 @@ usage: (apply FUNCTION &rest ARGUMENTS) */) funcall_nargs = 1 + XSUBR (fun)->max_args; } } - funcall: + /* We add 1 to numargs because funcall_args includes the function itself as well as its arguments. */ if (!funcall_args) -- 1.9.3