From e0a2a718e89f9700d627f1e6a8eea8f21d2fbeb8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Mar 2019 21:56:14 +0000 Subject: tl19 perl 5.28.1 for Windows, from Siep git-svn-id: svn://tug.org/texlive/trunk@50322 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/tlperl/lib/ExtUtils/Constant/Base.pm | 7 +++-- .../tlperl/lib/ExtUtils/Constant/ProxySubs.pm | 32 +++++++++++----------- Master/tlpkg/tlperl/lib/ExtUtils/Constant/Utils.pm | 4 +-- 3 files changed, 22 insertions(+), 21 deletions(-) (limited to 'Master/tlpkg/tlperl/lib/ExtUtils/Constant') diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Constant/Base.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Constant/Base.pm index b6abe1c201a..bd0d8a784b9 100644 --- a/Master/tlpkg/tlperl/lib/ExtUtils/Constant/Base.pm +++ b/Master/tlpkg/tlperl/lib/ExtUtils/Constant/Base.pm @@ -5,7 +5,7 @@ use vars qw($VERSION); use Carp; use Text::Wrap; use ExtUtils::Constant::Utils qw(C_stringify perl_stringify); -$VERSION = '0.05'; +$VERSION = '0.06'; use constant is_perl56 => ($] < 5.007 && $] > 5.005_50); @@ -331,7 +331,7 @@ of C code to proceed and follow the assignment. I
 will be at the start
 of a block, so variables may be defined in it.
 
 =cut
