steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into new_ui

db4
Slava Pestov 2008-12-22 05:55:09 -06:00
parent 0ebd6c1974 e4edfe076d
commit 56c929c8e1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
basis/documents/documents.factor
View File

@ -153,18 +153,18 @@ GENERIC: next-elt ( loc document elt -- newloc )
TUPLE: char-elt ; TUPLE: char-elt ;
: (prev-char) ( loc document quot -- loc ) : (prev-char) ( loc document quot -- loc )
-rot { {
{ [ over { 0 0 } = ] [ drop ] } { [ pick { 0 0 } = ] [ 2drop ] }
{ [ over second zero? ] [ [ first 1- ] dip line-end ] } { [ pick second zero? ] [ drop [ first 1- ] dip line-end ] }
[ pick call ] [ call ]
} cond nip ; inline } cond ; inline
: (next-char) ( loc document quot -- loc ) : (next-char) ( loc document quot -- loc )
-rot { {
{ [ 2dup doc-end = ] [ drop ] } { [ 2over doc-end = ] [ 2drop ] }
{ [ 2dup line-end? ] [ drop first 1+ 0 2array ] } { [ 2over line-end? ] [ 2drop first 1+ 0 2array ] }
[ pick call ] [ call ]
} cond nip ; inline } cond ; inline
M: char-elt prev-elt M: char-elt prev-elt
drop [ drop -1 +col ] (prev-char) ; drop [ drop -1 +col ] (prev-char) ;