From: Tino Calancha <tino.calancha@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Tino Calancha <tino.calancha@gmail.com>, emacs-devel@gnu.org
Subject: Re: [PATCH] ash, lsh: Avoid code duplication
Date: Tue, 22 Nov 2016 01:20:51 +0900 [thread overview]
Message-ID: <87d1ho953w.fsf@gmail.com> (raw)
In-Reply-To: <83k2bw9673.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 21 Nov 2016 17:57:20 +0200")
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Tino Calancha <tino.calancha@gmail.com>
>> Date: Mon, 21 Nov 2016 23:45:36 +0900
>> Cc: tino.calancha@gmail.com
>>
>> `ash' and `lsh' show some overlap.
>> How about following patch?
>
> With some more work (see below), and if no one objects, why not?
>
>> +Lisp_Object
>> +ash_lsh_impl (register Lisp_Object value, Lisp_Object count, int lsh)
> ^^^^^^^
> 'bool', please.
>
>> --- 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);
>> +extern Lisp_Object ash_lsh_impl (Lisp_Object, Lisp_Object, int);
>
> No need to make it extern, as no other C file uses it.
Thank you. Following is the new patch after your comments:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
From 8ca2e201efcbf93b0e7450cc1a72bb3f6c6f23d4 Mon Sep 17 00:00:00 2001
From: Tino Calancha <tino.calancha@gmail.com>
Date: Tue, 22 Nov 2016 01:09:50 +0900
Subject: [PATCH] ash, lsh avoid code duplication
* src/data.c (ash_lsh_impl): New function.
(ash, lsh): Use it.
* src/lisp.h (ash_lsh_impl): Declare it.
---
src/data.c | 36 +++++++++++++++---------------------
src/lisp.h | 1 +
2 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/src/data.c b/src/data.c
index d221db4..a34230f 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)
+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,
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);
/* Defined in emacs.c. */
#ifdef DOUG_LEA_MALLOC
--
2.10.2
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.3)
of 2016-11-21
Repository revision: 209d85fe5691a9334e14bc63b0c836880831a054
next prev parent reply other threads:[~2016-11-21 16:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-21 14:45 [PATCH] ash, lsh: Avoid code duplication Tino Calancha
2016-11-21 15:57 ` Eli Zaretskii
2016-11-21 16:20 ` Tino Calancha [this message]
2016-11-21 17:14 ` Eli Zaretskii
2016-11-22 2:17 ` Tino Calancha
2016-11-22 16:12 ` Eli Zaretskii
2016-11-22 16:16 ` Tino Calancha
2016-11-27 3:28 ` Tino Calancha
2016-11-22 16:48 ` Davis Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d1ho953w.fsf@gmail.com \
--to=tino.calancha@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.