Diff for /gforth/utf-8.fs between versions 1.37 and 1.42

version 1.37, 2008/11/23 21:09:55 version 1.42, 2010/12/31 18:09:02
Line 1 Line 1
 \ UTF-8 handling                                       12dec04py  \ UTF-8 handling                                       12dec04py
   
 \ Copyright (C) 2004,2005,2006,2007,2008 Free Software Foundation, Inc.  \ Copyright (C) 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 119  Defer check-xy  ' noop IS check-xy Line 119  Defer check-xy  ' noop IS check-xy
     dup $f8 u< if drop 4 exit endif      dup $f8 u< if drop 4 exit endif
     dup $fc u< if drop 5 exit endif      dup $fc u< if drop 5 exit endif
     dup $fe u< if drop 6 exit endif      dup $fe u< if drop 6 exit endif
     UTF-8-err throw ;      dup $ff u< if drop 7 exit endif
       drop 8 ;
   
 : -u8trailing-garbage ( addr u1 -- addr u2 )  : -u8trailing-garbage ( addr u1 -- addr u2 )
     2dup + dup u8<< ( addr u1 end1 end2 )      2dup + dup u8<< ( addr u1 end1 end2 )
Line 272  here wc-table - Constant #wc-table Line 273  here wc-table - Constant #wc-table
   
 \ inefficient table walk:  \ inefficient table walk:
   
 : wcwidth ( xc -- n )  : xc-width ( xc -- n )
     wc-table #wc-table over + swap ?DO      wc-table #wc-table over + swap ?DO
         dup I 2@ within IF  I 2 cells + @  UNLOOP EXIT  THEN          dup I 2@ within IF  I 2 cells + @  UNLOOP EXIT  THEN
     3 cells +LOOP  1 ;      3 cells +LOOP  1 ;
   [ELSE]
       ' wcwidth Alias xc-width
 [THEN]  [THEN]
           
 : u8width ( xcaddr u -- n )  : u8width ( xcaddr u -- n )
     0 rot rot over + swap ?DO      0 rot rot over + swap ?DO
         I xc@+ swap >r wcwidth +          I xc@+ swap >r xc-width +
     r> I - +LOOP ;      r> I - +LOOP ;
   
 : set-encoding-utf-8 ( -- )  : set-encoding-utf-8 ( -- )
Line 325  environment-wordlist set-current Line 328  environment-wordlist set-current
     \G ``ISO-LATIN-1'' or ``UTF-8'', with the exception of ``ASCII'', where      \G ``ISO-LATIN-1'' or ``UTF-8'', with the exception of ``ASCII'', where
     \G we prefer the alias ``ASCII''.      \G we prefer the alias ``ASCII''.
     max-single-byte $80 = IF s" UTF-8" ELSE s" ISO-LATIN-1" THEN ;      max-single-byte $80 = IF s" UTF-8" ELSE s" ISO-LATIN-1" THEN ;
   : max-xchar ( -- xchar )
       max-single-byte $80 = IF $7FFFFFFF  ELSE  $FF  THEN ;
   ' noop Alias X:xchar
 forth definitions  forth definitions
   
 :noname ( -- )  :noname ( -- )

Removed from v.1.37  
changed lines
  Added in v.1.42


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