--- gforth/see.fs	2000/11/13 22:10:30	1.33
+++ gforth/see.fs	2002/12/13 21:20:39	1.43
@@ -99,7 +99,7 @@ DEFER nlcount ' noop IS nlcount
                 IF 2drop ELSE XPos +! C-Output @ IF emit ELSE drop THEN
                 THEN ;
 
-DEFER .string
+DEFER .string ( c-addr u n -- )
 
 [IFDEF] Green
 VARIABLE Colors Colors on
@@ -254,6 +254,25 @@ VARIABLE C-Pass
     THEN
     cell+ ;
 
+: .word ( addr xt -- addr )
+    look 0= IF
+	drop dup 1 cells - @ dup body> look
+	IF
+	    nip dup ." <" name>string rot wordinfo .string ." >"
+	ELSE
+	    drop ." <" 0 .r ." >"
+	THEN
+    ELSE
+	dup cell+ @ immediate-mask and
+	IF
+	    bl cemit  ." POSTPONE "
+	THEN
+	dup name>string rot wordinfo .string
+    THEN ;
+
+: c-call
+    Display? IF  ." call " dup @ body> .word bl cemit  THEN  cell+ ;
+
 : .name-without ( addr -- addr )
 \ prints a name without () e.g. (+LOOP) or (s")
   dup 1 cells - @ look 
@@ -425,9 +444,10 @@ VARIABLE C-Pass
 
 CREATE C-Table
 	        ' lit A,            ' c-lit A,
-		' (s") A,	    ' c-c" A,
-       		 ' (.") A,	    ' c-c" A,
-        	' "lit A,           ' c-c" A,
+[IFDEF] call	' call A,           ' c-call A, [THEN]
+[IFDEF] (s")	' (s") A,	    ' c-c" A, [THEN]
+[IFDEF] (.")	' (.") A,	    ' c-c" A, [THEN]
+[IFDEF] "lit    ' "lit A,           ' c-c" A, [THEN]
 [IFDEF] (c")	' (c") A,	    ' c-c" A, [THEN]
         	' (do) A,           ' c-do A,
 [IFDEF] (+do)	' (+do) A,	    ' c-do A, [THEN]
@@ -444,7 +464,7 @@ CREATE C-Table
 [IFDEF] (-loop) ' (-loop) A,        ' c-loop A, [THEN]
         	' (next) A,         ' c-loop A,
         	' ;s A,             ' c-exit A,
-        	' (abort") A,       ' c-abort" A,
+[IFDEF] (abort") ' (abort") A,      ' c-abort" A, [THEN]
 \ only defined if compiler is loaded
 [IFDEF] (compile) ' (compile) A,      ' c-(compile) A, [THEN]
 [IFDEF] (does>) ' (does>) A,        ' c-does> A, [THEN]
@@ -463,7 +483,7 @@ c-extender !
 			( end!) 2drop false EXIT THEN 
 		THEN
 		\ jump over to extender, if any 26jan97jaw
-       		2 pick <>
+		xt>threaded 2 pick <>
         WHILE   2 cells +
         REPEAT
         nip cell+ perform
@@ -488,17 +508,15 @@ c-extender !
                   THEN ;
 
 : analyse ( a-addr1 -- a-addr2 )
-        Branches @ IF BranchTo? THEN
-        dup cell+ swap @
-        dup >r DoTable r> swap IF drop EXIT THEN
-        Display?
-        IF look 0= IF  drop dup 1 cells - @ ." <" 0 .r ." >"
-	ELSE
-	    dup cell+ count dup immediate-mask and
-	    IF  bl cemit  ." POSTPONE " THEN
-	    31 and rot wordinfo .string  THEN  bl cemit
-        ELSE drop
-        THEN ;
+    Branches @ IF BranchTo? THEN
+    dup cell+ swap @
+    dup >r DoTable r> swap IF drop EXIT THEN
+    Display?
+    IF
+	.word bl cemit
+    ELSE
+	drop
+    THEN ;
 
 : c-init
         0 YPos ! 0 XPos !
@@ -533,8 +551,7 @@ Defer discode ( addr u -- ) \ gforth
 : 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 head? -2 and if
 	    i unloop exit
 	then
     cell +loop
@@ -566,10 +583,7 @@ Defer discode ( addr u -- ) \ gforth
 
 : seecode ( xt -- )
     dup s" Code" .defname
-    threading-method
-    if
-	>code-address
-    then
+    >code-address
     dup in-dictionary? \ user-defined code word?
     if
 	dup next-head
@@ -661,7 +675,7 @@ Defer discode ( addr u -- ) \ gforth
     if \ normal or immediate word
 	swap xt-see (.immediate)
     else
-	r@ ['] compile-only-error =
+	r@ ['] ticking-compile-only-error =
 	if \ compile-only word
 	    swap xt-see (.immediate) ."  compile-only"
 	else \ interpret/compile word