From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 1 Dec 2000 20:23:29 +0000 (+0000)
Subject: Some help for 20001130.011.  Now one gets warnings like
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e5edeb50dffa2b3a1d6245f54a443cff2a31eb3f;p=p5sagit%2Fp5-mst-13.2.git

Some help for 20001130.011.  Now one gets warnings like
"Ambiguous -f() resolved as a file test ..."

p4raw-id: //depot/perl@7944
---

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 9baf175..877961d 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -59,6 +59,17 @@ L<perlfunc/accept>.
 (F) The '!' is allowed in pack() and unpack() only after certain types.
 See L<perlfunc/pack>.
 
+=item Ambiguous -%c() resolved as a file test
+
+(W ambiguous) A subroutine you used has the same name as a Perl file
+test (C<r w x o R W X O e z s f d l p S u g k b c t T B M A C>), and
+you used a "-" right in front a call to that subroutine, which made it
+really look like a file test.  Use either an extra space after the
+"-", C<- f(...)>, or an extra set of parentheses, C<-(f(...))>, to
+disambiguate it as a subroutine call, or an extra space after the
+operator name C<-f (...)>, or remove the parentheses, C<-f ...>, to
+disambiguate it as a file test.
+
 =item Ambiguous call resolved as CORE::%s(), qualify as such or use &
 
 (W ambiguous) A subroutine you have declared has the same name as a Perl
diff --git a/t/pragma/warn/toke b/t/pragma/warn/toke
index 2c9433b..1f8b142 100644
--- a/t/pragma/warn/toke
+++ b/t/pragma/warn/toke
@@ -123,6 +123,9 @@ toke.c	AOK
     Ambiguous use of %c resolved as operator %c
         *foo *foo
 
+    Ambiguous -f%c call resolved as a file test		[yylex]
+	sub f { }; -f(0)
+
 __END__
 # toke.c 
 use warnings 'deprecated' ;
@@ -564,3 +567,19 @@ no warnings 'ambiguous';
 "@mjd_previously_unused_array";        
 EXPECT
 Possible unintended interpolation of @mjd_previously_unused_array in string at - line 3.
+########
+# toke.c
+use warnings 'ambiguous';
+sub f { 24 }
+-f("TEST");
+print - f("TEST");
+print -(f("TEST"));
+print -f ("TEST");
+print -f "TEST";
+sub Q { 42 };
+print -Q();
+EXPECT
+Ambiguous -f() resolved as a file test at - line 4.
+Ambiguous -f() resolved as a file test at - line 7.
+-24-2411-42
+
diff --git a/toke.c b/toke.c
index 90b5ad5..28e552b 100644
--- a/toke.c
+++ b/toke.c
@@ -121,7 +121,7 @@ int yyactlevel = 0;
  * Aop          : addition-level operator
  * Mop          : multiplication-level operator
  * Eop          : equality-testing operator
- * Rop        : relational operator <= != gt
+ * Rop          : relational operator <= != gt
  *
  * Also see LOP and lop() below.
  */
@@ -2802,6 +2802,8 @@ Perl_yylex(pTHX)
 	goto retry;
     case '-':
 	if (s[1] && isALPHA(s[1]) && !isALNUM(s[2])) {
+	    I32 ftst = 0;
+
 	    s++;
 	    PL_bufptr = s;
 	    tmp = *s++;
@@ -2817,42 +2819,59 @@ Perl_yylex(pTHX)
 		OPERATOR('-');		/* unary minus */
 	    }
 	    PL_last_uni = PL_oldbufptr;
