X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=3d48139d8836620efbb2a58302fa9c2f6ba380d8;hb=02d51d12d1be7a3f46d87dbd220b0acd1f787f57;hp=371717ad6a43e4be515e0f314a19973234661b37;hpb=85e6fe838fb25b257a1b363debf8691c0992ef71;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/run.c b/run.c
index 371717a..3d48139 100644
--- a/run.c
+++ b/run.c
@@ -1,67 +1,31 @@
+/*    run.c
+ *
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ *    2000, 2001, by Larry Wall and others
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ */
+
 #include "EXTERN.h"
+#define PERL_IN_RUN_C
 #include "perl.h"
 
-char **watchaddr = 0;
-char *watchok;
-
-#ifndef DEBUGGING
-
-run() {
-    while ( op = (*op->op_ppaddr)() ) ;
-}
-
-#else
-
-run() {
-    if (!op) {
-	warn("NULL OP IN RUN");
-	return;
-    }
-    do {
-	if (debug) {
-	    if (watchaddr != 0 && *watchaddr != watchok)
-		fprintf(stderr, "WARNING: %lx changed from %lx to %lx\n",
-		    watchaddr, watchok, *watchaddr);
-	    DEBUG_s(debstack());
-	    DEBUG_t(debop(op));
-	}
-    } while ( op = (*op->op_ppaddr)() );
-}
-
-#endif
+/*
+ * "Away now, Shadowfax!  Run, greatheart, run as you have never run before!
+ * Now we are come to the lands where you were foaled, and every stone you
+ * know.  Run now!  Hope is in speed!"  --Gandalf
+ */
 
-I32
-debop(op)
-OP *op;
+int
+Perl_runops_standard(pTHX)
 {
-    SV *sv;
-    deb("%s", op_name[op->op_type]);
-    switch (op->op_type) {
-    case OP_CONST:
-	fprintf(stderr, "(%s)", SvPEEK(cSVOP->op_sv));
-	break;
-    case OP_GVSV:
-    case OP_GV:
-	if (cGVOP->op_gv) {
-	    sv = NEWSV(0,0);
-	    gv_fullname(sv, cGVOP->op_gv);
-	    fprintf(stderr, "(%s)", SvPV(sv, na));
-	    SvREFCNT_dec(sv);
-	}
-	else
-	    fprintf(stderr, "(NULL)");
-	break;
+    while ((PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX))) {
+	PERL_ASYNC_CHECK();
     }
-    fprintf(stderr, "\n");
+
+    TAINT_NOT;
     return 0;
 }
 
-void
-watch(addr)
-char **addr;
-{
-    watchaddr = addr;
-    watchok = *addr;
-    fprintf(stderr, "WATCHING, %lx is currently %lx\n",
-	watchaddr, watchok);
-}