--- gforth/see.fs	2003/03/08 13:29:55	1.50
+++ gforth/see.fs	2006/05/07 18:14:11	1.57
@@ -1,6 +1,6 @@
 \ SEE.FS       highend SEE for ANSforth                16may93jaw
 
-\ Copyright (C) 1995,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000,2003,2004 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -266,11 +266,11 @@ VARIABLE C-Pass
     \ print x as a word if possible
     dup look 0= IF
 	drop dup threaded>name dup 0= if
-	    2drop dup 1 cells - @ dup body> look
+	    drop over 1 cells - @ dup body> look
 	    IF
-		nip dup ." <" name>string rot wordinfo .string ." > "
+		nip nip dup ." <" name>string rot wordinfo .string ." > "
 	    ELSE
-		drop ." <" 0 .r ." > "
+		2drop ." <" 0 .r ." > "
 	    THEN
 	    EXIT
 	then
@@ -454,13 +454,13 @@ VARIABLE C-Pass
                 THEN
         THEN
         Debug?
-        IF      dup @ +
+        IF      @ \ !!! cross-interacts with debugger !!!
         ELSE    cell+
         THEN ;
 
 : DebugBranch
         Debug?
-        IF      dup @ over + swap THEN ; \ return 2 different addresses
+        IF      dup @ swap THEN ; \ return 2 different addresses
 
 : c-?branch
         Scan?
@@ -494,7 +494,7 @@ VARIABLE C-Pass
         Display? IF nl S" FOR" .struc level+ THEN ;
 
 : c-loop
-        Display? IF level- nl .name-without bl cemit nl THEN
+        Display? IF level- nl .name-without nl bl cemit THEN
         DebugBranch cell+ 
 	Scan? 
 	IF 	dup BranchAddr? 
@@ -513,13 +513,16 @@ VARIABLE C-Pass
     THEN
     DebugBranch cell+ ;
 
-: c-exit  dup 1 cells -
-        CheckEnd
-        IF      Display? IF nlflag off S" ;" Com# .string THEN
-                C-Stop on
-        ELSE    Display? IF S" EXIT " .struc THEN
-        THEN
-        Debug? IF drop THEN ;
+: c-exit ( addr1 -- addr2 )
+    dup 1 cells -
+    CheckEnd
+    IF
+	Display? IF nlflag off S" ;" Com# .string THEN
+	C-Stop on
+    ELSE
+	Display? IF S" EXIT " .struc THEN
+    THEN
+    Debug? IF drop THEN ; \ !!! cross-interacts with debugger !!!
 
 : c-abort"
         count 2dup + aligned -rot
@@ -670,13 +673,15 @@ Defer discode ( addr u -- ) \ gforth
     cell +loop
     here ;
 
+[ifundef] umin \ !! bootstrapping help
 : umin ( u1 u2 -- u )
     2dup u>
     if
 	swap
     then
     drop ;
-	
+[then]
+
 : next-prim ( addr1 -- addr2 ) \ gforth
     \G find the next primitive after addr1 (unreliable)
     1+ >r -1 primstart
@@ -721,7 +726,7 @@ Defer discode ( addr u -- ) \ gforth
     >name ?dup-if
 	." IS " .name cr
     else
-	." lastxt >body !"
+	." latestxt >body !"
     then ;
 : see-threaded ( addr -- )
     C-Pass @ DebugMode = IF
@@ -773,7 +778,7 @@ Defer discode ( addr u -- ) \ gforth
     ENDCASE ;
 
 : (xt-see-xt) ( xt -- )
-    xt-see cr ." lastxt" ;
+    xt-see cr ." latestxt" ;
 ' (xt-see-xt) is xt-see-xt
 
 : (.immediate) ( xt -- )
@@ -794,7 +799,7 @@ Defer discode ( addr u -- ) \ gforth
 	else \ interpret/compile word
 	    r@ xt-see-xt cr
 	    swap xt-see-xt cr
-	    ." interpret/compile " over .name (.immediate)
+	    ." interpret/compile: " over .name drop
 	then
     then
     rdrop drop ;