-	    PL_last_lop_op = OP_FTEREAD;	/* good enough */
-            DEBUG_T( { PerlIO_printf(Perl_debug_log, 
-                        "### Saw file test %c\n", (int)tmp);
-            } )
 	    switch (tmp) {
-	    case 'r': FTST(OP_FTEREAD);
-	    case 'w': FTST(OP_FTEWRITE);
-	    case 'x': FTST(OP_FTEEXEC);
-	    case 'o': FTST(OP_FTEOWNED);
-	    case 'R': FTST(OP_FTRREAD);
-	    case 'W': FTST(OP_FTRWRITE);
-	    case 'X': FTST(OP_FTREXEC);
-	    case 'O': FTST(OP_FTROWNED);
-	    case 'e': FTST(OP_FTIS);
-	    case 'z': FTST(OP_FTZERO);
-	    case 's': FTST(OP_FTSIZE);
-	    case 'f': FTST(OP_FTFILE);
-	    case 'd': FTST(OP_FTDIR);
-	    case 'l': FTST(OP_FTLINK);
-	    case 'p': FTST(OP_FTPIPE);
-	    case 'S': FTST(OP_FTSOCK);
-	    case 'u': FTST(OP_FTSUID);
-	    case 'g': FTST(OP_FTSGID);
-	    case 'k': FTST(OP_FTSVTX);
-	    case 'b': FTST(OP_FTBLK);
-	    case 'c': FTST(OP_FTCHR);
-	    case 't': FTST(OP_FTTTY);
-	    case 'T': FTST(OP_FTTEXT);
-	    case 'B': FTST(OP_FTBINARY);
-	    case 'M': gv_fetchpv("\024",TRUE, SVt_PV); FTST(OP_FTMTIME);
-	    case 'A': gv_fetchpv("\024",TRUE, SVt_PV); FTST(OP_FTATIME);
-	    case 'C': gv_fetchpv("\024",TRUE, SVt_PV); FTST(OP_FTCTIME);
+	    case 'r': ftst = OP_FTEREAD;	break;
+	    case 'w': ftst = OP_FTEWRITE;	break;
+	    case 'x': ftst = OP_FTEEXEC;	break;
+	    case 'o': ftst = OP_FTEOWNED;	break;
+	    case 'R': ftst = OP_FTRREAD;	break;
+	    case 'W': ftst = OP_FTRWRITE;	break;
+	    case 'X': ftst = OP_FTREXEC;	break;
+	    case 'O': ftst = OP_FTROWNED;	break;
+	    case 'e': ftst = OP_FTIS;		break;
+	    case 'z': ftst = OP_FTZERO;		break;
+	    case 's': ftst = OP_FTSIZE;		break;
+	    case 'f': ftst = OP_FTFILE;		break;
+	    case 'd': ftst = OP_FTDIR;		break;
+	    case 'l': ftst = OP_FTLINK;		break;
+	    case 'p': ftst = OP_FTPIPE;		break;
+	    case 'S': ftst = OP_FTSOCK;		break;
+	    case 'u': ftst = OP_FTSUID;		break;
+	    case 'g': ftst = OP_FTSGID;		break;
+	    case 'k': ftst = OP_FTSVTX;		break;
+	    case 'b': ftst = OP_FTBLK;		break;
+	    case 'c': ftst = OP_FTCHR;		break;
+	    case 't': ftst = OP_FTTTY;		break;
+	    case 'T': ftst = OP_FTTEXT;		break;
+	    case 'B': ftst = OP_FTBINARY;	break;
+	    case 'M': case 'A': case 'C':
+		gv_fetchpv("\024",TRUE, SVt_PV);
+		switch (tmp) {
+		case 'M': ftst = OP_FTMTIME;	break;
+		case 'A': ftst = OP_FTATIME;	break;
+		case 'C': ftst = OP_FTCTIME;	break;
+		default:			break;
+		}
+		break;
 	    default:
-		Perl_croak(aTHX_ "Unrecognized file test: -%c", (int)tmp);
 		break;
 	    }
+	    if (ftst) {
+		PL_last_lop_op = ftst;
+		DEBUG_T( { PerlIO_printf(Perl_debug_log, 
+                        "### Saw file test %c\n", ftst);
+		} )
+		if (*s == '(' && ckWARN(WARN_AMBIGUOUS))
+		    Perl_warner(aTHX_ WARN_AMBIGUOUS,
+				"Ambiguous -%c() resolved as a file test",
+				tmp, tmp);
+		FTST(ftst);
+	    }
+	    else {
+		/* Assume it was a minus followed by a one-letter named
+		 * subroutine call (or a -bareword), then. */
+		s -= 2;
+	    }
 	}
 	tmp = *s++;
 	if (*s == tmp) {