Diff for /gforth/history.fs between versions 1.6 and 1.7

version 1.6, 1995/06/07 10:05:05 version 1.7, 1995/09/06 21:00:17
Line 6 Line 6
 2Variable backward^  2Variable backward^
 2Variable end^  2Variable end^
   
 : get-history ( addr len -- wid )  : force-open ( addr len -- handle )
 \  check-file-prefix drop  
   2dup r/w open-file 0<    2dup r/w open-file 0<
   IF  drop r/w create-file throw  ELSE  nip nip  THEN    IF  drop r/w create-file throw  ELSE  nip nip  THEN ;
   to history  
   : get-history ( addr len -- wid )
     force-open to history
   history file-size throw    history file-size throw
   2dup forward^ 2! 2dup backward^ 2! end^ 2! ;    2dup forward^ 2! 2dup backward^ 2! end^ 2! ;
   
Line 30  s" ~/.gforth-history" get-history Line 31  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 ;
   
 : get-line ( max addr -- max span addr pos dpos )  : hist-pos    ( -- ud )  history file-position throw ;
   history file-position throw  backward^ 2!  : hist-setpos ( ud -- )  history reposition-file throw ;
   2dup swap history read-line throw drop  
   2dup type tuck  : get-line ( addr len -- len' flag )
   history file-position throw  forward^ 2! ;    swap history read-line throw ;
   
 : next-line  ( max span addr pos1 -- max span addr pos2 false )  : next-line  ( max span addr pos1 -- max span addr pos2 false )
   clear-line    clear-line
   forward^ 2@ history reposition-file throw    forward^ 2@ 2dup hist-setpos backward^ 2!
   get-line  0 ;    2dup get-line drop
     hist-pos  forward^ 2!
     tuck 2dup type 0 ;
   
 : prev-line  ( max span addr pos1 -- max span addr pos2 false )  : prev-line  ( max span addr pos1 -- max span addr pos2 false )
   clear-line over 2 + negate s>d backward^ 2@ d+ 0. dmax    clear-line  backward^ 2@ forward^ 2!
   2dup history reposition-file throw    over 2 + negate s>d backward^ 2@ d+ 0. dmax 2dup hist-setpos
   BEGIN   2over swap history read-line throw  WHILE    BEGIN
           >r history file-position throw        backward^ 2!   2dup get-line  WHILE
           2dup backward^ 2@ d<  WHILE  2swap 2drop rdrop        hist-pos 2dup forward^ 2@ d<  WHILE
   REPEAT  ELSE  >r history file-position throw  THEN        rot drop
   forward^ 2!  backward^ 2!  r> tuck 2dup type 0 ;    REPEAT  2drop  THEN
     tuck 2dup type 0 ;
   
 : ctrl  ( "<char>" -- ctrl-code )  : ctrl  ( "<char>" -- ctrl-code )
   char [char] @ - postpone Literal ; immediate    char [char] @ - postpone Literal ; immediate
Line 56  s" ~/.gforth-history" get-history Line 60  s" ~/.gforth-history" get-history
 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@ history reposition-file throw    >r end^ 2@ hist-setpos
   2dup swap history write-file throw    2dup swap history write-line throw
   lfpad 1 history write-file throw    hist-pos 2dup backward^ 2! end^ 2!
   history file-position throw 2dup backward^ 2! end^ 2!  
   r> (ret) ;    r> (ret) ;
   
 \ some other key commands                              16oct94py  \ some other key commands                              16oct94py
Line 82  Create prefix-found  0 , 0 , Line 85  Create prefix-found  0 , 0 ,
   IF  r> char+ capscomp 0<=  EXIT  THEN    IF  r> char+ capscomp 0<=  EXIT  THEN
   nip r> c@ $1F and < ;    nip r> c@ $1F and < ;
   
 : search-prefix  ( addr len1 -- suffix len2 )  0 >r  context  : search-voc ( addr len nfa1 nfa2 -- addr len nfa3 ) >r
   BEGIN  BEGIN  dup @ over  cell - @ =  WHILE  cell -  REPEAT      BEGIN  dup  WHILE  >r dup r@ cell+ c@ $1F and <=
          dup >r -rot r> @ @          IF  2dup r@ cell+ char+ capscomp  0=
          BEGIN  dup  WHILE  >r dup r@ cell+ c@ $1F and <=              IF  r> dup r@ word-lex
                 IF  2dup r@ cell+ char+ capscomp  0=                  IF  dup prefix-found @ word-lex
                     IF  r> dup r@ word-lex                      0>= IF  rdrop dup >r  THEN
                         IF  dup prefix-found @ word-lex                  THEN >r
                             0>= IF  rdrop dup >r  THEN              THEN
                         THEN >r          THEN  r> @
                     THEN      REPEAT drop r> ;
                 THEN  r> @  
          REPEAT  drop rot cell -  dup vp u> 0=  : prefix-string ( addr len nfa -- addr' len' )
   UNTIL  drop r> dup prefix-found ! ?dup      dup prefix-found !  ?dup
   IF    cell+ count $1F and rot /string rot drop      IF  cell+ count $1F and rot /string rot drop
   ELSE  2drop s" "  THEN  ;          dup 1+ prefix-found cell+ !
       ELSE
           2drop s" " prefix-found cell+ off
       THEN ;
   
   : search-prefix  ( addr1 len1 -- addr2 len2 )
       0 vp dup @ 1- cells over +
       DO  I 2@ <>
           IF  I cell+ @ @ swap  search-voc  THEN
           [ -1 cells ] Literal +LOOP
       prefix-string ;
   
   : kill-expand ( max span addr pos1 -- max span addr pos2 )
       prefix-found cell+ @  0 ?DO  (del)  LOOP ;
   
   : tib-full? ( max span addr pos addr' len' -- max span addr pos addr1 u flag )
       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 )
   prefix-found cell+ @  0 ?DO  (del)  LOOP      kill-expand  2dup extract-word search-prefix
   2dup extract-word search-prefix      tib-full?
   dup prefix-found @ 0<> - prefix-found cell+ !      IF    7 emit  2drop  0 0 prefix-found 2!
   bounds ?DO  I c@ (ins)  LOOP      ELSE  bounds ?DO  I c@ (ins)  LOOP  THEN
   prefix-found @ IF  bl (ins)  THEN  0 ;      prefix-found @ IF  bl (ins)  THEN  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 ;

Removed from v.1.6  
changed lines
  Added in v.1.7


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