From: "Jun T." <takimoto-j@kba.biglobe.ne.jp>
To: zsh-workers@zsh.org
Subject: Re: Match length and multibyte characters
Date: Sat, 12 Sep 2015 03:31:16 +0900 [thread overview]
Message-ID: <2326255F-DDB4-4277-8B59-9851BA0BF797@kba.biglobe.ne.jp> (raw)
In-Reply-To: <CAC_auRfyDuJ-JoeSE9zfnhO=fy4bjOrK0rT8=97O_XeE4SKxNA@mail.gmail.com>
The following (with test) is a patch I sent to zsh-users
as a reply to users:20537.
The use of the macro MB_METASTRLEN2END means, if MULTIBYTE_SUPPORT if off,
ztrlenend(s+b,s+e) will be used instead of (e-b). I think this is better
because the string is metafied.
diff --git a/Src/glob.c b/Src/glob.c
index dea1bf5..43d135b 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -2491,17 +2491,17 @@ get_match_ret(char *s, int b, int e, int fl, char *replstr,
ll += 1 + (l - (e - b));
if (fl & SUB_BIND) {
/* position of start of matched portion */
- sprintf(buf, "%d ", b + 1);
+ sprintf(buf, "%d ", MB_METASTRLEN2END(s, 0, s+b) + 1);
ll += (bl = strlen(buf));
}
if (fl & SUB_EIND) {
/* position of end of matched portion */
- sprintf(buf + bl, "%d ", e + 1);
+ sprintf(buf + bl, "%d ", MB_METASTRLEN2END(s, 0, s+e) + 1);
ll += (bl = strlen(buf));
}
if (fl & SUB_LEN) {
/* length of matched portion */
- sprintf(buf + bl, "%d ", e - b);
+ sprintf(buf + bl, "%d ", MB_METASTRLEN2END(s+b, 0, s+e));
ll += (bl = strlen(buf));
}
if (bl)
diff --git a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst
index ace191f..5ae9b2c 100644
--- a/Test/D07multibyte.ztst
+++ b/Test/D07multibyte.ztst
@@ -293,6 +293,21 @@
>Ἐν ἀρχῇ ἦν ὁ λόγος, καὶ ὁ λόγος ἦν πρὸς τὸν θεόν, καὶ ἦν ὁ λόγος
>Ἐν ἀρχῇ ἦν ὁ λόγος, καὶ ὁ λόγος ἦν πρὸς τὸν θεόν, καὶ
+ a="1ë34ë6"
+ print ${(BEN)a#*4}
+ print ${(BEN)a##*ë}
+ print ${(BEN)a%4*}
+ print ${(BEN)a%%ë*}
+ print ${(SBEN)a#ë3}
+ print ${(SBEN)a%4ë}
+0:Flags B, E, N and S in ${...#...} and ${...%...}
+>1 5 4
+>1 6 5
+>4 7 3
+>2 7 5
+>2 4 2
+>4 6 2
+
foo=(κατέβην χθὲς εἰς Πειραιᾶ)
print ${(l.3..¥.r.3..£.)foo}
print ${(l.4..¥.r.2..£.)foo}
next parent reply other threads:[~2015-09-11 18:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAC_auRfyDuJ-JoeSE9zfnhO=fy4bjOrK0rT8=97O_XeE4SKxNA@mail.gmail.com>
2015-09-11 18:31 ` Jun T. [this message]
2015-09-11 23:08 ` Bart Schaefer
[not found] ` <FCD65B5C-D8F2-466B-AE3C-D34131252659@kba.biglobe.ne.jp>
2015-09-11 19:37 ` Jun T.
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=2326255F-DDB4-4277-8B59-9851BA0BF797@kba.biglobe.ne.jp \
--to=takimoto-j@kba.biglobe.ne.jp \
--cc=zsh-workers@zsh.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 public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).