Stop substr($utf8) from calling get-magic twice

[perl5.git] / regen_perly.pl

diff --git a/regen_perly.pl b/regen_perly.pl
index 510cb3b..124b031 100644 (file)
--- a/regen_perly.pl
+++ b/regen_perly.pl
@@ -73,11 +73,11 @@ unless ($version) { die <<EOF; }
 Could not find a version of bison in your path. Please install bison.
 EOF
 
-unless ($version =~ /\b(1\.875[a-z]?|2\.[0134])\b/) { die <<EOF; }
+unless ($version =~ /\b(1\.875[a-z]?|2\.[01345])\b/) { die <<EOF; }
 
 You have the wrong version of bison in your path; currently 1.875
-2.0, 2.1, 2.3 or 2.4 is required.  Try installing
-    http://ftp.gnu.org/gnu/bison/bison-2.4.1.tar.gz
+2.0, 2.1, 2.3, 2.4 or 2.5 is required.  Try installing
+    http://ftp.gnu.org/gnu/bison/bison-2.5.1.tar.gz
 or similar.  Your bison identifies itself as:
 
 $version
@@ -95,6 +95,7 @@ close $ctmp_fh;
 
 my ($actlines, $tablines) = extract($clines);
 
+our %tokens;
 $tablines .= make_type_tab($y_file, $tablines);
 
 my ($act_fh, $tab_fh, $h_fh) = map {
@@ -114,13 +115,29 @@ unlink $tmpc_file;
 open my $tmph_fh, '<', $tmph_file or die "Can't open $tmph_file: $!\n";
 
 my $endcore_done = 0;
-# Token macros need to be generated manually on bison 2.4
-my $gather_tokens = ($version =~ /\b2\.4\b/ ? undef : 0);
+# Token macros need to be generated manually from bison 2.4 on
+my $gather_tokens = ($version =~ /\b2\.[45]\b/ ? undef : 0);
 my $tokens;
 while (<$tmph_fh>) {
     print $h_fh "#ifdef PERL_CORE\n" if $. == 1;
     if (!$endcore_done and /YYSTYPE_IS_DECLARED/) {
-       print $h_fh "#endif /* PERL_CORE */\n";
+       print $h_fh <<h;
+#ifdef PERL_IN_TOKE_C
+static bool
+S_is_opval_token(int type) {
+    switch (type) {
+h
+       print $h_fh <<i for sort grep $tokens{$_} eq 'opval', keys %tokens;
+    case $_:
+i
+       print $h_fh <<j;
+       return 1;
+    }
+    return 0;
+}
+#endif /* PERL_IN_TOKE_C */
+#endif /* PERL_CORE */
+j
        $endcore_done = 1;
     }
     next if /^#line \d+ ".*"/;
@@ -240,6 +257,7 @@ sub extract {
 
 sub make_type_tab {
     my ($y_file, $tablines) = @_;
+    my %just_tokens;
     my %tokens;
     my %types;
     my $default_token;
@@ -259,16 +277,22 @@ sub make_type_tab {
        }
 
        next unless /^%(token|type)/;
-       s/^%(token|type)\s+<(\w+)>\s+//
+       s/^%((token)|type)\s+<(\w+)>\s+//
            or die "$y_file: unparseable token/type line: $_";
-       $tokens{$_} = $2 for (split ' ', $_);
-       $types{$2} = 1;
+       for (split ' ', $_) {
+           $tokens{$_} = $3;
+           if ($2) {
+               $just_tokens{$_} = $3;
+           }
+       }
+       $types{$3} = 1;
     }
+    *tokens = \%just_tokens; # perly.h needs this
     die "$y_file: no __DEFAULT__ token defined\n" unless $default_token;
     $types{$default_token} = 1;
 
     $tablines =~ /^\Qstatic const char *const yytname[] =\E\n
-           {\n
+           \{\n
            (.*?)
            ^};
            /xsm