check in all confperl changes as of change#1964 into cfgperl

[perl5.git] / x2p / a2p.y

diff --git a/x2p/a2p.y b/x2p/a2p.y
index f333dad..2d3f239 100644 (file)
--- a/x2p/a2p.y
+++ b/x2p/a2p.y
@@ -1,23 +1,12 @@
 %{
 /* $RCSfile: a2p.y,v $$Revision: 4.1 $$Date: 92/08/07 18:29:12 $
  *
- *    Copyright (c) 1991, Larry Wall
+ *    Copyright (c) 1991-1997, 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.
  *
  * $Log:       a2p.y,v $
- * Revision 4.1  92/08/07  18:29:12  lwall
- * 
- * 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"
@@ -105,6 +94,8 @@ cond : expr
        | match
        | rel
        | compound_cond
+       | cond '?' expr ':' expr
+               { $$ = oper3(OCOND,$1,$3,$5); }
        ;
 
 compound_cond
@@ -142,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)
@@ -171,8 +164,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
@@ -370,7 +361,7 @@ simple
                { $$ = oper0(ORETURN); }
        | RET expr
                { $$ = oper1(ORETURN,$2); }
-       | DELETE VAR '[' expr ']'
+       | DELETE VAR '[' expr_list ']'
                { $$ = oper2(ODELETE,aryrefarg($2),$4); }
        ;
 
@@ -402,4 +393,7 @@ compound
        ;
 
 %%
+
+int yyparse _((void));
+
 #include "a2py.c"