X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fa2p.y;h=b0da9df400e4ec86449f43c3d88e9a74bc188141;hb=158b3652342ca691c9e3b061a1d78456ae1a9b4a;hp=4b81f3058156bb4f43b922a208d69e5949b44e93;hpb=ff0cee690d2ef6ba882e59dd4baaa0c944adb7a2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/a2p.y b/x2p/a2p.y
index 4b81f30..b0da9df 100644
--- 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
@@ -144,6 +144,9 @@ expr	: term
 		}
 	;
 
+sprintf	: SPRINTF_NEW
+	| SPRINTF_OLD ;
+
 term	: variable
 		{ $$ = $1; }
 	| NUMBER
@@ -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); }
@@ -394,6 +399,6 @@ compound
 
 %%
 
-int yyparse _((void));
+int yyparse (void);
 
 #include "a2py.c"