X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=toke.c;h=6f5441622ae49e80714cd2eb38adc39278e0b70f;hb=6d7fb585cd8ad83f4523191641999603aa48eb76;hp=0aba7210bfebd24fc4bec3abff7d2f6f9d5a8d54;hpb=62d55b227f6b1e95d65e7faf12ed22fd467e4c0e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/toke.c b/toke.c
index 0aba721..6f54416 100644
--- a/toke.c
+++ b/toke.c
@@ -27,6 +27,7 @@
 #define yylval	(*PL_yylvalp)
 
 static const char ident_too_long[] = "Identifier too long";
+static const char commaless_variable_list[] = "comma-less variable list";
 
 static void restore_rsfp(pTHX_ void *f);
 #ifndef PERL_NO_UTF16_FILTER
@@ -459,7 +460,7 @@ S_missingterm(pTHX_ char *s)
 
 #define FEATURE_IS_ENABLED(name, namelen)				\
 	((0 != (PL_hints & HINT_LOCALIZE_HH))				\
-	&& feature_is_enabled(name, namelen))
+	    && feature_is_enabled(name, namelen) )
 /*
  * S_feature_is_enabled
  * Check whether the named feature is enabled.
@@ -502,17 +503,6 @@ Perl_deprecate_old(pTHX_ const char *s)
 }
 
 /*
- * depcom
- * Deprecate a comma-less variable list.
- */
-
-STATIC void
-S_depcom(pTHX)
-{
-    deprecate_old("comma-less variable list");
-}
-
-/*
  * experimental text filters for win32 carriage-returns, utf16-to-utf8 and
  * utf16-to-utf8-reversed.
  */
@@ -2727,6 +2717,8 @@ Perl_yylex(pTHX)
 		        sv_catpv(PL_linestr,"our @F=split(' ');");
 		}
 	    }
+	    if (PL_minus_E)
+		sv_catpv(PL_linestr,"use feature ':5.10';");
 	    sv_catpvn(PL_linestr, "\n", 1);
 	    PL_oldoldbufptr = PL_oldbufptr = s = PL_linestart = SvPVX(PL_linestr);
 	    PL_bufend = SvPVX(PL_linestr) + SvCUR(PL_linestr);
@@ -3755,7 +3747,7 @@ Perl_yylex(pTHX)
 	if (PL_expect == XOPERATOR) {
 	    if (PL_lex_formbrack && PL_lex_brackets == PL_lex_formbrack) {
 		PL_expect = XTERM;
-		depcom();
+		deprecate_old(commaless_variable_list);
 		return REPORT(','); /* grandfather non-comma-format format */
 	    }
 	}
@@ -4005,7 +3997,7 @@ Perl_yylex(pTHX)
 	if (PL_expect == XOPERATOR) {
 	    if (PL_lex_formbrack && PL_lex_brackets == PL_lex_formbrack) {
 		PL_expect = XTERM;
-		depcom();
+		deprecate_old(commaless_variable_list);
 		return REPORT(','); /* grandfather non-comma-format format */
 	    }
 	    else
@@ -4022,7 +4014,7 @@ Perl_yylex(pTHX)
 	if (PL_expect == XOPERATOR) {
 	    if (PL_lex_formbrack && PL_lex_brackets == PL_lex_formbrack) {
 		PL_expect = XTERM;
-		depcom();
+		deprecate_old(commaless_variable_list);
 		return REPORT(','); /* grandfather non-comma-format format */
 	    }
 	    else
@@ -4198,16 +4190,6 @@ Perl_yylex(pTHX)
 	    {
 		tmp = 0;		/* any sub overrides "weak" keyword */
 	    }
-	    else if (gv && !gvp
-		    && tmp == -KEY_err
-		    && GvCVu(gv)
-		    && PL_expect != XOPERATOR
-		    && PL_expect != XTERMORDORDOR)
-	    {
-		/* any sub overrides the "err" keyword, except when really an
-		 * operator is expected */
-		tmp = 0;
-	    }
 	    else {			/* no override */
 		tmp = -tmp;
 		if (tmp == KEY_dump && ckWARN(WARN_MISC)) {
@@ -6098,7 +6080,7 @@ Perl_keyword (pTHX_ const char *name, I32 len)
             case 'r':
               if (name[2] == 'r')
               {                                   /* err        */
-                return -KEY_err;
+                return (FEATURE_IS_ENABLED("err", 3) ? -KEY_err : 0);
               }
 
               goto unknown;