yacc clarification.

[perl5.git] / run.c

diff --git a/run.c b/run.c
index 811e41a..97444ec 100644 (file)
--- a/run.c
+++ b/run.c
@@ -17,21 +17,24 @@
  */
 
 #ifdef PERL_OBJECT
-#define CALLOP this->*op
+#define CALLOP this->*PL_op
 #else
-#define CALLOP *op
+#define CALLOP *PL_op
 #endif
 
 int
-runops_standard(void) {
+runops_standard(void)
+{
     dTHR;
 
-    while ( op = (CALLOP->op_ppaddr)(ARGS) ) ;
+    while ( PL_op = (CALLOP->op_ppaddr)(ARGS) ) ;
 
     TAINT_NOT;
     return 0;
 }
 
+#ifdef DEBUGGING
+
 dEXT char **watchaddr = 0;
 dEXT char *watchok;
 
@@ -39,32 +42,34 @@ dEXT char *watchok;
 static void debprof _((OP*o));
 #endif
 
+#endif /* DEBUGGING */
+
 int
 runops_debug(void)
 {
 #ifdef DEBUGGING
     dTHR;
-    if (!op) {
+    if (!PL_op) {
        warn("NULL OP IN RUN");
        return 0;
     }
 
     do {
-       if (debug) {
+       if (PL_debug) {
            if (watchaddr != 0 && *watchaddr != watchok)
                PerlIO_printf(Perl_debug_log, "WARNING: %lx changed from %lx to %lx\n",
                    (long)watchaddr, (long)watchok, (long)*watchaddr);
            DEBUG_s(debstack());
-           DEBUG_t(debop(op));
-           DEBUG_P(debprof(op));
+           DEBUG_t(debop(PL_op));
+           DEBUG_P(debprof(PL_op));
        }
-    } while ( op = (CALLOP->op_ppaddr)(ARGS) );
+    } while ( PL_op = (CALLOP->op_ppaddr)(ARGS) );
 
     TAINT_NOT;
     return 0;
 #else
     return runops_standard();
-#endif /* DEBUGGING */
+#endif /* DEBUGGING */
 }
 
 I32
@@ -82,7 +87,7 @@ debop(OP *o)
        if (cGVOPo->op_gv) {
            sv = NEWSV(0,0);
            gv_fullname3(sv, cGVOPo->op_gv, Nullch);
-           PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, na));
+           PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, PL_na));
            SvREFCNT_dec(sv);
        }
        else
@@ -92,7 +97,7 @@ debop(OP *o)
        break;
     }
     PerlIO_printf(Perl_debug_log, "\n");
-#endif /* DEBUGGING */
+#endif /* DEBUGGING */
     return 0;
 }
 
@@ -104,16 +109,16 @@ watch(char **addr)
     watchok = *addr;
     PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
        (long)watchaddr, (long)watchok);
-#endif /* DEBUGGING */
+#endif /* DEBUGGING */
 }
 
 STATIC void
 debprof(OP *o)
 {
 #ifdef DEBUGGING
-    if (!profiledata)
-       New(000, profiledata, MAXO, U32);
-    ++profiledata[o->op_type];
+    if (!PL_profiledata)
+       Newz(000, PL_profiledata, MAXO, U32);
+    ++PL_profiledata[o->op_type];
 #endif /* DEBUGGING */
 }
 
@@ -122,12 +127,13 @@ debprofdump(void)
 {
 #ifdef DEBUGGING
     unsigned i;
-    if (!profiledata)
+    if (!PL_profiledata)
        return;
     for (i = 0; i < MAXO; i++) {
-       if (profiledata[i])
+       if (PL_profiledata[i])
            PerlIO_printf(Perl_debug_log,
-                         "%u\t%lu\n", i, (unsigned long)profiledata[i]);
+                         "%5lu %s\n", (unsigned long)PL_profiledata[i],
+                                       op_name[i]);
     }
-#endif /* DEBUGGING */
+#endif /* DEBUGGING */
 }