--- Begin Message ---
|
Subject: |
[PATCH] Refactor common code in {upcase, downcase, capitalize}-word functions |
|
Date: |
Fri, 9 Sep 2016 23:59:19 +0200 |
* src/casefiddle.c (operate_on_word): Removed in favour of…
(casify_word) …new function which does what operate_on_word did plus
what all of the common code from *-word functions.
(upcase-word, downcase-word, capitalize-word): Move code common between
those functions (pretty much the whole body of those functions) into
casify_word and use that instead of now deleted operato_on_word.
---
src/casefiddle.c | 44 +++++++++++++++++---------------------------
1 file changed, 17 insertions(+), 27 deletions(-)
Unless there are any comments, I’m goning to push this in a few days.
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 6114a6f..6c64d67 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -376,22 +376,27 @@ character positions to operate on. */)
}
static Lisp_Object
-operate_on_word (Lisp_Object arg, ptrdiff_t *newpoint)
+casify_word (enum case_action flag, Lisp_Object arg)
{
- Lisp_Object val;
- ptrdiff_t farend;
+ Lisp_Object beg, end;
+ ptrdiff_t newpoint;
EMACS_INT iarg;
CHECK_NUMBER (arg);
iarg = XINT (arg);
- farend = scan_words (PT, iarg);
- if (!farend)
- farend = iarg > 0 ? ZV : BEGV;
- *newpoint = PT > farend ? PT : farend;
- XSETFASTINT (val, farend);
+ newpoint = scan_words (PT, iarg);
+ if (!newpoint)
+ newpoint = iarg > 0 ? ZV : BEGV;
+
+ XSETFASTINT (beg, PT);
+ XSETFASTINT (end, newpoint);
+ if (PT > newpoint)
+ newpoint = PT;
+
+ casify_region (flag, beg, end);
- return val;
+ SET_PT (newpoint);
}
DEFUN ("upcase-word", Fupcase_word, Supcase_word, 1, 1, "p",
@@ -404,12 +409,7 @@ With negative argument, convert previous words but do not
move.
See also `capitalize-word'. */)
(Lisp_Object arg)
{
- Lisp_Object beg, end;
- ptrdiff_t newpoint;
- XSETFASTINT (beg, PT);
- end = operate_on_word (arg, &newpoint);
- casify_region (CASE_UP, beg, end);
- SET_PT (newpoint);
+ casify_word (CASE_UP, arg);
return Qnil;
}
@@ -422,12 +422,7 @@ is ignored when moving forward.
With negative argument, convert previous words but do not move. */)
(Lisp_Object arg)
{
- Lisp_Object beg, end;
- ptrdiff_t newpoint;
- XSETFASTINT (beg, PT);
- end = operate_on_word (arg, &newpoint);
- casify_region (CASE_DOWN, beg, end);
- SET_PT (newpoint);
+ casify_word (CASE_DOWN, arg);
return Qnil;
}
@@ -443,12 +438,7 @@ is ignored when moving forward.
With negative argument, capitalize previous words but do not move. */)
(Lisp_Object arg)
{
- Lisp_Object beg, end;
- ptrdiff_t newpoint;
- XSETFASTINT (beg, PT);
- end = operate_on_word (arg, &newpoint);
- casify_region (CASE_CAPITALIZE, beg, end);
- SET_PT (newpoint);
+ casify_word (CASE_CAPITALIZE, arg);
return Qnil;
}
--
2.8.0.rc3.226.g39d4020
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: bug#24398: [PATCH] Refactor common code in {upcase, downcase, capitalize}-word functions |
|
Date: |
Mon, 12 Sep 2016 13:26:16 +0200 |
|
User-agent: |
Notmuch/0.19+53~g2e63a09 (http://notmuchmail.org) Emacs/25.1.50.106 (x86_64-unknown-linux-gnu) |
On Sat, Sep 10 2016, Eli Zaretskii wrote:
>> From: Michal Nazarewicz <address@hidden>
>> Date: Fri, 9 Sep 2016 23:59:19 +0200
>>
>> * src/casefiddle.c (operate_on_word): Removed in favour of…
>> (casify_word) …new function which does what operate_on_word did plus
>> what all of the common code from *-word functions.
>> (upcase-word, downcase-word, capitalize-word): Move code common between
>> those functions (pretty much the whole body of those functions) into
>> casify_word and use that instead of now deleted operato_on_word.
> ^^^^^^^^^^^^^^^
> A typo.
Fixed and pushed.
> Thanks.
--
Best regards
ミハウ “𝓶𝓲𝓷𝓪86” ナザレヴイツ
«If at first you don’t succeed, give up skydiving»
--- End Message ---