From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] ash, lsh: Avoid code duplication Date: Tue, 22 Nov 2016 11:17:24 +0900 Message-ID: <87k2bwp8az.fsf@gmail.com> References: <87inrg99in.fsf@gmail.com> <83k2bw9673.fsf@gnu.org> <87d1ho953w.fsf@gmail.com> <83bmx892lx.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1479781089 25236 195.159.176.226 (22 Nov 2016 02:18:09 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 22 Nov 2016 02:18:09 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: Tino Calancha , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 22 03:18:05 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c90er-0006Ge-5e for ged-emacs-devel@m.gmane.org; Tue, 22 Nov 2016 03:18:05 +0100 Original-Received: from localhost ([::1]:52867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c90eu-0006VN-OY for ged-emacs-devel@m.gmane.org; Mon, 21 Nov 2016 21:18:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c90eL-0006Ux-Pf for emacs-devel@gnu.org; Mon, 21 Nov 2016 21:17:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c90eI-0001VJ-KW for emacs-devel@gnu.org; Mon, 21 Nov 2016 21:17:33 -0500 Original-Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:36620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c90eI-0001UP-CD; Mon, 21 Nov 2016 21:17:30 -0500 Original-Received: by mail-pf0-x244.google.com with SMTP id c4so287693pfb.3; Mon, 21 Nov 2016 18:17:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:references:cc:date:in-reply-to:message-id :user-agent:mime-version; bh=Taod2LDt7ZVFt+Ief6AN6Xrt7i9GIaRzQ6lAQZ4iNlQ=; b=WIRhbBBrUT3CrRmsD7pHBG0sVif3SI/G5BPN7caxmyppitX47Z0JEjDRcsK5ttDDs+ p/KTgygT6SElzRK2pXWMtj+Fah1p4u6wtIIEcAzL/DyUTmeKt8sys9xuexTUAl+bk7wB yQeVsPhPbaVStG8pnRk70Bp5dgpG3APej045+hR53+navDxNmUxEIKzjE+tUI/tmjx30 xQPatqmVwVCQVLNWFw+AT/NpcZkecrkxkIyc6tPkXnUewosWuf5d6xbFkpzPc2x3JXyY GZ5AXD8OZMb/eE6rZSIW9/tq5dm5vW5Dl9+Jd1QqrcBU5/2tSdUcIB0JFzBn5hdkswdV gcFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:references:cc:date:in-reply-to :message-id:user-agent:mime-version; bh=Taod2LDt7ZVFt+Ief6AN6Xrt7i9GIaRzQ6lAQZ4iNlQ=; b=TiCsfjRuLvnhAo/Ut23ZtvhfeTBmdHhZ6LcZO5o/vbLWg18iHT8NJikekVJuSaroYa haVLKUVHI8MFcIFmwmI4Eoh5qUWKLoWwwV8vX+Uw0jHe0mmML2XBlBunW7H0DME8Cpmm knjqD3TG+rA7CfIcnK71gZf8wLsTEnR30riWzCgRhcokhN5msZQJufPy9OObJo+9tFgl I9Qc38vGzTIYwg4WMUCUBerZ4KcTXfod6VqJwtflY7+vTLlC8z+f83z5ssKZpdfVLvD1 fp+EO4Hut2NxWswalKkL40PiKhQC5INBT+Ipz5nRZHqGdznHqlVt+NHWvQ4SceF7ZKbk NcAA== X-Gm-Message-State: AKaTC00Q6HpoTJ6qoqlNfvC+u143HKNr2/ujxXcbvYIXu2dYwKYqa2Wze/tMIqe163fOQg== X-Received: by 10.99.170.5 with SMTP id e5mr23941451pgf.46.1479781048773; Mon, 21 Nov 2016 18:17:28 -0800 (PST) Original-Received: from calancha-pc (57.92.100.220.dy.bbexcite.jp. [220.100.92.57]) by smtp.gmail.com with ESMTPSA id a68sm22324006pgc.31.2016.11.21.18.17.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Nov 2016 18:17:28 -0800 (PST) In-Reply-To: <83bmx892lx.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 21 Nov 2016 19:14:50 +0200") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::244 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:209535 Archived-At: Eli Zaretskii writes: >> +Lisp_Object >> +ash_lsh_impl (register Lisp_Object value, Lisp_Object count, bool lsh) > > static Lisp_Object > ash_lsh_impl (register Lisp_Object value, Lisp_Object count, bool lsh) > >> diff --git a/src/lisp.h b/src/lisp.h >> index e087828..c48c2c8 100644 >> --- a/src/lisp.h >> +++ b/src/lisp.h >> @@ -602,6 +602,7 @@ extern void char_table_set (Lisp_Object, int, Lisp_Object); >> /* Defined in data.c. */ >> extern _Noreturn Lisp_Object wrong_type_argument (Lisp_Object, Lisp_Object); >> extern _Noreturn void wrong_choice (Lisp_Object, Lisp_Object); >> +Lisp_Object ash_lsh_impl (Lisp_Object, Lisp_Object, bool); > > No need to declare it here, as it is a static function used only in > the file in which it is defined. Thank you very much. Here is the updated patch: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; >From 5b21b3ab846203c329710685433f16a78f1699f3 Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Tue, 22 Nov 2016 11:12:51 +0900 Subject: [PATCH] ash, lsh avoid code duplication * src/data.c (ash_lsh_impl): New function. (ash, lsh): Use it. --- src/data.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/data.c b/src/data.c index d221db4..61b5da8 100644 --- a/src/data.c +++ b/src/data.c @@ -2924,11 +2924,8 @@ usage: (logxor &rest INTS-OR-MARKERS) */) return arith_driver (Alogxor, nargs, args); } -DEFUN ("ash", Fash, Sash, 2, 2, 0, - doc: /* Return VALUE with its bits shifted left by COUNT. -If COUNT is negative, shifting is actually to the right. -In this case, the sign bit is duplicated. */) - (register Lisp_Object value, Lisp_Object count) +static Lisp_Object +ash_lsh_impl (register Lisp_Object value, Lisp_Object count, bool lsh) { register Lisp_Object val; @@ -2940,32 +2937,29 @@ In this case, the sign bit is duplicated. */) else if (XINT (count) > 0) XSETINT (val, XUINT (value) << XFASTINT (count)); else if (XINT (count) <= -EMACS_INT_WIDTH) - XSETINT (val, XINT (value) < 0 ? -1 : 0); + XSETINT (val, lsh ? 0 : XINT (value) < 0 ? -1 : 0); else - XSETINT (val, XINT (value) >> -XINT (count)); + XSETINT (val, lsh ? XUINT (value) >> -XINT (count) : \ + XINT (value) >> -XINT (count)); return val; } +DEFUN ("ash", Fash, Sash, 2, 2, 0, + doc: /* Return VALUE with its bits shifted left by COUNT. +If COUNT is negative, shifting is actually to the right. +In this case, the sign bit is duplicated. */) + (register Lisp_Object value, Lisp_Object count) +{ + return ash_lsh_impl (value, count, false); +} + DEFUN ("lsh", Flsh, Slsh, 2, 2, 0, doc: /* Return VALUE with its bits shifted left by COUNT. If COUNT is negative, shifting is actually to the right. In this case, zeros are shifted in on the left. */) (register Lisp_Object value, Lisp_Object count) { - register Lisp_Object val; - - CHECK_NUMBER (value); - CHECK_NUMBER (count); - - if (XINT (count) >= EMACS_INT_WIDTH) - XSETINT (val, 0); - else if (XINT (count) > 0) - XSETINT (val, XUINT (value) << XFASTINT (count)); - else if (XINT (count) <= -EMACS_INT_WIDTH) - XSETINT (val, 0); - else - XSETINT (val, XUINT (value) >> -XINT (count)); - return val; + return ash_lsh_impl (value, count, true); } DEFUN ("1+", Fadd1, Sadd1, 1, 1, 0, -- 2.10.2 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.3) of 2016-11-22 built on calancha-pc Repository revision: f9946cab7e30a7e01806c4d6273a9251a4504c16