Diff for /gforth/history.fs between versions 1.20 and 1.32

version 1.20, 2000/04/02 20:18:27 version 1.32, 2003/09/01 22:12:46
Line 1 Line 1
 \ command line edit and history support                 16oct94py  \ command line edit and history support                 16oct94py
   
 \ Copyright (C) 1995 Free Software Foundation, Inc.  \ Copyright (C) 1995,2000,2003 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 16 Line 16
   
 \ 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, 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.
   
 :noname  :noname
     char [char] @ - ;      char [char] @ - ;
Line 41  interpret/compile: ctrl  ( "<char>" -- c Line 41  interpret/compile: ctrl  ( "<char>" -- c
 : (ret)  type-rest drop true space ;  : (ret)  type-rest drop true space ;
 : back  dup  IF  1- #bs emit  ELSE  #bell emit  THEN 0 ;  : back  dup  IF  1- #bs emit  ELSE  #bell emit  THEN 0 ;
 : forw 2 pick over <> IF  2dup + c@ emit 1+  ELSE  #bell emit  THEN 0 ;  : forw 2 pick over <> IF  2dup + c@ emit 1+  ELSE  #bell emit  THEN 0 ;
 : eof  2 pick over or 0=  IF  : <del> ( max span addr pos1 -- max span addr pos2 0 )
         bye    2 pick over <>
     ELSE  2 pick over <>          IF  forw drop (del)  ELSE  #bell emit  THEN  0 ;
         IF  forw drop (del)  ELSE  #bell emit  THEN  0  : eof  2 pick over or 0=  IF  bye  ELSE  <del>  THEN ;
     THEN ;  
   : bindkey ( xt key -- )  cells ctrlkeys + ! ;
 ' forw  ctrl F cells ctrlkeys + !  
 ' back  ctrl B cells ctrlkeys + !  ' forw  ctrl F bindkey
 ' ?del  ctrl H cells ctrlkeys + !  ' back  ctrl B bindkey
 ' eof   ctrl D cells ctrlkeys + !  ' ?del  ctrl H bindkey
   ' eof   ctrl D bindkey
   ' <del> ctrl X bindkey
   
 ' (ins) IS insert-char  ' (ins) IS insert-char
   
Line 70  interpret/compile: ctrl  ( "<char>" -- c Line 72  interpret/compile: ctrl  ( "<char>" -- c
         nip nip          nip nip
     THEN ;      THEN ;
   
 s" os-class" environment? [IF] s" unix" compare 0= [ELSE] true [THEN]   s" os-class" environment? [IF] s" unix" str= [ELSE] true [THEN] 
 [IF]  [IF]
 : history-file ( -- addr u )  : history-file ( -- addr u )
     s" GFORTHHIST" getenv dup 0= IF      s" GFORTHHIST" getenv dup 0= IF
Line 98  s" os-class" environment? [IF] s" unix" Line 100  s" os-class" environment? [IF] s" unix"
 : clear-tib ( max span addr pos -- max 0 addr 0 false )  : clear-tib ( max span addr pos -- max 0 addr 0 false )
   clear-line 0 tuck dup ;    clear-line 0 tuck dup ;
   
 : hist-pos    ( -- ud )  history file-position throw ;  : hist-pos    ( -- ud )  history file-position drop ( throw ) ;
 : hist-setpos ( ud -- )  history reposition-file throw ;  : hist-setpos ( ud -- )  history reposition-file drop ( throw ) ;
   
 : get-line ( addr len -- len' flag )  : get-line ( addr len -- len' flag )
   swap history read-line throw ;    swap history read-line throw ;
Line 127  Create lfpad #lf c, Line 129  Create lfpad #lf c,
   
 : (enter)  ( max span addr pos1 -- max span addr pos2 true )  : (enter)  ( max span addr pos1 -- max span addr pos2 true )
   >r end^ 2@ hist-setpos    >r end^ 2@ hist-setpos
   2dup swap history write-line throw    2dup swap history write-line drop ( throw ) \ don't worry about errors
   hist-pos 2dup backward^ 2! end^ 2!    hist-pos 2dup backward^ 2! end^ 2!
   r> (ret) ;    r> (ret) ;
   
Line 144  Create lfpad #lf c, Line 146  Create lfpad #lf c,
   
 Create prefix-found  0 , 0 ,  Create prefix-found  0 , 0 ,
   
   : sgn ( n -- -1/0/1 )
    dup 0= IF EXIT THEN  0< 2* 1+ ;
   
   : capscomp  ( c_addr1 u c_addr2 -- n )
    swap bounds
    ?DO  dup c@ I c@ <>
        IF  dup c@ toupper I c@ toupper =
        ELSE  true  THEN  WHILE  1+  LOOP  drop 0
    ELSE  c@ toupper I c@ toupper - unloop  THEN  sgn ;
   
 : word-lex ( nfa1 nfa2 -- -1/0/1 )  : word-lex ( nfa1 nfa2 -- -1/0/1 )
     dup 0=      dup 0=
     IF      IF
Line 204  Create prefix-found  0 , 0 , Line 216  Create prefix-found  0 , 0 ,
     5 pick over 4 pick + prefix-found @ 0<> - < ;      5 pick over 4 pick + prefix-found @ 0<> - < ;
   
 : tab-expand ( max span addr pos1 -- max span addr pos2 0 )  : tab-expand ( max span addr pos1 -- max span addr pos2 0 )
     kill-expand  2dup extract-word search-prefix      key? IF  #tab (ins) 0  EXIT  THEN
     tib-full?      kill-expand  2dup extract-word dup 0= IF  nip EXIT  THEN
       search-prefix  tib-full?
     IF    7 emit  2drop  0 0 prefix-found 2!      IF    7 emit  2drop  0 0 prefix-found 2!
     ELSE  bounds ?DO  I c@ (ins)  LOOP  THEN      ELSE  bounds ?DO  I c@ (ins)  LOOP  THEN
     prefix-found @ IF  bl (ins)  THEN  0 ;      prefix-found @ IF  bl (ins)  THEN  0 ;
Line 215  Create prefix-found  0 , 0 , Line 228  Create prefix-found  0 , 0 ,
   
 ' kill-prefix IS everychar  ' kill-prefix IS everychar
   
 ' next-line  ctrl N cells ctrlkeys + !  ' next-line  ctrl N bindkey
 ' prev-line  ctrl P cells ctrlkeys + !  ' prev-line  ctrl P bindkey
 ' clear-tib  ctrl K cells ctrlkeys + !  ' clear-tib  ctrl K bindkey
 ' first-pos  ctrl A cells ctrlkeys + !  ' first-pos  ctrl A bindkey
 ' end-pos    ctrl E cells ctrlkeys + !  ' end-pos    ctrl E bindkey
 ' (enter)    #lf    cells ctrlkeys + !  ' (enter)    #lf    bindkey
 ' (enter)    #cr    cells ctrlkeys + !  ' (enter)    #cr    bindkey
 ' tab-expand #tab   cells ctrlkeys + !  ' tab-expand #tab   bindkey
   
 \ initializing history  \ initializing history
   
Line 230  Create prefix-found  0 , 0 , Line 243  Create prefix-found  0 , 0 ,
     ['] force-open catch      ['] force-open catch
     ?dup-if      ?dup-if
         \ !! >stderr          \ !! >stderr
         history-file type ." : " .error cr 2drop          \ history-file type ." : " .error cr
           drop 2drop
         ['] false ['] false ['] (ret)          ['] false ['] false ['] (ret)
     else      else
         to history          to history
Line 238  Create prefix-found  0 , 0 , Line 252  Create prefix-found  0 , 0 ,
         2dup forward^ 2! 2dup backward^ 2! end^ 2!          2dup forward^ 2! 2dup backward^ 2! end^ 2!
         ['] next-line ['] prev-line ['] (enter)          ['] next-line ['] prev-line ['] (enter)
     endif      endif
     dup      dup #lf bindkey
     [ #lf    cells ctrlkeys + ]L !          #cr bindkey
     [ #cr    cells ctrlkeys + ]L !       ctrl P bindkey
     [ ctrl P cells ctrlkeys + ]L !       ctrl N bindkey
     [ ctrl N cells ctrlkeys + ]L !  
 ;  ;
   
 : history-cold ( -- )  : history-cold ( -- )

Removed from v.1.20  
changed lines
  Added in v.1.32


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