Skip to content

Add option to pv_uni_display for better tr/// output #22930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: blead
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions utf8.c
Original file line number Diff line number Diff line change
Expand Up @@ -4759,8 +4759,18 @@ See also L</sv_uni_display>.
=for apidoc Amnh||UNI_DISPLAY_ISPRINT
=for apidoc Amnh||UNI_DISPLAY_QQ
=for apidoc Amnh||UNI_DISPLAY_REGEX

=for apidoc Cmn||UNI_DISPLAY_TR

This is an extra flag for L<perlapi/sv_uni_display> which is for internal use
only. It displays an operand of the tr/// operation. These operands have a
peculiar, deliberate UTF-8 malformation which this flag enables the proper
handling of. It turns on ISPRINT and BACKSLASH as well.

=cut

*/

char *
Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim,
UV flags)
Expand All @@ -4782,6 +4792,14 @@ Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim,
break;
}

/* The minus is unambiguously the range indicator within a UTF-8 tr///
* operand */
if (UNLIKELY(flags & UNI_DISPLAY_TR_ && *s == ILLEGAL_UTF8_BYTE)) {
sv_catpvs(dsv, "-");
next_len = 1;
continue;
}

(void) utf8_to_uv(s, e, &u, &next_len);
assert(next_len > 0);

Expand Down
5 changes: 4 additions & 1 deletion utf8.h
Original file line number Diff line number Diff line change
Expand Up @@ -1339,7 +1339,10 @@ point's representation.
#define UNI_DISPLAY_BACKSLASH 0x0002
#define UNI_DISPLAY_BACKSPACE 0x0004 /* Allow \b when also
UNI_DISPLAY_BACKSLASH */
#define UNI_DISPLAY_QQ (UNI_DISPLAY_ISPRINT \
#define UNI_DISPLAY_TR_ ( 0x0008 \
|UNI_DISPLAY_ISPRINT \
|UNI_DISPLAY_BACKSLASH)
#define UNI_DISPLAY_QQ (UNI_DISPLAY_ISPRINT \
|UNI_DISPLAY_BACKSLASH \
|UNI_DISPLAY_BACKSPACE)

Expand Down
Loading