-# Hmm. value undef to to NOTDEF? value () to do NOTFOUND?
+# Hmm. value undef to do NOTDEF? value () to do NOTFOUND?
 
 sub assign {
   my $self = shift;
@@ -581,7 +581,8 @@ sub switch_clause {
     $body .= $indent . "case '" . C_stringify ($char) . "':\n";
     foreach my $thisone (sort {
 	# Deal with the case of an item actually being an array ref to 1 or 2
-	# hashrefs. Don't assign to $a or $b, as they're aliases to the orignal
+	# hashrefs. Don't assign to $a or $b, as they're aliases to the
+        # original
 	my $l = ref $a eq 'ARRAY' ? ($a->[0] || $->[1]) : $a;
 	my $r = ref $b eq 'ARRAY' ? ($b->[0] || $->[1]) : $b;
 	# Sort by weight first
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Constant/ProxySubs.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Constant/ProxySubs.pm
index 545d3221a01..0aee5233fe0 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Constant/ProxySubs.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Constant/ProxySubs.pm
@@ -9,7 +9,7 @@ require ExtUtils::Constant::XS;
 use ExtUtils::Constant::Utils qw(C_stringify);
 use ExtUtils::Constant::XS qw(%XS_TypeSet);
 
-$VERSION = '0.08';
+$VERSION = '0.09';
 @ISA = 'ExtUtils::Constant::XS';
 
 %type_to_struct =
@@ -268,7 +268,7 @@ EO_NOPCS
     SV *sv;
 
     if (!he) {
-        Perl_croak($athx "Couldn't add key '%s' to %%$package_sprintf_safe\::",
+        croak("Couldn't add key '%s' to %%$package_sprintf_safe\::",
 		   name);
     }
     sv = HeVAL(he);
@@ -306,9 +306,8 @@ static int
 Im_sorry_Dave(pTHX_ SV *sv, MAGIC *mg)
 {
     PERL_UNUSED_ARG(mg);
-    Perl_croak(aTHX_
-	       "Your vendor has not defined $package_sprintf_safe macro %"SVf
-	       " used", sv);
+    croak("Your vendor has not defined $package_sprintf_safe macro %"SVf
+	  " used", sv);
     NORETURN_FUNCTION_END;
 }
 
@@ -373,7 +372,7 @@ MISSING
     print $xs_fh <<"EOBOOT";
 BOOT:
   {
-#ifdef dTHX
+#if defined(dTHX) && !defined(PERL_NO_GET_CONTEXT)
     dTHX;
 #endif
     HV *symbol_table = get_hv("$symbol_table", GV_ADD);
@@ -491,9 +490,8 @@ EXPLODE
 		HEK *hek;
 #endif
 		if (!he) {
-		    Perl_croak($athx
-			       "Couldn't add key '%s' to %%$package_sprintf_safe\::",
-			       value_for_notfound->name);
+		    croak("Couldn't add key '%s' to %%$package_sprintf_safe\::",
+			  value_for_notfound->name);
 		}
 		sv = HeVAL(he);
 		if (!SvOK(sv) && SvTYPE(sv) != SVt_PVGV) {
@@ -521,8 +519,8 @@ EXPLODE
 		if (!hv_common(${c_subname}_missing, NULL, HEK_KEY(hek),
  			       HEK_LEN(hek), HEK_FLAGS(hek), HV_FETCH_ISSTORE,
 			       &PL_sv_yes, HEK_HASH(hek)))
-		    Perl_croak($athx "Couldn't add key '%s' to missing_hash",
-			       value_for_notfound->name);
+		    croak("Couldn't add key '%s' to missing_hash",
+			  value_for_notfound->name);
 #endif
 DONT
 
@@ -629,13 +627,15 @@ EOA
 	if ((C_ARRAY_LENGTH(values_for_notfound) > 1)
 	    ? hv_exists_ent(${c_subname}_missing, sv, 0) : 0) {
 	    sv = newSVpvf("Your vendor has not defined $package_sprintf_safe macro %" SVf
-			  ", used at %" COP_FILE_F " line %d\\n", sv,
-			  COP_FILE(cop), CopLINE(cop));
+			  ", used at %" COP_FILE_F " line %" UVuf "\\n", 
+			  sv, COP_FILE(cop), (UV)CopLINE(cop));
 	} else
 #endif
 	{
-	    sv = newSVpvf("%"SVf" is not a valid $package_sprintf_safe macro at %"
-			  COP_FILE_F " line %d\\n", sv, COP_FILE(cop), CopLINE(cop));
+	    sv = newSVpvf("%" SVf
+                          " is not a valid $package_sprintf_safe macro at %"
+			  COP_FILE_F " line %" UVuf "\\n",
+			  sv, COP_FILE(cop), (UV)CopLINE(cop));
 	}
 	croak_sv(sv_2mortal(sv));
 EOC
@@ -671,7 +671,7 @@ $xs_subname(sv)
 	} else
 #endif
 	{
-	    sv = newSVpvf("%"SVf" is not a valid $package_sprintf_safe macro",
+	    sv = newSVpvf("%" SVf " is not a valid $package_sprintf_safe macro",
 			  sv);
 	}
 	PUSHs(sv_2mortal(sv));
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Constant/Utils.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Constant/Utils.pm
index 9608256c34c..37e53f06ff7 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Constant/Utils.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Constant/Utils.pm
@@ -6,7 +6,7 @@ use Carp;
 
 @ISA = 'Exporter';
 @EXPORT_OK = qw(C_stringify perl_stringify);
-$VERSION = '0.03';
+$VERSION = '0.04';
 
 use constant is_perl55 => ($] < 5.005_50);
 use constant is_perl56 => ($] < 5.007 && $] > 5.005_50);
@@ -46,7 +46,7 @@ sub C_stringify {
   # grr 5.6.1
   confess "Wide character in '$_' intended as a C identifier"
     if tr/\0-\377// != length;
-  # grr 5.6.1 moreso because its regexps will break on data that happens to
+  # grr 5.6.1 more so because its regexps will break on data that happens to
   # be utf8, which includes my 8 bit test cases.
   $_ = pack 'C*', unpack 'U*', $_ . pack 'U*' if is_perl56;
   s/\\/\\\\/g;
-- 
cgit v1.2.3