Skip to content

Add a utf8() mode that allows byte/UTF-8 strings as input & output. #78

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

Add a utf8() mode that allows byte/UTF-8 strings as input & output. #78

Show file tree
Hide file tree
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
31 changes: 27 additions & 4 deletions lib/JSON/PP.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ use constant OLD_PERL => $] < 5.008 ? 1 : 0;
use constant USE_B => $ENV{PERL_JSON_PP_USE_B} || 0;
use constant CORE_BOOL => defined &builtin::is_bool;

use constant UTF8_CHARS => 0;
use constant UTF8_STANDARD => 1;
use constant UTF8_BYTES => 2;

my $invalid_char_re;

BEGIN {
Expand All @@ -67,7 +71,7 @@ BEGIN {

BEGIN {
my @xs_compati_bit_properties = qw(
latin1 ascii utf8 indent canonical space_before space_after allow_nonref shrink
latin1 ascii indent canonical space_before space_after allow_nonref shrink
allow_blessed convert_blessed relaxed allow_unknown
allow_tags
);
Expand Down Expand Up @@ -109,7 +113,22 @@ BEGIN {

}

sub utf8 {
my $value = defined $_[1] ? $_[1] : 1;

if ($value) {
$_[0]->{PROPS}->[P_UTF8] = ($value eq UTF8_BYTES) ? $value : UTF8_STANDARD;
}
else {
$_[0]->{PROPS}->[P_UTF8] = UTF8_CHARS;
}

$_[0];
}

sub get_utf8 {
$_[0]->{PROPS}->[P_UTF8] || UTF8_CHARS;
}

# Functions

Expand Down Expand Up @@ -590,7 +609,7 @@ sub allow_bigint {
$arg = JSON_PP_encode_latin1($arg);
}

if ($utf8) {
if ($utf8 && $utf8 ne UTF8_BYTES) {
utf8::encode($arg);
}

Expand Down Expand Up @@ -777,7 +796,7 @@ BEGIN {

($alt_true, $alt_false) = @$self{qw/true false/};

if ( $utf8 ) {
if ( $utf8 && $utf8 ne UTF8_BYTES ) {
$encoding = _detect_utf_encoding($text);
if ($encoding ne 'UTF-8' and $encoding ne 'unknown') {
require Encode;
Expand Down Expand Up @@ -906,7 +925,11 @@ BEGIN {
my $hex = hex( $u );
if ( chr $u =~ /[[:^ascii:]]/ ) {
$is_utf8 = 1;
$s .= JSON_PP_decode_unicode($u) || next;

my $char = JSON_PP_decode_unicode($u) || next;

utf8::encode($char) if $utf8 eq UTF8_BYTES;
$s .= $char;
}
else {
$s .= chr $hex;
Expand Down
19 changes: 19 additions & 0 deletions t/023_utf8_bytes.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# copied over from JSON::XS and modified to use JSON::PP

use strict;
use warnings;

use Test::More;
plan tests => 1;

use JSON::PP;

my $source = qq<"\xff\xc3\xa9\\u00e9">;

my $dec = JSON::PP->new()->utf8( JSON::PP::UTF8_BYTES );

is(
$dec->decode($source),
"\xff\xc3\xa9\xc3\xa9",
"utf8(UTF8_BYTES): expected decode",
);