Edited "behind my back" ...

p4raw-id: //depot/ansiperl@1535

diff --git a/vms/perly_c.vms b/vms/perly_c.vms
index add6b39..95e0dcc 100644 (file)
--- a/vms/perly_c.vms
+++ b/vms/perly_c.vms
@@ -1520,9 +1520,9 @@ case 1:
 #line 86 "perly.y"
 {
 #if defined(YYDEBUG) && defined(DEBUGGING)
-                   yydebug = (debug & 1);
+                   yydebug = (PL_debug & 1);
 #endif
-                   expect = XSTATE;
+                   PL_expect = XSTATE;
                }
 break;
 case 2:
@@ -1531,8 +1531,8 @@ case 2:
 break;
 case 3:
 #line 97 "perly.y"
-{ if (copline > (line_t)yyvsp[-3].ival)
-                             copline = yyvsp[-3].ival;
+{ if (PL_copline > (line_t)yyvsp[-3].ival)
+                             PL_copline = yyvsp[-3].ival;
                          yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); }
 break;
 case 4:
@@ -1541,8 +1541,8 @@ case 4:
 break;
 case 5:
 #line 107 "perly.y"
-{ if (copline > (line_t)yyvsp[-3].ival)
-                             copline = yyvsp[-3].ival;
+{ if (PL_copline > (line_t)yyvsp[-3].ival)
+                             PL_copline = yyvsp[-3].ival;
                          yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); }
 break;
 case 6:
@@ -1561,8 +1561,8 @@ case 9:
 #line 121 "perly.y"
 {   yyval.opval = append_list(OP_LINESEQ,
                                (LISTOP*)yyvsp[-1].opval, (LISTOP*)yyvsp[0].opval);
-                           pad_reset_pending = TRUE;
-                           if (yyvsp[-1].opval && yyvsp[0].opval) hints |= HINT_BLOCK_SCOPE; }
+                           PL_pad_reset_pending = TRUE;
+                           if (yyvsp[-1].opval && yyvsp[0].opval) PL_hints |= HINT_BLOCK_SCOPE; }
 break;
 case 10:
 #line 128 "perly.y"
@@ -1575,14 +1575,14 @@ case 12:
                            }
                            else {
                              yyval.opval = Nullop;
-                             copline = NOLINE;
+                             PL_copline = NOLINE;
                            }
-                           expect = XSTATE; }
+                           PL_expect = XSTATE; }
 break;
 case 13:
 #line 140 "perly.y"
 { yyval.opval = newSTATEOP(0, yyvsp[-2].pval, yyvsp[-1].opval);
-                         expect = XSTATE; }
+                         PL_expect = XSTATE; }
 break;
 case 14:
 #line 145 "perly.y"
@@ -1623,20 +1623,20 @@ case 22:
 break;
 case 23:
 #line 166 "perly.y"
-{ copline = yyvsp[-5].ival;
+{ PL_copline = yyvsp[-5].ival;
                            yyval.opval = newSTATEOP(0, Nullch,
                                   newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval));
-                           hints |= HINT_BLOCK_SCOPE; }
+                           PL_hints |= HINT_BLOCK_SCOPE; }
 break;
 case 24:
 #line 173 "perly.y"
