--- gforth/see.fs	1995/11/07 18:06:59	1.9
+++ gforth/see.fs	1996/08/21 14:58:44	1.13
@@ -25,6 +25,8 @@
 
 \ Ideas:        Level should be a stack
 
+require termsize.fs
+
 decimal
 
 \ Screen format words                                   16may93jaw
@@ -56,7 +58,7 @@ DEFER nlcount ' noop IS nlcount
                 XPos @ Level @ = ?Exit
                 C-Formated @ IF
                 C-Output @
-                IF C-Clearline @ IF 80 XPos @ - spaces
+                IF C-Clearline @ IF cols XPos @ - spaces
                                  ELSE cr THEN
                 1 YPos +! 0 XPos !
                 Level @ spaces
@@ -64,7 +66,7 @@ DEFER nlcount ' noop IS nlcount
 
 : warp?         ( len -- len )
                 nlflag @ IF (nl) nlflag off THEN
-                XPos @ over + 79 u> IF (nl) THEN ;
+                XPos @ over + cols u>= IF (nl) THEN ;
 
 : ctype         ( adr len -- )
                 warp? dup XPos +! C-Output @ IF type ELSE 2drop THEN ;
@@ -200,11 +202,13 @@ VARIABLE C-Pass
 : ahead? ( n -- flag ) 0> ;
 
 : c-(compile)
-        Display? IF s" POSTPONE " Com# .string
-                    dup @ look 0= ABORT" SEE: No valid XT"
-                    cell+ count $1F and 0 .string bl cemit
-                 THEN
-        cell+ ;
+    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
@@ -491,7 +495,7 @@ CREATE C-Table
         WHILE   2 pick <>
         WHILE   2 cells +
         REPEAT
-        nip cell+ @ EXECUTE
+        nip cell+ perform
         true
         ELSE
         2drop drop false
@@ -542,27 +546,31 @@ DEFER dosee
 : dopri .name ." is primitive" cr ;
 : dovar ." Variable " .name cr ;
 : douse ." User " .name cr ;
-: docon  dup cell+ (name>) >body @ . ." Constant " .name cr ;
-: doval  dup cell+ (name>) >body @ . ." Value " .name cr ;
+: docon  dup ((name>)) >body @ . ." Constant " .name cr ;
+: doval  dup ((name>)) >body @ . ." Value " .name cr ;
 : dodef ." Defer " dup >r .name cr
-    r@ cell+ (name>) >body @ look
+    r@ ((name>)) >body @ look
     0= ABORT" SEE: No valid xt in deferred word"
     dup dosee cr
     ." ' " .name r> ." IS " .name cr ;
 : dodoe ." Create " dup .name cr
-        S" DOES> " Com# .string XPos @ Level ! name>
+        S" DOES> " Com# .string XPos @ Level ! name>int
         >does-code dup C-Pass @ DebugMode = IF ScanMode c-pass ! EXIT THEN
         ScanMode c-pass ! dup makepass
         DisplayMode c-pass ! makepass ;
 : doali here @ .name ." Alias " .name cr
         here @ dosee ;
-: docol S" : " Com# .string
-        dup cell+ count $1F and 2 pick wordinfo .string bl cemit bl cemit
-        ( XPos @ ) 2 Level !
-        name> >body
-        C-Pass @ DebugMode = IF ScanMode c-pass ! EXIT THEN
-        ScanMode c-pass ! dup makepass
-        DisplayMode c-pass ! makepass ;
+: docol
+    S" : " Com# .string
+    dup name>string 2 pick wordinfo .string bl cemit bl cemit
+    ( XPos @ ) 2 Level !
+    name>int >body
+    C-Pass @ DebugMode =
+    IF
+	ScanMode c-pass ! EXIT
+    THEN
+    ScanMode c-pass ! dup makepass
+    DisplayMode c-pass ! makepass ;
 
 create wordtypes
         Pri# ,   ' dopri A,
@@ -582,8 +590,9 @@ create wordtypes
         wordtypes
         BEGIN dup @ dup
         WHILE 2 pick = IF cell+ @ nip EXECUTE
-	                  r> dup 32 and IF ."  immediate" THEN
-			         64 and IF ."  restrict" THEN EXIT THEN
+	                  r> dup immediate-mask and IF ."  immediate" THEN
+			  restrict-mask  and IF ."  restrict" THEN
+			  EXIT THEN
               2 cells +
         REPEAT
         2drop rdrop
@@ -596,8 +605,12 @@ create wordtypes
         cr c-init
         dosee ;
 
-: see   name sfind 0= IF ." Word unknown" cr exit THEN
-        xtc ;
+: see ( "name" -- ) \ tools
+    name find-name dup 0=
+    IF
+	drop -&13 bounce
+    THEN
+    name>int xtc ;
 
 : lfc   cr c-init cell+ dosee ;
 : nfc   cr c-init dosee ;