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

pcre: encoding needs to be set to utf8

db4
Björn Lindqvist 2013-10-25 17:40:37 +02:00 committed by John Benediktsson
parent 8193dc2891
commit a7648bb5a8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/pcre/info/info-tests.factor
View File

@ -1,4 +1,4 @@
USING: accessors pcre pcre.info sequences tools.test ; USING: accessors pcre pcre.info pcre.utils sequences tools.test ;
[ { { 3 "day" } { 2 "month" } { 1 "year" } } ] [ { { 3 "day" } { 2 "month" } { 1 "year" } } ]
[ [

3
basis/pcre/info/info.factor
View File

@ -2,6 +2,7 @@ USING:
accessors accessors
alien alien.accessors alien.c-types alien.data alien.strings alien alien.accessors alien.c-types alien.data alien.strings
arrays arrays
io.encodings.utf8
kernel kernel
math math
pcre.ffi pcre.utils pcre.ffi pcre.utils
@ -22,7 +23,7 @@ IN: pcre.info
PCRE_INFO_NAMEENTRYSIZE fullinfo ; PCRE_INFO_NAMEENTRYSIZE fullinfo ;
: name-table-entry ( addr -- group-index group-name ) : name-table-entry ( addr -- group-index group-name )
[ <alien> 1 alien-unsigned-1 ] [ 2 + <alien> alien>native-string ] bi ; [ <alien> 1 alien-unsigned-1 ] [ 2 + <alien> utf8 alien>string ] bi ;
: options ( pcre -- opts ) : options ( pcre -- opts )
f PCRE_INFO_OPTIONS fullinfo ; f PCRE_INFO_OPTIONS fullinfo ;

2
basis/pcre/pcre.factor
View File

@ -72,7 +72,7 @@ TUPLE: matcher pcre extra subject ofs exec-opts match ;
: parse-match ( subject nametable match-data -- match ) : parse-match ( subject nametable match-data -- match )
swapd first2 swap [ substring-list ] keep void* <c-direct-array> swapd first2 swap [ substring-list ] keep void* <c-direct-array>
[ alien>native-string ] { } map-as [ of swap 2array ] with map-index ; [ utf8 alien>string ] { } map-as [ of swap 2array ] with map-index ;
! High-level ! High-level
: <compiled-pcre> ( expr -- compiled-pcre ) : <compiled-pcre> ( expr -- compiled-pcre )