silence a compiler warning

[perl5.git] / x2p / a2p.y

diff --git a/x2p/a2p.y b/x2p/a2p.y
index 6136edf..74c42d8 100644 (file)
--- a/x2p/a2p.y
+++ b/x2p/a2p.y
@@ -1,21 +1,13 @@
 %{
-/* $RCSfile: a2p.y,v $$Revision: 4.0.1.2 $$Date: 92/06/08 16:13:03 $
+/* $RCSfile: a2p.y,v $$Revision: 4.1 $$Date: 92/08/07 18:29:12 $
  *
- *    Copyright (c) 1991, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1996, 1997, 1999, 2000,
+ *    by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log:       a2p.y,v $
- * Revision 4.0.1.2  92/06/08  16:13:03  lwall
- * patch20: in a2p, getline should allow variable to be array element
- * 
- * Revision 4.0.1.1  91/06/07  12:12:41  lwall
- * patch4: new copyright notice
- * 
- * Revision 4.0  91/03/20  01:57:21  lwall
- * 4.0 baseline.
- * 
  */
 
 #include "INTERN.h"
@@ -30,7 +22,7 @@ int ends = Nullop;
 %token REGEX
 %token SEMINEW NEWLINE COMMENT
 %token FUN1 FUNN GRGR
-%token PRINT PRINTF SPRINTF SPLIT
+%token PRINT PRINTF SPRINTF_OLD SPRINTF_NEW SPLIT
 %token IF ELSE WHILE FOR IN
 %token EXIT NEXT BREAK CONTINUE RET
 %token GETLINE DO SUB GSUB MATCH
@@ -52,7 +44,7 @@ int ends = Nullop;
 %left NOT
 %right '^'
 %left INCR DECR
-%left FIELD VFIELD
+%left FIELD VFIELD SVFIELD
 
 %%
 
@@ -103,6 +95,8 @@ cond : expr
        | match
        | rel
        | compound_cond
+       | cond '?' expr ':' expr
+               { $$ = oper3(OCOND,$1,$3,$5); }
        ;
 
 compound_cond
@@ -140,15 +134,21 @@ expr      : term
                { $$ = $1; }
        | expr term
                { $$ = oper2(OCONCAT,$1,$2); }
+       | expr '?' expr ':' expr
+               { $$ = oper3(OCOND,$1,$3,$5); }
        | variable ASGNOP cond
-               { $$ = oper3(OASSIGN,$2,$1,$3);
-                       if ((ops[$1].ival & 255) == OFLD)
-                           lval_field = TRUE;
-                       if ((ops[$1].ival & 255) == OVFLD)
-                           lval_field = TRUE;
+               {
+                   $$ = oper3(OASSIGN,$2,$1,$3);
+                   if ((ops[$1].ival & 255) == OFLD)
+                       lval_field = TRUE;
+                   else if ((ops[$1].ival & 255) == OVFLD)
+                       lval_field = TRUE;
                }
        ;
 
+sprintf        : SPRINTF_NEW
+       | SPRINTF_OLD ;
+
 term   : variable
                { $$ = $1; }
        | NUMBER
@@ -169,16 +169,38 @@ term      : variable
                { $$ = oper2(OPOW,$1,$3); }
        | term IN VAR
                { $$ = oper2(ODEFINED,aryrefarg($3),$1); }
-       | term '?' term ':' term
-               { $$ = oper3(OCOND,$1,$3,$5); }
        | variable INCR
-               { $$ = oper1(OPOSTINCR,$1); }
+               {
+                   $$ = oper1(OPOSTINCR,$1);
+                   if ((ops[$1].ival & 255) == OFLD)
+                       lval_field = TRUE;
+                   else if ((ops[$1].ival & 255) == OVFLD)
+                       lval_field = TRUE;
+               }
        | variable DECR
-               { $$ = oper1(OPOSTDECR,$1); }
+               {
+                   $$ = oper1(OPOSTDECR,$1);
+                   if ((ops[$1].ival & 255) == OFLD)
+                       lval_field = TRUE;
+                   else if ((ops[$1].ival & 255) == OVFLD)
+                       lval_field = TRUE;
+               }
        | INCR variable
-               { $$ = oper1(OPREINCR,$2); }
+               {
+                   $$ = oper1(OPREINCR,$2);
+                   if ((ops[$2].ival & 255) == OFLD)
+                       lval_field = TRUE;
+                   else if ((ops[$2].ival & 255) == OVFLD)
+                       lval_field = TRUE;
+               }
        | DECR variable
-               { $$ = oper1(OPREDECR,$2); }
+               {
+                   $$ = oper1(OPREDECR,$2);
+                   if ((ops[$2].ival & 255) == OFLD)
+                       lval_field = TRUE;
+                   else if ((ops[$2].ival & 255) == OVFLD)
+                       lval_field = TRUE;
+               }
        | '-' term %prec UMINUS
                { $$ = oper1(OUMINUS,$2); }
        | '+' term %prec UMINUS
@@ -211,7 +233,9 @@ term        : variable
                { $$ = oper1($1,$3); }
        | USERFUN '(' expr_list ')'
                { $$ = oper2(OUSERFUN,$1,$3); }
-       | SPRINTF expr_list
+       | SPRINTF_NEW '(' expr_list ')'
+               { $$ = oper1(OSPRINTF,$3); }
+       | sprintf expr_list
                { $$ = oper1(OSPRINTF,$2); }
        | SUBSTR '(' expr ',' expr ',' expr ')'
                { $$ = oper3(OSUBSTR,$3,$5,$7); }
@@ -253,6 +277,8 @@ variable: VAR
                { $$ = oper2(OVAR,aryrefarg($1),$3); }
        | FIELD
                { $$ = oper1(OFLD,$1); }
+       | SVFIELD
+               { $$ = oper1(OVFLD,oper1(OVAR,$1)); }
        | VFIELD term
                { $$ = oper1(OVFLD,$2); }
        ;
@@ -368,7 +394,7 @@ simple
                { $$ = oper0(ORETURN); }
        | RET expr
                { $$ = oper1(ORETURN,$2); }
-       | DELETE VAR '[' expr ']'
+       | DELETE VAR '[' expr_list ']'
                { $$ = oper2(ODELETE,aryrefarg($2),$4); }
        ;
 
@@ -400,4 +426,7 @@ compound
        ;
 
 %%
+
+int yyparse (void);
+
 #include "a2py.c"