-{ copline = yyvsp[-6].ival;
+{ PL_copline = yyvsp[-6].ival;
                            yyval.opval = block_end(yyvsp[-4].ival,
                                   newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); }
 break;
 case 25:
 #line 177 "perly.y"
-{ copline = yyvsp[-6].ival;
+{ PL_copline = yyvsp[-6].ival;
                            yyval.opval = block_end(yyvsp[-4].ival,
                                   newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); }
 break;
@@ -1650,7 +1650,7 @@ case 27:
 break;
 case 28:
 #line 189 "perly.y"
-{ copline = yyvsp[-6].ival;
+{ PL_copline = yyvsp[-6].ival;
                            yyval.opval = block_end(yyvsp[-4].ival,
                                   newSTATEOP(0, yyvsp[-7].pval,
                                     newWHILEOP(0, 1, (LOOP*)Nullop,
@@ -1658,7 +1658,7 @@ case 28:
 break;
 case 29:
 #line 195 "perly.y"
-{ copline = yyvsp[-6].ival;
+{ PL_copline = yyvsp[-6].ival;
                            yyval.opval = block_end(yyvsp[-4].ival,
                                   newSTATEOP(0, yyvsp[-7].pval,
                                     newWHILEOP(0, 1, (LOOP*)Nullop,
@@ -1687,7 +1687,7 @@ case 33:
                                        newWHILEOP(0, 1, (LOOP*)Nullop,
                                                   yyvsp[-9].ival, scalar(yyvsp[-4].opval),
                                                   yyvsp[0].opval, scalar(yyvsp[-2].opval)));
-                         copline = yyvsp[-9].ival;
+                         PL_copline = yyvsp[-9].ival;
                          yyval.opval = block_end(yyvsp[-7].ival, newSTATEOP(0, yyvsp[-10].pval, forop)); }
 break;
 case 34:
@@ -1774,10 +1774,10 @@ case 56:
 break;
 case 57:
 #line 294 "perly.y"
-{ char *name = SvPV(((SVOP*)yyvsp[0].opval)->op_sv, na);
+{ char *name = SvPV(((SVOP*)yyvsp[0].opval)->op_sv, PL_na);
                          if (strEQ(name, "BEGIN") || strEQ(name, "END")
                              || strEQ(name, "INIT"))
-                             CvUNIQUE_on(compcv);
+                             CvUNIQUE_on(PL_compcv);
                          yyval.opval = yyvsp[0].opval; }
 break;
 case 58:
@@ -1790,7 +1790,7 @@ case 60:
 break;
 case 61:
 #line 307 "perly.y"
-{ yyval.opval = Nullop; expect = XSTATE; }
+{ yyval.opval = Nullop; PL_expect = XSTATE; }
 break;
 case 62:
 #line 311 "perly.y"
@@ -1802,7 +1802,7 @@ case 63:
 break;
 case 64:
 #line 317 "perly.y"
-{ CvUNIQUE_on(compcv); /* It's a BEGIN {} */ }
+{ CvUNIQUE_on(PL_compcv); /* It's a BEGIN {} */ }
 break;
 case 65:
 #line 319 "perly.y"
@@ -2046,21 +2046,21 @@ break;
 case 123:
 #line 465 "perly.y"
 { yyval.opval = newBINOP(OP_HELEM, 0, oopsHV(yyvsp[-4].opval), jmaybe(yyvsp[-2].opval));
-                           expect = XOPERATOR; }
+                           PL_expect = XOPERATOR; }
 break;
 case 124:
 #line 468 "perly.y"
 { yyval.opval = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF(yyvsp[-5].opval),OP_RV2HV),
                                        jmaybe(yyvsp[-2].opval));
-                           expect = XOPERATOR; }
+                           PL_expect = XOPERATOR; }
 break;
 case 125:
 #line 473 "perly.y"
 { assertref(yyvsp[-4].opval); yyval.opval = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF(yyvsp[-4].opval),OP_RV2HV),
                                        jmaybe(yyvsp[-2].opval));
-                           expect = XOPERATOR; }
+                           PL_expect = XOPERATOR; }
 break;
 case 126:
 #line 478 "perly.y"
@@ -2085,7 +2085,7 @@ case 129:
                                    newLISTOP(OP_HSLICE, 0,
                                        list(yyvsp[-2].opval),
                                        ref(oopsHV(yyvsp[-4].opval), OP_HSLICE)));
-                           expect = XOPERATOR; }
+                           PL_expect = XOPERATOR; }
 break;
 case 130:
 #line 495 "perly.y"
@@ -2165,7 +2165,7 @@ break;
 case 143:
 #line 544 "perly.y"
 { yyval.opval = newOP(yyvsp[0].ival, OPf_SPECIAL);
-                           hints |= HINT_BLOCK_SCOPE; }
+                           PL_hints |= HINT_BLOCK_SCOPE; }
 break;
 case 144:
 #line 547 "perly.y"
@@ -2251,7 +2251,7 @@ case 165:
 break;
 case 166:
 #line 597 "perly.y"
-{ in_my = 0; yyval.opval = my(yyvsp[0].opval); }
+{ PL_in_my = 0; yyval.opval = my(yyvsp[0].opval); }
 break;
 case 167:
 #line 601 "perly.y"