Some mandatory syntax warnings emitted by the lexer weren't

disableable (bug [perl #24815]).

p4raw-id: //depot/perl@22068

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index a335924..937e3a8 100644 (file)
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -1348,8 +1348,8 @@ See L<perlfunc/pack>.
 
 =item (Do you need to predeclare %s?)
 
-(S) This is an educated guess made in conjunction with the message "%s
-found where operator expected".  It often means a subroutine or module
+(S syntax) This is an educated guess made in conjunction with the message
+"%s found where operator expected".  It often means a subroutine or module
 name is being referenced that hasn't been declared yet.  This may be
 because of ordering problems in your file, or because of a missing
 "sub", "package", "require", or "use" statement.  If you're referencing
@@ -1369,8 +1369,8 @@ already been freed.
 
 =item elseif should be elsif
 
-(S) There is no keyword "elseif" in Perl because Larry thinks it's ugly.
-Your code will be interpreted as an attempt to call a method named
+(S syntax) There is no keyword "elseif" in Perl because Larry thinks it's
+ugly. Your code will be interpreted as an attempt to call a method named
 "elseif" for the class returned by the following block.  This is
 unlikely to be what you want.
 
@@ -1568,8 +1568,8 @@ when you meant
 
 =item %s found where operator expected
 
-(S) The Perl lexer knows whether to expect a term or an operator.  If it
-sees what it knows to be a term when it was expecting to see an
+(S syntax) The Perl lexer knows whether to expect a term or an operator.
+If it sees what it knows to be a term when it was expecting to see an
 operator, it gives you this warning.  Usually it indicates that an
 operator or delimiter was omitted, such as a semicolon.
 
@@ -2120,8 +2120,8 @@ can vary from one line to the next.
 
 =item (Missing operator before %s?)
 
-(S) This is an educated guess made in conjunction with the message "%s
-found where operator expected".  Often the missing operator is a comma.
+(S syntax) This is an educated guess made in conjunction with the message
+"%s found where operator expected".  Often the missing operator is a comma.
 
 =item Missing right brace on %s
 
@@ -2135,8 +2135,8 @@ were last editing.
 
 =item (Missing semicolon on previous line?)
 
-(S) This is an educated guess made in conjunction with the message "%s
-found where operator expected".  Don't automatically put a semicolon on
+(S syntax) This is an educated guess made in conjunction with the message
+"%s found where operator expected".  Don't automatically put a semicolon on
 the previous line just because you saw this message.
 
 =item Modification of a read-only value attempted

diff --git a/t/lib/warnings/toke b/t/lib/warnings/toke
index b2c15ba..e49376c 100644 (file)
--- a/t/lib/warnings/toke
+++ b/t/lib/warnings/toke
@@ -799,4 +799,21 @@ use warnings 'ambiguous';
 $s = "(@-)(@+)";
 EXPECT
 
+########
+# toke.c
+# mandatory warning
+eval q/if ($a) { } elseif ($b) { }/;
+no warnings "syntax";
+eval q/if ($a) { } elseif ($b) { }/;
+EXPECT
+elseif should be elsif at (eval 1) line 1.
+########
+# toke.c
+# mandatory warning
+eval q/5 6/;
+no warnings "syntax";
+eval q/5 6/;
+EXPECT
+Number found where operator expected at (eval 1) line 1, near "5 6"
+       (Missing operator before  6?)
 

diff --git a/toke.c b/toke.c
index 54831e7..da71929 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -256,18 +256,23 @@ S_no_op(pTHX_ char *what, char *s)
     else
        PL_bufptr = s;
     yywarn(Perl_form(aTHX_ "%s found where operator expected", what));
-    if (is_first)
-       Perl_warn(aTHX_ "\t(Missing semicolon on previous line?)\n");
-    else if (PL_oldoldbufptr && isIDFIRST_lazy_if(PL_oldoldbufptr,UTF)) {
-       char *t;
-       for (t = PL_oldoldbufptr; *t && (isALNUM_lazy_if(t,UTF) || *t == ':'); t++) ;
-       if (t < PL_bufptr && isSPACE(*t))
-           Perl_warn(aTHX_ "\t(Do you need to predeclare %.*s?)\n",
-               t - PL_oldoldbufptr, PL_oldoldbufptr);
-    }
-    else {
-       assert(s >= oldbp);
-       Perl_warn(aTHX_ "\t(Missing operator before %.*s?)\n", s - oldbp, oldbp);
+    if (ckWARN_d(WARN_SYNTAX)) {
+       if (is_first)
+           Perl_warner(aTHX_ packWARN(WARN_SYNTAX),
+                   "\t(Missing semicolon on previous line?)\n");
+       else if (PL_oldoldbufptr && isIDFIRST_lazy_if(PL_oldoldbufptr,UTF)) {
+           char *t;
+           for (t = PL_oldoldbufptr; *t && (isALNUM_lazy_if(t,UTF) || *t == ':'); t++) ;
+           if (t < PL_bufptr && isSPACE(*t))
+               Perl_warner(aTHX_ packWARN(WARN_SYNTAX),
+                       "\t(Do you need to predeclare %.*s?)\n",
+                   t - PL_oldoldbufptr, PL_oldoldbufptr);
+       }
+       else {
+           assert(s >= oldbp);
+           Perl_warner(aTHX_ packWARN(WARN_SYNTAX),
+                   "\t(Missing operator before %.*s?)\n", s - oldbp, oldbp);
+       }
     }
     PL_bufptr = oldbp;
 }
@@ -5528,7 +5533,9 @@ Perl_keyword(pTHX_ register char *d, I32 len)
            break;
        case 6:
            if (strEQ(d,"exists"))              return KEY_exists;
-           if (strEQ(d,"elseif")) Perl_warn(aTHX_ "elseif should be elsif");
+           if (strEQ(d,"elseif") && ckWARN_d(WARN_SYNTAX))
+               Perl_warner(aTHX_ packWARN(WARN_SYNTAX),
+                       "elseif should be elsif");
            break;
        case 8:
            if (strEQ(d,"endgrent"))            return -KEY_endgrent;
@@ -7822,8 +7829,8 @@ Perl_yyerror(pTHX_ char *s)
                 (int)PL_multi_open,(int)PL_multi_close,(IV)PL_multi_start);
         PL_multi_end = 0;
     }
-    if (PL_in_eval & EVAL_WARNONLY)
-       Perl_warn(aTHX_ "%"SVf, msg);
+    if (PL_in_eval & EVAL_WARNONLY && ckWARN_d(WARN_SYNTAX))
+       Perl_warner(aTHX_ packWARN(WARN_SYNTAX), "%"SVf, msg);
     else
        qerror(msg);
     if (PL_error_count >= 10) {