Diff for /gforth/history.fs between versions 1.27 and 1.33

version 1.27, 2001/09/15 20:40:47 version 1.33, 2004/12/24 14:08:43
Line 1 Line 1
 \ command line edit and history support                 16oct94py  \ command line edit and history support                 16oct94py
   
 \ Copyright (C) 1995,2000 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 48  interpret/compile: ctrl  ( "<char>" -- c Line 48  interpret/compile: ctrl  ( "<char>" -- c
   
 : bindkey ( xt key -- )  cells ctrlkeys + ! ;  : bindkey ( xt key -- )  cells ctrlkeys + ! ;
   
 ' forw  ctrl F bindkey  
 ' back  ctrl B bindkey  
 ' ?del  ctrl H bindkey  
 ' eof   ctrl D bindkey  
 ' <del> ctrl X bindkey  
   
 ' (ins) IS insert-char  
   
 \ history support                                       16oct94py  \ history support                                       16oct94py
   
 0 Value history \ history file fid  0 Value history \ history file fid
Line 72  interpret/compile: ctrl  ( "<char>" -- c Line 64  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 100  s" os-class" environment? [IF] s" unix" Line 92  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 129  Create lfpad #lf c, Line 121  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 146  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 206  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 )
       key? IF  #tab (ins) 0  EXIT  THEN
     kill-expand  2dup extract-word dup 0= IF  nip EXIT  THEN      kill-expand  2dup extract-word dup 0= IF  nip EXIT  THEN
     search-prefix  tib-full?      search-prefix  tib-full?
     IF    7 emit  2drop  0 0 prefix-found 2!      IF    7 emit  2drop  0 0 prefix-found 2!
Line 215  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  : 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
   
 ' next-line  ctrl N bindkey  utf-8-cold
 ' 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  
   
 \ initializing history  \ initializing history
   

Removed from v.1.27  
changed lines
  Added in v.1.33


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