Diff for /gforth/history.fs between versions 1.11 and 1.34

version 1.11, 1996/07/16 20:57:10 version 1.34, 2004/12/26 20:32:02
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] @ - ;
 :noname  :noname
     char [char] @ - postpone Literal ;      char [char] @ - postpone Literal ;
 special: ctrl  ( "<char>" -- ctrl-code )  interpret/compile: ctrl  ( "<char>" -- ctrl-code )
   
 \ command line editing                                  16oct94py  \ command line editing                                  16oct94py
   
Line 41  special: ctrl  ( "<char>" -- ctrl-code ) Line 41  special: ctrl  ( "<char>" -- ctrl-code )
 : (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 ;  
   
 ' forw  ctrl F cells ctrlkeys + !  
 ' back  ctrl B cells ctrlkeys + !  
 ' ?del  ctrl H cells ctrlkeys + !  
 ' eof   ctrl D cells ctrlkeys + !  
   
 ' (ins) IS insert-char  : bindkey ( xt key -- )  cells ctrlkeys + ! ;
   
 \ history support                                       16oct94py  \ history support                                       16oct94py
   
 0 Value history  0 Value history \ history file fid
   
 2Variable forward^  2Variable forward^
 2Variable backward^  2Variable backward^
 2Variable end^  2Variable end^
   
 : force-open ( addr len -- handle )  : force-open ( addr len -- fid )
   2dup r/w open-file 0<      2dup r/w open-file
   IF  drop r/w create-file throw  ELSE  nip nip  THEN ;      IF
           drop r/w create-file throw
 : get-history ( addr len -- wid )      ELSE
   force-open to history          nip nip
   history file-size throw      THEN ;
   2dup forward^ 2! 2dup backward^ 2! end^ 2! ;  
   s" os-class" environment? [IF] s" unix" str= [ELSE] true [THEN] 
 s" ~/.gforth-history" get-history  [IF]
   : history-file ( -- addr u )
 : history-cold      s" GFORTHHIST" getenv dup 0= IF
     Defers 'cold          2drop s" ~/.gforth-history"
     s" ~/.gforth-history" get-history ;      THEN ;
   [ELSE]
   
 ' history-cold IS 'cold  : history-dir ( -- addr u )
     s" TMP" getenv ?dup ?EXIT drop
     s" TEMP" getenv ?dup ?EXIT drop
     s" c:/" ;
   
   : history-file ( -- addr u )
     s" GFORTHHIST" getenv ?dup ?EXIT
     drop
     history-dir pad place
     s" /ghist.fs" pad +place pad count ;
   [THEN]
   
 \ moving in history file                               16oct94py  \ moving in history file                               16oct94py
   
Line 87  s" ~/.gforth-history" get-history Line 92  s" ~/.gforth-history" get-history
 : 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 100  s" ~/.gforth-history" get-history Line 105  s" ~/.gforth-history" get-history
   hist-pos  forward^ 2!    hist-pos  forward^ 2!
   tuck 2dup type 0 ;    tuck 2dup type 0 ;
   
 : prev-line  ( max span addr pos1 -- max span addr pos2 false )  : find-prev-line ( max addr -- max span addr pos2 )
   clear-line  backward^ 2@ forward^ 2!    backward^ 2@ forward^ 2!
   over 2 + negate s>d backward^ 2@ d+ 0. dmax 2dup hist-setpos    over 2 + negate s>d backward^ 2@ d+ 0. dmax 2dup hist-setpos
   BEGIN    BEGIN
       backward^ 2!   2dup get-line  WHILE        backward^ 2!   2dup get-line  WHILE
       hist-pos 2dup forward^ 2@ d<  WHILE        hist-pos 2dup forward^ 2@ d<  WHILE
       rot drop        rot drop
   REPEAT  2drop  THEN    REPEAT  2drop  THEN  tuck ;
   tuck 2dup type 0 ;  
   : prev-line  ( max span addr pos1 -- max span addr pos2 false )
       clear-line find-prev-line 2dup type 0 ;
   
 Create lfpad #lf c,  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 131  Create lfpad #lf c, Line 138  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 180  Create prefix-found  0 , 0 , Line 197  Create prefix-found  0 , 0 ,
 : search-prefix  ( addr1 len1 -- addr2 len2 )  : search-prefix  ( addr1 len1 -- addr2 len2 )
     0 vp dup @ 1- cells over +      0 vp dup @ 1- cells over +
     DO  I 2@ <>      DO  I 2@ <>
         IF  I cell+ @ @ swap  search-voc  THEN          IF  I cell+ @ wordlist-id @ swap  search-voc  THEN
         [ -1 cells ] Literal +LOOP          [ -1 cells ] Literal +LOOP
     prefix-string ;      prefix-string ;
   
Line 191  Create prefix-found  0 , 0 , Line 208  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 200  Create prefix-found  0 , 0 , Line 218  Create prefix-found  0 , 0 ,
 : kill-prefix  ( key -- key )  : kill-prefix  ( key -- key )
   dup #tab <> IF  0 0 prefix-found 2!  THEN ;    dup #tab <> IF  0 0 prefix-found 2!  THEN ;
   
 ' kill-prefix IS everychar  [IFUNDEF] everyline defer everyline [THEN]
   
   : 8-bit-io ( -- )
       ['] forw        ctrl F bindkey
       ['] back        ctrl B bindkey
       ['] ?del        ctrl H bindkey
       ['] eof         ctrl D bindkey
       ['] <del>       ctrl X bindkey
       ['] next-line   ctrl N bindkey
       ['] prev-line   ctrl P bindkey
       ['] clear-tib   ctrl K bindkey
       ['] first-pos   ctrl A bindkey
       ['] end-pos     ctrl E bindkey
       ['] (enter)     #lf    bindkey
       ['] (enter)     #cr    bindkey
       ['] tab-expand  #tab   bindkey
       ['] (ins)       IS insert-char
       ['] kill-prefix IS everychar
       ['] noop        IS everyline
       [ action-of key ] Literal IS key
       [ action-of emit ] Literal IS emit ;
   
   \ UTF-8 support
   
   include utf-8.fs
   
   : utf-8-cold ( -- )
       s" LANG" getenv s" .UTF-8" search nip nip
       IF  utf-8-io  ELSE  8-bit-io  THEN ;
   
   ' utf-8-cold INIT8 chained
   
   utf-8-cold
   
   \ initializing history
   
   : get-history ( addr len -- )
       ['] force-open catch
       ?dup-if
           \ !! >stderr
           \ history-file type ." : " .error cr
           drop 2drop
           ['] false ['] false ['] (ret)
       else
           to history
           history file-size throw
           2dup forward^ 2! 2dup backward^ 2! end^ 2!
           ['] next-line ['] prev-line ['] (enter)
       endif
       dup #lf bindkey
           #cr bindkey
        ctrl P bindkey
        ctrl N bindkey
   ;
   
   : history-cold ( -- )
       history-file get-history ;
   
   ' history-cold INIT8 chained
   history-cold
   
 ' next-line  ctrl N cells ctrlkeys + !  
 ' prev-line  ctrl P cells ctrlkeys + !  
 ' clear-tib  ctrl K cells ctrlkeys + !  
 ' first-pos  ctrl A cells ctrlkeys + !  
 ' end-pos    ctrl E cells ctrlkeys + !  
 ' (enter)    #lf    cells ctrlkeys + !  
 ' (enter)    #cr    cells ctrlkeys + !  
 ' tab-expand #tab   cells ctrlkeys + !  

Removed from v.1.11  
changed lines
  Added in v.1.34


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