--- gforth/see.fs	1998/11/27 21:13:43	1.20
+++ gforth/see.fs	2000/06/14 20:31:47	1.27
@@ -72,8 +72,9 @@ DEFER nlcount ' noop IS nlcount
                 nlflag @ IF (nl) nlflag off THEN
                 XPos @ over + cols u>= IF (nl) THEN ;
 
-: c-to-upper
-  dup [char] a >= over [char] z <= and if  bl -  then ;
+: c-to-upper ( c1 -- c2 ) \ gforth
+    \ nac05feb1999 there is a primitive, toupper, with this function
+    dup [char] a >= over [char] z <= and if  bl -  then ;
 
 : ctype         ( adr len -- )
                 warp? dup XPos +! C-Output @ 
@@ -135,7 +136,7 @@ VARIABLE SearchPointer
 \ The branchtable consists of three entrys:
 \ address of branch , branch destination , branch type
 
-CREATE BranchTable 500 allot
+CREATE BranchTable 128 cells allot
 here 3 cells -
 ACONSTANT MaxTable
 
@@ -235,15 +236,6 @@ VARIABLE C-Pass
 : back? ( n -- flag ) 0< ;
 : ahead? ( n -- flag ) 0> ;
 
-: c-(compile)
-    Display?
-    IF
-	s" POSTPONE " Com# .string
-	dup @ look 0= ABORT" SEE: No valid XT"
-	name>string 0 .string bl cemit
-    THEN
-    cell+ ;
-
 : c-lit
     Display? IF
 	dup @ dup abs 0 <# #S rot sign #> 0 .string bl cemit
@@ -393,10 +385,6 @@ VARIABLE C-Pass
         THEN
         Debug? IF drop THEN ;
 
-: c-does>               \ end of create part
-        Display? IF S" DOES> " Com# .string THEN
-	maxaligned /does-handler + ;
-
 : c-abort"
         count 2dup + aligned -rot
         Display?
@@ -406,6 +394,22 @@ VARIABLE C-Pass
         ELSE    2drop
         THEN ;
 
+[IFDEF] (does>)
+: c-does>               \ end of create part
+        Display? IF S" DOES> " Com# .string THEN
+	maxaligned /does-handler + ;
+[THEN]
+
+[IFDEF] (compile)
+: c-(compile)
+    Display?
+    IF
+	s" POSTPONE " Com# .string
+	dup @ look 0= ABORT" SEE: No valid XT"
+	name>string 0 .string bl cemit
+    THEN
+    cell+ ;
+[THEN]
 
 CREATE C-Table
 	        ' lit A,            ' c-lit A,
@@ -428,9 +432,10 @@ CREATE C-Table
 [IFDEF] (-loop) ' (-loop) A,        ' c-loop A, [THEN]
         	' (next) A,         ' c-loop A,
         	' ;s A,             ' c-exit A,
-        	' (does>) A,        ' c-does> A,
         	' (abort") A,       ' c-abort" A,
-        	' (compile) A,      ' c-(compile) A,
+\ only defined if compiler is loaded
+[IFDEF] (compile) ' (compile) A,      ' c-(compile) A, [THEN]
+[IFDEF] (does>) ' (does>) A,        ' c-does> A, [THEN]
         	0 ,		here 0 ,
 
 avariable c-extender
@@ -509,12 +514,38 @@ Defer xt-see-xt ( xt -- )
     then
     space ;
 
-Defer discode ( addr -- )
-\  hook for the disassembler: disassemble code at addr (as far as the
-\  disassembler thinks is sensible)
-:noname ( addr -- )
-    drop ." ..." ;
-IS discode
+Defer discode ( addr u -- )
+\  hook for the disassembler: disassemble code at addr of length u
+' dump IS discode
+
+: next-head ( addr1 -- addr2 ) \ gforth
+    \G find the next header starting after addr1, up to here (unreliable).
+    here swap u+do
+	i head?
+	if
+	    i unloop exit
+	then
+    cell +loop
+    here ;
+
+: umin ( u1 u2 -- u )
+    2dup u>
+    if
+	swap
+    then
+    drop ;
+	
+: next-prim ( addr1 -- addr2 )
+    \G find the next primitive after addr1
+    1+ >r -1 primstart
+    begin ( umin head R: boundary )
+	@ dup
+    while
+	tuck name>int >code-address ( head1 umin c-addr )
+	r@ - umin
+	swap
+    repeat
+    drop r> + ;
 
 : seecode ( xt -- )
     dup s" Code" .defname
@@ -522,8 +553,14 @@ IS discode
     if
 	>code-address
     then
-    discode
-    ."  end-code" cr ;
+    dup in-dictionary? \ user-defined code word?
+    if
+	dup next-head
+    else
+	dup next-prim
+    then
+    over - discode
+    ." end-code" cr ;
 : seevar ( xt -- )
     s" Variable" .defname cr ;
 : seeuser ( xt -- )
@@ -537,10 +574,10 @@ IS discode
 : seedefer ( xt -- )
     dup >body @ xt-see-xt cr
     dup s" Defer" .defname cr
-    >name dup ??? = if
-	drop ." lastxt >body !"
-    else
+    >name ?dup-if
 	." IS " .name cr
+    else
+	." lastxt >body !"
     then ;
 : see-threaded ( addr -- )
     C-Pass @ DebugMode = IF
@@ -585,7 +622,8 @@ IS discode
 [ [IFDEF] dofield: ]
 	dofield: of seefield endof
 [ [THEN] ]
-	over >body of seecode endof
+	over       of seecode endof \ direct threaded code words
+	over >body of seecode endof \ indirect threaded code words
 	2drop abort" unknown word type"
     ENDCASE ;
 
@@ -616,10 +654,15 @@ IS discode
     then
     rdrop drop ;
 
-: see ( "name" -- ) \ tools
+: see ( "<spaces>name" -- ) \ tools
+    \G Locate @var{name} using the current search order. Display the
+    \G definition of @var{name}. Since this is achieved by decompiling
+    \G the definition, the formatting is mechanised and some source
+    \G information (comments, interpreted sequences within definitions
+    \G etc.) is lost.
     name find-name dup 0=
     IF
-	drop -&13 bounce
+	drop -&13 throw
     THEN
     name-see ;