[asperl] added AS patch#3

[p5sagit/p5-mst-13.2.git] / perly.c

diff --git a/perly.c b/perly.c
index d6d465c..2cd4f05 100644 (file)
--- a/perly.c
+++ b/perly.c
@@ -6,11 +6,20 @@ static char yysccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/91";
 #include "EXTERN.h"
 #include "perl.h"
 
+#ifdef PERL_OBJECT
 static void
-dep()
+Dep(CPerlObj *pPerl)
+{
+    pPerl->deprecate("\"do\" to call subroutines");
+}
+#define dep() Dep(this)
+#else
+static void
+dep(void)
 {
     deprecate("\"do\" to call subroutines");
 }
+#endif
 
 #line 16 "perly.c"
 #define YYERRCODE 256
@@ -1303,8 +1312,7 @@ struct ysv {
 };
 
 void
-yydestruct(ptr)
-void* ptr;
+yydestruct(void *ptr)
 {
     struct ysv* ysave = (struct ysv*)ptr;
     if (ysave->yyss) Safefree(ysave->yyss);
@@ -1319,7 +1327,7 @@ void* ptr;
 }
 
 int
-yyparse()
+yyparse(void)
 {
     register int yym, yyn, yystate;
     register short *yyssp;
@@ -1330,8 +1338,10 @@ yyparse()
     int retval = 0;
 #if YYDEBUG
     register char *yys;
+#ifndef __cplusplus
     extern char *getenv();
 #endif
+#endif
 
     struct ysv *ysave = (struct ysv*)safemalloc(sizeof(struct ysv));
     SAVEDESTRUCTOR(yydestruct, ysave);
@@ -1643,7 +1653,7 @@ case 27:
                            yyval.opval = block_end(yyvsp[-4].ival,
                                   newSTATEOP(0, yyvsp[-7].pval,
                                     newWHILEOP(0, 1, (LOOP*)Nullop,
-                                               yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval))); }
+                                               yyvsp[-6].ival, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval))); }
 break;
 case 28:
 #line 192 "perly.y"
@@ -1651,7 +1661,7 @@ case 28:
                            yyval.opval = block_end(yyvsp[-4].ival,
                                   newSTATEOP(0, yyvsp[-7].pval,
                                     newWHILEOP(0, 1, (LOOP*)Nullop,
-                                               yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval))); }
+                                               yyvsp[-6].ival, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval))); }
 break;
 case 29:
 #line 198 "perly.y"
@@ -1671,19 +1681,19 @@ case 31:
 break;
 case 32:
 #line 209 "perly.y"
-{ copline = yyvsp[-9].ival;
-                           yyval.opval = block_end(yyvsp[-7].ival,
-                                  newSTATEOP(0, yyvsp[-10].pval,
-                                    append_elem(OP_LINESEQ, scalar(yyvsp[-6].opval),
-                                      newWHILEOP(0, 1, (LOOP*)Nullop,
-                                                 scalar(yyvsp[-4].opval),
-                                                 yyvsp[0].opval, scalar(yyvsp[-2].opval))))); }
+{ OP *forop = append_elem(OP_LINESEQ,
+                                       scalar(yyvsp[-6].opval),
+                                       newWHILEOP(0, 1, (LOOP*)Nullop,
+                                                  yyvsp[-9].ival, scalar(yyvsp[-4].opval),
+                                                  yyvsp[0].opval, scalar(yyvsp[-2].opval)));
+                         copline = yyvsp[-9].ival;
+                         yyval.opval = block_end(yyvsp[-7].ival, newSTATEOP(0, yyvsp[-10].pval, forop)); }
 break;
 case 33:
 #line 217 "perly.y"
-{ yyval.opval = newSTATEOP(0,
-                               yyvsp[-2].pval, newWHILEOP(0, 1, (LOOP*)Nullop,
-                                       Nullop, yyvsp[-1].opval, yyvsp[0].opval)); }
+{ yyval.opval = newSTATEOP(0, yyvsp[-2].pval,
+                                newWHILEOP(0, 1, (LOOP*)Nullop,
+                                           NOLINE, Nullop, yyvsp[-1].opval, yyvsp[0].opval)); }
 break;
 case 34:
 #line 223 "perly.y"