Diff for /gforth/see.fs between versions 1.47 and 1.67

version 1.47, 2003/01/04 08:26:57 version 1.67, 2010/04/18 06:18:36
Line 1 Line 1
 \ SEE.FS       highend SEE for ANSforth                16may93jaw  \ SEE.FS       highend SEE for ANSforth                16may93jaw
   
 \ Copyright (C) 1995,2000 Free Software Foundation, Inc.  \ Copyright (C) 1995,2000,2003,2004,2006,2007,2008 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ modify it under the terms of the GNU General Public License
 \ as published by the Free Software Foundation; either version 2  \ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program. If not, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   
   
 \ May be cross-compiled  \ May be cross-compiled
Line 28 Line 27
 require look.fs  require look.fs
 require termsize.fs  require termsize.fs
 require wordinfo.fs  require wordinfo.fs
 [IFUNDEF] .name  
 : id. ( nt -- ) \ gforth  
     \G Print the name of the word represented by @var{nt}.  
     \ this name comes from fig-Forth  
     name>string type space ;  
   
 ' id. alias .id ( nt -- )  
 \G F83 name for @code{id.}.  
   
 ' id. alias .name ( nt -- )  
 \G Gforth <=0.5.0 name for @code{id.}.  
   
 [THEN]  
   
 decimal  decimal
   
Line 84  DEFER nlcount ' noop IS nlcount Line 70  DEFER nlcount ' noop IS nlcount
                 nlflag @ IF (nl) nlflag off THEN                  nlflag @ IF (nl) nlflag off THEN
                 XPos @ over + cols u>= IF (nl) THEN ;                  XPos @ over + cols u>= IF (nl) 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 -- )  : ctype         ( adr len -- )
                 warp? dup XPos +! C-Output @                   warp? dup XPos +! C-Output @ 
                 IF uppercase @ IF bounds ?DO i c@ c-to-upper emit LOOP                  IF uppercase @ IF bounds ?DO i c@ toupper emit LOOP
                                   uppercase off ELSE type THEN                                    uppercase off ELSE type THEN
                 ELSE 2drop THEN ;                  ELSE 2drop THEN ;
   
Line 137  VARIABLE Colors Colors on Line 119  VARIABLE Colors Colors on
                     else                      else
                         base @ >r try                          base @ >r try
                             8 base ! 0 <<# # # # '\ hold #> ctype #>> 0                              8 base ! 0 <<# # # # '\ hold #> ctype #>> 0
                         recover                          restore
                               r@ base !
                         endtry                          endtry
                         r> base ! throw                          rdrop throw
                     endif                      endif
                 endif                  endif
                 1 /string                  1 /string
Line 278  VARIABLE C-Pass Line 261  VARIABLE C-Pass
 : .word ( addr x -- addr )  : .word ( addr x -- addr )
     \ print x as a word if possible      \ print x as a word if possible
     dup look 0= IF      dup look 0= IF
         drop dup threaded>name 0= if          drop dup threaded>name dup 0= if
             2drop dup 1 cells - @ dup body> look              drop over 1 cells - @ dup body> look
             IF              IF
                 nip dup ." <" name>string rot wordinfo .string ." > "                  nip nip dup ." <" name>string rot wordinfo .string ." > "
             ELSE              ELSE
                 drop ." <" 0 .r ." > "                  2drop ." <" 0 .r ." > "
             THEN              THEN
             EXIT              EXIT
         then          then
Line 331  VARIABLE C-Pass Line 314  VARIABLE C-Pass
     cell+ ;      cell+ ;
   
 : .name-without ( addr -- addr )  : .name-without ( addr -- addr )
 \ prints a name without a() e.g. a(+LOOP) or (s")      \ !! the stack effect cannot be correct
     dup 1 cells - @ threaded>name IF      \ prints a name without a() e.g. a(+LOOP) or (s")
       dup 1 cells - @ threaded>name dup IF
         name>string over c@ 'a = IF          name>string over c@ 'a = IF
             1 /string              1 /string
         THEN          THEN
Line 358  VARIABLE C-Pass Line 342  VARIABLE C-Pass
     \ if f is false, addr2=addr1      \ if f is false, addr2=addr1
     \ recognizes the following patterns:      \ recognizes the following patterns:
     \ c":     ahead X: len string then lit X      \ c":     ahead X: len string then lit X
     \ s\":    ahead X: string then lit X lit len      \ flit:   ahead X: float      then lit X f@
     \ .\":    ahead X: string then lit X lit len type      \ s\":    ahead X: string     then lit X lit len
       \ .\":    ahead X: string     then lit X lit len type
     \ !! not recognized anywhere:      \ !! not recognized anywhere:
     \ abort": if ahead X: len string then lit X c(abort") then      \ abort": if ahead X: len string then lit X c(abort") then
     dup @ back? if false exit endif      dup @ back? if false exit endif
