remove use of ' as a package separator

Author: tonycoz

cpan/Scalar-List-Utils/ListUtil.xs

@@ -1947,8 +1947,10 @@ PREINIT:
  STRLEN namelen;
  const char* nameptr = SvPV(name, namelen);
  int utf8flag = SvUTF8(name);
+#if PERL_VERSION_LT(5, 41, 3)
  int quotes_seen = 0;
  bool need_subst = FALSE;
+#endif
 PPCODE:
  if (!SvROK(sub) && SvGMAGICAL(sub))
  mg_get(sub);
@@ -1971,18 +1973,23 @@ PPCODE:
  if (s > nameptr && *s == ':' && s[-1] == ':') {
  end = s - 1;
  begin = ++s;
+#if PERL_VERSION_LT(5, 41, 3)
  if (quotes_seen)
  need_subst = TRUE;
+#endif
  }
+#if PERL_VERSION_LT(5, 41, 3)
  else if (s > nameptr && *s != '\0' && s[-1] == '\'') {
  end = s - 1;
  begin = s;
  if (quotes_seen++)
  need_subst = TRUE;
  }
+#endif
  }
  s--;
  if (end) {
+#if PERL_VERSION_LT(5, 41, 3)
  SV* tmp;
  if (need_subst) {
  STRLEN length = end - nameptr + quotes_seen - (*end == '\'' ? 1 : 0);
@@ -2002,6 +2009,7 @@ PPCODE:
  stash = gv_stashpvn(left, length, GV_ADD | utf8flag);
  }
  else
+#endif
  stash = gv_stashpvn(nameptr, end - nameptr, GV_ADD | utf8flag);
  nameptr = begin;
  namelen -= begin - nameptr;

cpan/Scalar-List-Utils/lib/List/Util.pm

@@ -16,7 +16,7 @@ our @EXPORT_OK = qw(
  sample shuffle uniq uniqint uniqnum uniqstr zip zip_longest zip_shortest mesh mesh_longest mesh_shortest
  head tail pairs unpairs pairkeys pairvalues pairmap pairgrep pairfirst
 );
-our $VERSION = "1.63";
+our $VERSION = "1.63_01";
 our $XS_VERSION = $VERSION;
 $VERSION =~ tr/_//d;
 

cpan/Scalar-List-Utils/lib/List/Util/XS.pm

@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use List::Util;
 
-our $VERSION = "1.63"; # FIXUP
+our $VERSION = "1.63_01"; # FIXUP
 $VERSION =~ tr/_//d; # FIXUP
 
 1;

cpan/Scalar-List-Utils/lib/Scalar/Util.pm

@@ -17,7 +17,7 @@ our @EXPORT_OK = qw(
  dualvar isdual isvstring looks_like_number openhandle readonly set_prototype
  tainted
 );
-our $VERSION = "1.63";
+our $VERSION = "1.63_01";
 $VERSION =~ tr/_//d;
 
 require List::Util; # List::Util loads the XS

cpan/Scalar-List-Utils/lib/Sub/Util.pm

@@ -15,7 +15,7 @@ our @EXPORT_OK = qw(
  subname set_subname
 );
 
-our $VERSION = "1.63";
+our $VERSION = "1.63_01";
 $VERSION =~ tr/_//d;
 
 require List::Util; # as it has the XS

cpan/Scalar-List-Utils/t/exotic_names.t

@@ -45,7 +45,7 @@ sub caller3_ok {
  ),
  );
 
- $expected =~ s/'/::/g;
+ $expected =~ s/'/::/g if $] < 5.041_003;
 
  # this is apparently how things worked before 5.16
  utf8::encode($expected) if $] < 5.016 and $ord > 255;
@@ -83,7 +83,8 @@ push @ordinal,
 
 plan tests => @ordinal * 2 * 3;
 
-my $legal_ident_char = "A-Z_a-z0-9'";
+my $legal_ident_char = "A-Z_a-z0-9";
+$legal_ident_char .= "'" if $] < 5.041_003;
 $legal_ident_char .= join '', map chr, 0x100, 0x498
  unless $] < 5.008;
 

cpan/parent/lib/parent.pm

@@ -1,7 +1,7 @@
 package parent;
 use strict;
 
-our $VERSION = '0.241';
+our $VERSION = '0.241_001';
 
 sub import {
  my $class = shift;

cpan/parent/t/compile-time-file.t

@@ -24,7 +24,7 @@ use lib 't/lib';
 
 {
  package Child3;
- use parent "Dummy'Outside";
+ use if $] < 5.041_003, parent => "Dummy'Outside";
 }
 
 my $obj = {};
@@ -39,9 +39,13 @@ isa_ok $obj, 'Dummy::InlineChild';
 can_ok $obj, 'exclaim';
 is $obj->exclaim, "I CAN FROM Dummy::InlineChild", 'Inheritance is set up correctly for inlined classes';
 
+SKIP:
+{
+ skip "No ' in names from 5.041_003", 3 if $] >= 5.041_003;
 $obj = {};
 bless $obj, 'Child3';
 isa_ok $obj, 'Dummy::Outside';
 can_ok $obj, 'exclaim';
 is $obj->exclaim, "I CAN FROM Dummy::Outside", "Inheritance is set up correctly for classes inherited from via '";
 
+}

embed.fnc

@@ -2995,12 +2995,6 @@ EXpx	|char * |scan_word	|NN char *s	\
 |STRLEN destlen	\
 |int allow_package	\
 |NN STRLEN *slp
-EXpx	|char * |scan_word6	|NN char *s	\
-|NN char *dest	\
-|STRLEN destlen	\
-|int allow_package	\
-|NN STRLEN *slp	\
-|bool warn_tick
 Cp	|U32	|seed
 : Only used by perl.c/miniperl.c, but defined in caretx.c
 ep	|void	|set_caret_X
@@ -5894,8 +5888,7 @@ S	|void	|parse_ident	|NN char **s	\
 |NN char * const e	\
 |int allow_package	\
 |bool is_utf8	\
-|bool check_dollar	\
-|bool tick_warn
+|bool check_dollar
 S	|int	|pending_ident
 RS	|char * |scan_const	|NN char *start
 RS	|char * |scan_formline	|NN char *s

embed.h

@@ -1629,7 +1629,7 @@
 # define lop(a,b,c) S_lop(aTHX_ a,b,c)
 # define missingterm(a,b) S_missingterm(aTHX_ a,b)
 # define no_op(a,b) S_no_op(aTHX_ a,b)
-# define parse_ident(a,b,c,d,e,f,g) S_parse_ident(aTHX_ a,b,c,d,e,f,g)
+# define parse_ident(a,b,c,d,e,f)  S_parse_ident(aTHX_ a,b,c,d,e,f)
 # define pending_ident() S_pending_ident(aTHX)
 # define scan_const(a) S_scan_const(aTHX_ a)
 # define scan_formline(a) S_scan_formline(aTHX_ a)
@@ -1765,7 +1765,6 @@
 # define report_uninit(a) Perl_report_uninit(aTHX_ a)
 # define scan_str(a,b,c,d,e) Perl_scan_str(aTHX_ a,b,c,d,e)
 # define scan_word(a,b,c,d,e) Perl_scan_word(aTHX_ a,b,c,d,e)
-# define scan_word6(a,b,c,d,e,f) Perl_scan_word6(aTHX_ a,b,c,d,e,f)
 # define skipspace_flags(a,b) Perl_skipspace_flags(aTHX_ a,b)
 # define sv_magicext_mglob(a) Perl_sv_magicext_mglob(aTHX_ a)
 # define sv_only_taint_gmagic Perl_sv_only_taint_gmagic