--- gforth/see.fs	2000/06/14 20:31:47	1.27
+++ gforth/see.fs	2000/09/23 15:46:59	1.31
@@ -1,6 +1,6 @@
 \ SEE.FS       highend SEE for ANSforth                16may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 
 \ May be cross-compiled
@@ -514,8 +514,8 @@ Defer xt-see-xt ( xt -- )
     then
     space ;
 
-Defer discode ( addr u -- )
-\  hook for the disassembler: disassemble code at addr of length u
+Defer discode ( addr u -- ) \ gforth
+\G hook for the disassembler: disassemble code at addr of length u
 ' dump IS discode
 
 : next-head ( addr1 -- addr2 ) \ gforth
@@ -535,17 +535,22 @@ Defer discode ( addr u -- )
     then
     drop ;
 	
-: next-prim ( addr1 -- addr2 )
-    \G find the next primitive after addr1
+: next-prim ( addr1 -- addr2 ) \ gforth
+    \G find the next primitive after addr1 (unreliable)
     1+ >r -1 primstart
     begin ( umin head R: boundary )
 	@ dup
     while
-	tuck name>int >code-address ( head1 umin c-addr )
+	tuck name>int >code-address ( head1 umin ca R: boundary )
 	r@ - umin
 	swap
     repeat
-    drop r> + ;
+    drop dup r@ negate u>=
+    \ "umin+boundary within [0,boundary)" = "umin within [-boundary,0)"
+    if ( umin R: boundary ) \ no primitive found behind -> use a default length
+	drop 31
+    then
+    r> + ;
 
 : seecode ( xt -- )
     dup s" Code" .defname
@@ -598,7 +603,8 @@ Defer discode ( addr u -- )
     dup >body ." 0 " ? ." 0 0 "
     s" Field" .defname cr ;
 
-: xt-see ( xt -- )
+: xt-see ( xt -- ) \ gforth
+    \G Decompile the definition represented by @i{xt}.
     cr c-init
     dup >does-code
     if