perl 5.000perl-5.000

[editor's note: this commit combines approximate 4 months of furious
releases of Andy Dougherty and Larry Wall - see pod/perlhist.pod for
details.  Andy notes that;
 
Alas neither my "Irwin AccuTrack" nor my DC 600A quarter-inch cartridge 
backup tapes from that era seem to be readable anymore.  I guess 13 years 
exceeds the shelf life for that backup technology :-(.
]

1 files changed, 52 insertions, 51 deletions

diff --git a/deb.c b/deb.c
index f1b375f911..d5627fa54f 100644
--- a/deb.c
+++ b/deb.c
@@ -1,45 +1,22 @@
-/* $RCSfile: op.c,v $$Revision: 4.1 $$Date: 92/08/07 17:19:16 $
+/*    deb.c
  *
- *    Copyright (c) 1991, Larry Wall
+ *    Copyright (c) 1991-1994, 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:	op.c,v $
- * Revision 4.1  92/08/07  17:19:16  lwall
- * Stage 6 Snapshot
- * 
- * Revision 4.0.1.5  92/06/08  12:00:39  lwall
- * patch20: the switch optimizer didn't do anything in subroutines
- * patch20: removed implicit int declarations on funcions
- * 
- * Revision 4.0.1.4  91/11/11  16:29:33  lwall
- * patch19: do {$foo ne "bar";} returned wrong value
- * patch19: some earlier patches weren't propagated to alternate 286 code
- * 
- * Revision 4.0.1.3  91/11/05  16:07:43  lwall
- * patch11: random cleanup
- * patch11: "foo\0" eq "foo" was sometimes optimized to true
- * patch11: foreach on null list could spring memory leak
- * 
- * Revision 4.0.1.2  91/06/07  10:26:45  lwall
- * patch4: new copyright notice
- * patch4: made some allowances for "semi-standard" C
- * 
- * Revision 4.0.1.1  91/04/11  17:36:16  lwall
- * patch1: you may now use "die" and "caller" in a signal handler
- * 
- * Revision 4.0  91/03/20  01:04:18  lwall
- * 4.0 baseline.
- * 
+ */
+
+/*
+ * "Didst thou think that the eyes of the White Tower were blind?  Nay, I
+ * have seen more than thou knowest, Gray Fool."  --Denethor
  */
 
 #include "EXTERN.h"
 #include "perl.h"
 
-void deb_growlevel();
-
-#if !defined(STANDARD_C) && !defined(I_VARARGS)
+#ifdef DEBUGGING
+#if !defined(I_STDARG) && !defined(I_VARARGS)
 
 /*
  * Fallback on the old hackers way of doing varargs
@@ -51,15 +28,17 @@ deb(pat,a1,a2,a3,a4,a5,a6,a7,a8)
     char *pat;
 {
     register I32 i;
+    GV* gv = curcop->cop_filegv;
 
     fprintf(stderr,"(%s:%ld)\t",
-	SvPVX(GvSV(curcop->cop_filegv)),(long)curcop->cop_line);
+	SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
+	(long)curcop->cop_line);
     for (i=0; i<dlevel; i++)
 	fprintf(stderr,"%c%c ",debname[i],debdelim[i]);
     fprintf(stderr,pat,a1,a2,a3,a4,a5,a6,a7,a8);
 }
 
-#else /* !defined(STANDARD_C) && !defined(I_VARARGS) */
+#else /* !defined(I_STDARG) && !defined(I_VARARGS) */
 
 #  ifdef STANDARD_C
 void
@@ -74,13 +53,15 @@ deb(pat, va_alist)
 {
     va_list args;
     register I32 i;
+    GV* gv = curcop->cop_filegv;
 
     fprintf(stderr,"(%s:%ld)\t",
-	SvPVX(GvSV(curcop->cop_filegv)),(long)curcop->cop_line);
+	SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
+	(long)curcop->cop_line);
     for (i=0; i<dlevel; i++)
 	fprintf(stderr,"%c%c ",debname[i],debdelim[i]);
 
-#  if STANDARD_C
+#  ifdef I_STDARG
     va_start(args, pat);
 #  else
     va_start(args);
@@ -88,7 +69,7 @@ deb(pat, va_alist)
     (void) vfprintf(stderr,pat,args);
     va_end( args );
 }
-#endif /* !defined(STANDARD_C) && !defined(I_VARARGS) */
+#endif /* !defined(I_STDARG) && !defined(I_VARARGS) */
 
 void
 deb_growlevel()
@@ -102,30 +83,50 @@ I32
 debstackptrs()
 {
     fprintf(stderr, "%8lx %8lx %8ld %8ld %8ld\n",
-	stack, stack_base, *markstack_ptr, stack_sp-stack_base, stack_max-stack_base);
-    fprintf(stderr, "%8lx %8lx %8ld %l8d %8ld\n",
-	mainstack, AvARRAY(stack), mainstack, AvFILL(stack), AvMAX(stack));
+	(unsigned long)stack, (unsigned long)stack_base,
+	(long)*markstack_ptr, (long)(stack_sp-stack_base),
+	(long)(stack_max-stack_base));
+    fprintf(stderr, "%8lx %8lx %8ld %8ld %8ld\n",
+	(unsigned long)mainstack, (unsigned long)AvARRAY(stack),
+	(long)mainstack, (long)AvFILL(stack), (long)AvMAX(stack));
     return 0;
 }
 
 I32
 debstack()
 {
-    register I32 i;
-    I32 markoff = markstack_ptr > markstack ? *markstack_ptr : -1;
+    I32 top = stack_sp - stack_base;
+    register I32 i = top - 30;
+    I32 *markscan = markstack;
+
+    if (i < 0)
+	i = 0;
+    
+    while (++markscan <= markstack_ptr)
+	if (*markscan >= i)
+	    break;
 
-    fprintf(stderr, "     =>");
-    if (stack_base[0] || stack_sp < stack_base)
+    fprintf(stderr, i ? "    =>  ...  " : "    =>  ");
+    if (stack_base[0] != &sv_undef || stack_sp < stack_base)
 	fprintf(stderr, " [STACK UNDERFLOW!!!]\n");
-    for (i = 1; i <= 30; i++) {
-	if (stack_sp >= &stack_base[i])
-	{
-	    fprintf(stderr, "\t%-4s%s%s", SvPEEK(stack_base[i]),
-		markoff == i ? " [" : "",
-		stack_sp == &stack_base[i] ?
-			(markoff == i ? "]" : " ]") : "");
+    do {
+	++i;
+	if (markscan <= markstack_ptr && *markscan < i) {
+	    do {
+		++markscan;
+		putc('*', stderr);
+	    }
+	    while (markscan <= markstack_ptr && *markscan < i);
+	    fprintf(stderr, "  ");
 	}
+	if (i > top)
+	    break;
+	fprintf(stderr, "%-4s  ", SvPEEK(stack_base[i]));
     }
+    while (1);
     fprintf(stderr, "\n");
     return 0;
 }
+#else
+static int dummy; /* avoid totally empty deb.o file */
+#endif /* DEBUGGING */