Skip to content

Keep utf8 if it is available #14

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.

Sign up for GitHub

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
ambs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Keep utf8 if it is available #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 20 additions & 7 deletions lib/Data/Dump.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ $VERSION = "1.23";
$DEBUG = 0;

use overload ();
use vars qw(%seen %refcnt @dump @fixup %require $TRY_BASE64 @FILTERS $INDENT);
use vars qw(%seen %refcnt @dump @fixup %require $TRY_BASE64 @FILTERS $INDENT
$CURRENT_OUTPUT);

$TRY_BASE64 = 50 unless defined $TRY_BASE64;
$INDENT = " " unless defined $INDENT;
Expand Down Expand Up @@ -75,10 +76,16 @@ sub dump
$out;
}

*pp = \&dump;
sub pp {
$CURRENT_OUTPUT = \*STDERR;
&dump;
$CURRENT_OUTPUT = undef;
}

sub dd {
$CURRENT_OUTPUT = select;
print dump(@_), "\n";
$CURRENT_OUTPUT = undef;
}

sub ddx {
Expand Down Expand Up @@ -476,7 +483,7 @@ sub format_list
}
}

sub str {
sub str {
if (length($_[0]) > 20) {
for ($_[0]) {
# Check for repeated string
Expand Down Expand Up @@ -540,12 +547,18 @@ sub quote {

s/([\a\b\t\n\f\r\e])/$esc{$1}/g;

# no need for 3 digits in escape for these
s/([\0-\037])(?!\d)/sprintf('\\%o',ord($1))/eg;

s/([\0-\037\177-\377])/sprintf('\\x%02X',ord($1))/eg;
s/([^\040-\176])/sprintf('\\x{%X}',ord($1))/eg;
## probably put this in a global or state var, to keep it computed?
unless (defined($CURRENT_OUTPUT) &&
(grep { /utf-?8/i } PerlIO::get_layers($CURRENT_OUTPUT))) {

# no need for 3 digits in escape for these
s/([\0-\037])(?!\d)/sprintf('\\%o',ord($1))/eg;

s/([\0-\037\177-\377])/sprintf('\\x%02X',ord($1))/eg;
s/([^\040-\176])/sprintf('\\x{%X}',ord($1))/eg;

}
return qq("$_");
}

Expand Down