Mention Solaris x86 use64bitint troubles.

[p5sagit/p5-mst-13.2.git] / x2p / a2p.y

diff --git a/x2p/a2p.y b/x2p/a2p.y
index 961e2f2..b0da9df 100644 (file)
--- a/x2p/a2p.y
+++ b/x2p/a2p.y
@@ -1,7 +1,7 @@
 %{
 /* $RCSfile: a2p.y,v $$Revision: 4.1 $$Date: 92/08/07 18:29:12 $
  *
- *    Copyright (c) 1991, Larry Wall
+ *    Copyright (c) 1991-2002, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -21,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
@@ -133,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)
@@ -142,6 +144,9 @@ expr        : term
                }
        ;
 
+sprintf        : SPRINTF_NEW
+       | SPRINTF_OLD ;
+
 term   : variable
                { $$ = $1; }
        | NUMBER
@@ -162,8 +167,6 @@ term        : variable
                { $$ = oper2(OPOW,$1,$3); }
        | term IN VAR
                { $$ = oper2(ODEFINED,aryrefarg($3),$1); }
-       | cond '?' expr ':' expr
-               { $$ = oper3(OCOND,$1,$3,$5); }
        | variable INCR
                { $$ = oper1(OPOSTINCR,$1); }
        | variable DECR
@@ -204,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); }
@@ -393,4 +398,7 @@ compound
        ;
 
 %%
+
+int yyparse (void);
+
 #include "a2py.c"