Make the 64-bit tests more paranoid.

[perl5.git] / x2p / a2p.y

diff --git a/x2p/a2p.y b/x2p/a2p.y
index 1a1e61e..da9b628 100644 (file)
--- a/x2p/a2p.y
+++ b/x2p/a2p.y
@@ -1,25 +1,12 @@
 %{
-/* $Header: a2p.y,v 3.0.1.3 91/01/11 18:35:57 lwall Locked $
+/* $RCSfile: a2p.y,v $$Revision: 4.1 $$Date: 92/08/07 18:29:12 $
  *
- *    Copyright (c) 1989, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
- *    You may distribute under the terms of the GNU General Public License
- *    as specified in the README file that comes with the perl 3.0 kit.
+ *    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 3.0.1.3  91/01/11  18:35:57  lwall
- * patch42: a2p didn't recognize split with regular expression
- * patch42: a2p didn't handle > redirection right
- * 
- * Revision 3.0.1.2  90/08/09  05:47:26  lwall
- * patch19: a2p didn't handle {foo = (bar == 123)}
- * 
- * Revision 3.0.1.1  90/03/01  10:30:08  lwall
- * patch9: a2p didn't allow logical expressions everywhere it should
- * 
- * Revision 3.0  89/10/18  15:34:29  lwall
- * 3.0 baseline
- * 
  */
 
 #include "INTERN.h"
@@ -34,7 +21,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
@@ -107,6 +94,8 @@ cond : expr
        | match
        | rel
        | compound_cond
+       | cond '?' expr ':' expr
+               { $$ = oper3(OCOND,$1,$3,$5); }
        ;
 
 compound_cond
@@ -144,6 +133,8 @@ 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)
@@ -153,6 +144,9 @@ expr        : term
                }
        ;
 
+sprintf        : SPRINTF_NEW
+       | SPRINTF_OLD ;
+
 term   : variable
                { $$ = $1; }
        | NUMBER
@@ -173,8 +167,6 @@ 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); }
        | variable DECR
@@ -191,18 +183,18 @@ term      : variable
                { $$ = oper1(OPAREN,$2); }
        | GETLINE
                { $$ = oper0(OGETLINE); }
-       | GETLINE VAR
+       | GETLINE variable
                { $$ = oper1(OGETLINE,$2); }
        | GETLINE '<' expr
                { $$ = oper3(OGETLINE,Nullop,string("<",1),$3);
                    if (ops[$3].ival != OSTR + (1<<8)) do_fancy_opens = TRUE; }
-       | GETLINE VAR '<' expr
+       | GETLINE variable '<' expr
                { $$ = oper3(OGETLINE,$2,string("<",1),$4);
                    if (ops[$4].ival != OSTR + (1<<8)) do_fancy_opens = TRUE; }
        | term 'p' GETLINE
                { $$ = oper3(OGETLINE,Nullop,string("|",1),$1);
                    if (ops[$1].ival != OSTR + (1<<8)) do_fancy_opens = TRUE; }
-       | term 'p' GETLINE VAR
+       | term 'p' GETLINE variable
                { $$ = oper3(OGETLINE,$4,string("|",1),$1);
                    if (ops[$1].ival != OSTR + (1<<8)) do_fancy_opens = TRUE; }
        | FUN1
@@ -215,7 +207,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); }
@@ -372,7 +366,7 @@ simple
                { $$ = oper0(ORETURN); }
        | RET expr
                { $$ = oper1(ORETURN,$2); }
-       | DELETE VAR '[' expr ']'
+       | DELETE VAR '[' expr_list ']'
                { $$ = oper2(ODELETE,aryrefarg($2),$4); }
        ;
 
@@ -404,4 +398,7 @@ compound
        ;
 
 %%
+
+int yyparse (void);
+
 #include "a2py.c"