Line 367  VARIABLE C-Pass Line 352  VARIABLE C-Pass
     r@ @ decompile-prim ['] lit xt>threaded <> if rdrop false exit endif      r@ @ decompile-prim ['] lit xt>threaded <> if rdrop false exit endif
     r@ cell+ @ over cell+ <> if rdrop false exit endif      r@ cell+ @ over cell+ <> if rdrop false exit endif
     \ we have at least C"      \ we have at least C"
     r@ 2 cells + @ decompile-prim ['] lit xt>threaded = if      r@ 2 cells + @ decompile-prim dup ['] lit xt>threaded = if
         r@ 3 cells + @ over cell+ + aligned r@ = if          drop r@ 3 cells + @ over cell+ + aligned r@ = if
             \ we have at least s"              \ we have at least s"
             r@ 4 cells + @ decompile-prim ['] lit-perform xt>threaded =              r@ 4 cells + @ decompile-prim ['] lit-perform xt>threaded =
             r@ 5 cells + @ ['] type >body = and if              r@ 5 cells + @ ['] type >body = and if
Line 385  VARIABLE C-Pass Line 370  VARIABLE C-Pass
             nip cells r> + true exit              nip cells r> + true exit
         endif          endif
     endif      endif
       ['] f@ xt>threaded = if
           display? if
               r@ cell+ @ f@ 10 8 16 f>str-rdp 0 .string bl cemit
           endif
           drop r> 3 cells + true exit
       endif
     \ !! check if count matches space?      \ !! check if count matches space?
     display? if      display? if
         s\" c\" " 0 .string r@ cell+ @ count 0 .string '" cemit bl cemit          s\" c\" " 0 .string r@ cell+ @ count 0 .string '" cemit bl cemit
Line 459  VARIABLE C-Pass Line 450  VARIABLE C-Pass
                 THEN                  THEN
         THEN          THEN
         Debug?          Debug?
         IF      dup @ +          IF      @ \ !!! cross-interacts with debugger !!!
         ELSE    cell+          ELSE    cell+
         THEN ;          THEN ;
   
 : DebugBranch  : DebugBranch
         Debug?          Debug?
         IF      dup @ over + swap THEN ; \ return 2 different addresses          IF      dup @ swap THEN ; \ return 2 different addresses
   
 : c-?branch  : c-?branch
         Scan?          Scan?
Line 499  VARIABLE C-Pass Line 490  VARIABLE C-Pass
         Display? IF nl S" FOR" .struc level+ THEN ;          Display? IF nl S" FOR" .struc level+ THEN ;
   
 : c-loop  : c-loop
         Display? IF level- nl .name-without bl cemit nl THEN          Display? IF level- nl .name-without nl bl cemit THEN
         DebugBranch cell+           DebugBranch cell+ 
         Scan?           Scan? 
         IF      dup BranchAddr?           IF      dup BranchAddr? 
Line 518  VARIABLE C-Pass Line 509  VARIABLE C-Pass
     THEN      THEN
     DebugBranch cell+ ;      DebugBranch cell+ ;
   
 : c-exit  dup 1 cells -  : c-exit ( addr1 -- addr2 )
         CheckEnd      dup 1 cells -
         IF      Display? IF nlflag off S" ;" Com# .string THEN      CheckEnd
                 C-Stop on      IF
         ELSE    Display? IF S" EXIT " .struc THEN          Display? IF nlflag off S" ;" Com# .string THEN
         THEN          C-Stop on
         Debug? IF drop THEN ;      ELSE
           Display? IF S" EXIT " .struc THEN
       THEN
       Debug? IF drop THEN ; \ !!! cross-interacts with debugger !!!
   
 : c-abort"  : c-abort"
         count 2dup + aligned -rot          count 2dup + aligned -rot
Line 535  VARIABLE C-Pass Line 529  VARIABLE C-Pass
         ELSE    2drop          ELSE    2drop
         THEN ;          THEN ;
   
 [IFDEF] (does>)  [IFDEF] !does
 : c-does>               \ end of create part  : c-does>               \ end of create part
         Display? IF S" DOES> " Com# .string THEN          Display? IF S" DOES> " Com# .string THEN ;
         maxaligned /does-handler + ;  \       maxaligned /does-handler + ; \ !! no longer needed for non-cross stuff
 [THEN]  [THEN]
   
 [IFDEF] (compile)  [IFDEF] (compile)
Line 582  CREATE C-Table Line 576  CREATE C-Table
 [IFDEF] (abort") ' (abort") A,      ' c-abort" A, [THEN]  [IFDEF] (abort") ' (abort") A,      ' c-abort" A, [THEN]
 \ only defined if compiler is loaded  \ only defined if compiler is loaded
 [IFDEF] (compile) ' (compile) A,      ' c-(compile) A, [THEN]  [IFDEF] (compile) ' (compile) A,      ' c-(compile) A, [THEN]
 [IFDEF] (does>) ' (does>) A,        ' c-does> A, [THEN]  [IFDEF] !does   ' !does A,          ' c-does> A, [THEN]
                 0 ,             here 0 ,                  0 ,             here 0 ,
   
 avariable c-extender  avariable c-extender
Line 675  Defer discode ( addr u -- ) \ gforth Line 669  Defer discode ( addr u -- ) \ gforth
     cell +loop      cell +loop
     here ;      here ;
   
   [ifundef] umin \ !! bootstrapping help
 : umin ( u1 u2 -- u )  : umin ( u1 u2 -- u )
     2dup u>      2dup u>
     if      if
         swap          swap
     then      then
     drop ;      drop ;
           [then]
   
 : next-prim ( addr1 -- addr2 ) \ gforth  : next-prim ( addr1 -- addr2 ) \ gforth
     \G find the next primitive after addr1 (unreliable)      \G find the next primitive after addr1 (unreliable)
     1+ >r -1 primstart      1+ >r -1 primstart
Line 726  Defer discode ( addr u -- ) \ gforth Line 722  Defer discode ( addr u -- ) \ gforth
     >name ?dup-if      >name ?dup-if
         ." IS " .name cr          ." IS " .name cr
     else      else
         ." lastxt >body !"          ." latestxt >body !"
     then ;      then ;
 : see-threaded ( addr -- )  : see-threaded ( addr -- )
     C-Pass @ DebugMode = IF      C-Pass @ DebugMode = IF
Line 761  Defer discode ( addr u -- ) \ gforth Line 757  Defer discode ( addr u -- ) \ gforth
     dup >code-address      dup >code-address
     CASE      CASE
         docon: of seecon endof          docon: of seecon endof
   [IFDEF] dovalue:
           dovalue: of seevalue endof
   [THEN]
         docol: of seecol endof          docol: of seecol endof
         dovar: of seevar endof          dovar: of seevar endof
 [ [IFDEF] douser: ]  [IFDEF] douser:
         douser: of seeuser endof          douser: of seeuser endof
 [ [THEN] ]  [THEN]
 [ [IFDEF] dodefer: ]  [IFDEF] dodefer:
         dodefer: of seedefer endof          dodefer: of seedefer endof
 [ [THEN] ]  [THEN]
 [ [IFDEF] dofield: ]  [IFDEF] dofield:
         dofield: of seefield endof          dofield: of seefield endof
 [ [THEN] ]  [THEN]
         over       of seecode endof \ direct threaded code words          over       of seecode endof \ direct threaded code words
         over >body of seecode endof \ indirect threaded code words          over >body of seecode endof \ indirect threaded code words
         2drop abort" unknown word type"          2drop abort" unknown word type"
     ENDCASE ;      ENDCASE ;
   
 : (xt-see-xt) ( xt -- )  : (xt-see-xt) ( xt -- )
     xt-see cr ." lastxt" ;      xt-see cr ." latestxt" ;
 ' (xt-see-xt) is xt-see-xt  ' (xt-see-xt) is xt-see-xt
   
 : (.immediate) ( xt -- )  : (.immediate) ( xt -- )
Line 799  Defer discode ( addr u -- ) \ gforth Line 798  Defer discode ( addr u -- ) \ gforth
         else \ interpret/compile word          else \ interpret/compile word
             r@ xt-see-xt cr              r@ xt-see-xt cr
             swap xt-see-xt cr              swap xt-see-xt cr
             ." interpret/compile " over .name (.immediate)              ." interpret/compile: " over .name drop
         then          then
     then      then
     rdrop drop ;      rdrop drop ;

Removed from v.1.47  
changed lines
  Added in v.1.67


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>