Something went wrong. Try again.
lol
Something went wrong. Try again.
9.3 kB · 299 lines
at master
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>Date: Mon, 10 Apr 2023 22:12:24 +0200Subject: [PATCH] miniperl compatible modules
CPAN::MetaExtUtils::MakeMakerJSON::PPData::Dumper
Updated for perl v5.40.0 by marcus@means.no
---
diff --git a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pmindex b0e83b0d2d..dab4907704 100644--- a/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm+++ b/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm@@ -52,21 +52,38 @@ # from version::vpp sub _find_magic_vstring { my $value = shift;- my $tvalue = '';- require B;- my $sv = B::svref_2object(\$value);- my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;- while ( $magic ) {- if ( $magic->TYPE eq 'V' ) {- $tvalue = $magic->PTR;- $tvalue =~ s/^v?(.+)$/v$1/;- last;- }- else {- $magic = $magic->MOREMAGIC;++ # B is not available in miniperl (it depends on XS), so try to load it safely+ my $has_B = eval { require B; 1 };++ if ($has_B) {+ my $sv = B::svref_2object(\$value);+ my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;+ while ($magic) {+ if ($magic->TYPE eq 'V') {+ my $tvalue = $magic->PTR;+ $tvalue =~ s/^v?(.+)$/v$1/;+ return $tvalue;+ }+ $magic = $magic->MOREMAGIC; } }- return $tvalue;++ # --- Fallback for miniperl ---+ # Perl represents vstrings internally as sequences of bytes like "\x01\x02\x03"+ # and only shows them as "v1.2.3" when printed.+ # Try to detect that pattern heuristically.+ use builtin qw/reftype/;+ if (!ref($value) && reftype(\$value) eq 'VSTRING') {+ return sprintf("v%vd", $value);+ }++ # If it's already a "v1.2.3" string, just return it as is+ if ($value =~ /^v\d+(?:\.\d+)*$/) {+ return $value;+ }++ return ''; }
# Perl 5.10.0 didn't have "is_qv" in version.pmdiff --git a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pmindex 746abd63bc..c55d7cd2d0 100644--- a/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm+++ b/cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm@@ -1,6 +1,7 @@ use 5.008001; # sane UTF-8 support use strict; use warnings;+no warnings 'experimental::builtin'; package CPAN::Meta::YAML; # git description: v1.75-3-g85169f1 # XXX-INGY is 5.8.1 too old/broken for utf8? # XXX-XDG Lancaster consensus was that it was sufficient until@@ -650,27 +651,29 @@ sub _dump_string { join '', map { "$_\n" } @lines; }
-sub _has_internal_string_value {+# taken from cpan/JSON-PP/lib/JSON/PP.pm+sub _looks_like_number { my $value = shift;- my $b_obj = B::svref_2object(\$value); # for round trip problem- return $b_obj->FLAGS & B::SVf_POK();+ no warnings 'numeric';+ # if the utf8 flag is on, it almost certainly started as a string+ return if utf8::is_utf8($value);+ # detect numbers+ # string & "" -> ""+ # number & "" -> 0 (with warning)+ # nan and inf can detect as numbers, so check with * 0+ return unless length((my $dummy = "") & $value);+ return unless 0 + $value eq $value;+ return 1 if $value * 0 == 0;+ return -1; # inf/nan }
sub _dump_scalar { my $string = $_[1]; my $is_key = $_[2];- # Check this before checking length or it winds up looking like a string!- my $has_string_flag = _has_internal_string_value($string); return '~' unless defined $string; return "''" unless length $string;- if (Scalar::Util::looks_like_number($string)) {- # keys and values that have been used as strings get quoted- if ( $is_key || $has_string_flag ) {- return qq['$string'];- }- else {- return $string;- }+ if (_looks_like_number($string)) {+ return qq['$string']; } if ( $string =~ /[\x00-\x09\x0b-\x0d\x0e-\x1f\x7f-\x9f\'\n]/ ) { $string =~ s/\\/\\\\/g;@@ -800,9 +803,6 @@ sub errstr { # Helper functions. Possibly not needed.
-# Use to detect nv or iv-use B;- # XXX-INGY Is flock CPAN::Meta::YAML's responsibility? # Some platforms can't flock :-( # XXX-XDG I think it is. When reading and writing files, we ought@@ -822,35 +822,8 @@ sub _can_flock { } }
--# XXX-INGY Is this core in 5.8.1? Can we remove this?-# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this-#####################################################################-# Use Scalar::Util if possible, otherwise emulate it--use Scalar::Util (); BEGIN {- local $@;- if ( eval { Scalar::Util->VERSION(1.18); } ) {- *refaddr = *Scalar::Util::refaddr;- }- else {- eval <<'END_PERL';-# Scalar::Util failed to load or too old-sub refaddr {- my $pkg = ref($_[0]) or return undef;- if ( !! UNIVERSAL::can($_[0], 'can') ) {- bless $_[0], 'Scalar::Util::Fake';- } else {- $pkg = undef;- }- "$_[0]" =~ /0x(\w+)/;- my $i = do { no warnings 'portable'; hex $1 };- bless $_[0], $pkg if defined $pkg;- $i;-}-END_PERL- }+ *refaddr = *builtin::refaddr; }
delete $CPAN::Meta::YAML::{refaddr};diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pmindex 3604eae402..991f69d275 100644--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm+++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm@@ -1,12 +1,13 @@ use strict; use warnings;+no warnings 'experimental::builtin';
package CPAN::Meta::Merge;
our $VERSION = '2.150010';
use Carp qw/croak/;-use Scalar::Util qw/blessed/;+use builtin qw/blessed/; use CPAN::Meta::Converter 2.141170;
sub _is_identical {diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pmindex d4e93fd8a5..809da68d02 100644--- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm+++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm@@ -1,6 +1,7 @@ use 5.006; use strict; use warnings;+no warnings 'experimental::builtin'; package CPAN::Meta::Prereqs;
our $VERSION = '2.150010';@@ -14,7 +14,7 @@ our $VERSION = '2.150010'; #pod =cut
use Carp qw(confess);-use Scalar::Util qw(blessed);+use builtin qw(blessed); use CPAN::Meta::Requirements 2.121;
#pod =method newdiff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pmindex fc8fcbc8f0..cda7b90c65 100644--- a/cpan/JSON-PP/lib/JSON/PP.pm+++ b/cpan/JSON-PP/lib/JSON/PP.pm@@ -4,6 +4,7 @@ package JSON::PP;
use 5.008; use strict;+no warnings 'experimental::builtin';
use Exporter (); BEGIN { our @ISA = ('Exporter') }diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pmindex bb6d3caedb..0c2fde4743 100644--- a/dist/Data-Dumper/Dumper.pm+++ b/dist/Data-Dumper/Dumper.pm@@ -11,6 +11,7 @@ package Data::Dumper;
use strict; use warnings;+no warnings 'experimental::builtin';
#$| = 1;
@@ -125,8 +126,7 @@ sub new { # Packed numeric addresses take less memory. Plus pack is faster than sprintf
sub format_refaddr {- require Scalar::Util;- pack "J", Scalar::Util::refaddr(shift);+ pack "J", builtin::refaddr(shift); };
#@@ -282,9 +282,8 @@ sub _dump { warn "WARNING(Freezer method call failed): $@" if $@; }
- require Scalar::Util;- my $realpack = Scalar::Util::blessed($val);- my $realtype = $realpack ? Scalar::Util::reftype($val) : ref $val;+ my $realpack = builtin::blessed($val);+ my $realtype = $realpack ? builtin::reftype($val) : ref $val; $id = format_refaddr($val);
# Note: By this point $name is always defined and of non-zero length.@@ -576,7 +575,7 @@ sub _dump { # here generates a different result. So there are actually "three" different # implementations of Data::Dumper (kind of sort of) but we only test two. elsif (!defined &_vstring- and ref $ref eq 'VSTRING' || eval{Scalar::Util::isvstring($val)}) {+ and ref $ref eq 'VSTRING') { $out .= sprintf "v%vd", $val; } # \d here would treat "1\x{660}" as a safe decimal numberdiff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pmindex fc8fcbc8f0..cda7b90c65 100644--- a/cpan/JSON-PP/lib/JSON/PP.pm+++ b/cpan/JSON-PP/lib/JSON/PP.pm@@ -12,6 +12,6 @@ package JSON::PP;
use Carp ();-use Scalar::Util qw(blessed reftype refaddr);+use builtin qw(blessed reftype refaddr); #use Devel::Peek;
diff --git a/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm b/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm--- a/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm+++ b/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm@@ -53,7 +53,8 @@ sub load_json_string { my ($class, $string) = @_; require Encode; # load_json_string takes characters, decode_json expects bytes- my $encoded = Encode::encode('UTF-8', $string, Encode::PERLQQ());+ my $encoded = $string;+ utf8::encode($encoded); # Miniperl workaround my $data = eval { $class->json_decoder()->can('decode_json')->($encoded) }; croak $@ if $@; return $data || {};@@ -122,7 +122,7 @@ sub _slurp { open my $fh, "<:raw", "$_[0]" ## no critic or die "can't open $_[0] for reading: $!"; my $content = do { local $/; <$fh> };- $content = Encode::decode('UTF-8', $content, Encode::PERLQQ());+ utf8::decode($content); # Workaround for miniperl return $content; }