X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl_keyword.pl;h=ab9559cc791241ec4f92cd08e77f078d46f2eb17;hb=b30ea4af1eb31dd77630f331817dfe421bf8b269;hp=d0471f689140efadd4204c3f276bd27836faada5;hpb=0d863452f5cac86322a90184dc68dbf446006ed7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perl_keyword.pl b/perl_keyword.pl
index d0471f6..ab9559c 100644
--- a/perl_keyword.pl
+++ b/perl_keyword.pl
@@ -9,8 +9,8 @@ my @pos = qw(__DATA__ __END__ AUTOLOAD BEGIN CHECK DESTROY default defined
 	    delete do END else eval elsif exists for format foreach given grep
 	    goto glob INIT if last local m my map next no our pos print printf
 	    package prototype q qr qq qw qx redo return require s scalar sort
-	    split study sub tr tie tied use undef until untie unless when while
-	    y);
+	    split state study sub tr tie tied use undef until untie unless when
+	    while y);
 
 my @neg = qw(__FILE__ __LINE__ __PACKAGE__ and abs alarm atan2 accept bless
 	    break bind binmode CORE cmp chr cos chop close chdir chomp chmod
@@ -43,6 +43,10 @@ my %feature_kw = (
 	break   => 'switch',
 
 	say     => 'say',
+
+	err	=> 'err',
+
+	state	=> 'state',
 	);
 
 my %pos = map { ($_ => 1) } @pos;
@@ -63,8 +67,9 @@ print <<END;
  */
 
 I32
-Perl_keyword (pTHX_ const char *name, I32 len)
+Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
 {
+    dVAR;
 $switch
 unknown:
   return 0;
@@ -83,10 +88,9 @@ if(ckWARN_d(WARN_SYNTAX))
 END
   }
   elsif (my $feature = $feature_kw{$k}) {
-    my $feature_len = length($feature);
     $feature =~ s/([\\"])/\\$1/g;
     return <<END;
-return (FEATURE_IS_ENABLED("$feature", $feature_len) ? ${sign}KEY_$k : 0);
+return (all_keywords || FEATURE_IS_ENABLED("$feature") ? ${sign}KEY_$k : 0);
 END
   }
   return <<END;