pcre: fix bug with macosx .

db4
John Benediktsson 2013-11-20 12:53:13 -08:00
parent d3e2d64d5b
commit 84a74bfad0
2 changed files with 12 additions and 10 deletions

View File

@ -137,15 +137,15 @@ CONSTANT: PCRE_CONFIG_UTF16 10
CONSTANT: PCRE_CONFIG_JITTARGET 11 CONSTANT: PCRE_CONFIG_JITTARGET 11
CONSTANT: PCRE_CONFIG_UTF32 12 CONSTANT: PCRE_CONFIG_UTF32 12
STRUCT: pcre_extra STRUCT: pcre_extra
{ flags int } { flags ulonglong }
{ study_data void* } { study_data void* }
{ match_limit long } { match_limit ulonglong }
{ callout_data void* } { callout_data void* }
{ tables uchar* } { tables uchar* }
{ match_limit_recursion int } { match_limit_recursion ulonglong }
{ mark uchar** } ; { mark uchar** }
{ executable_jit void* } ;
FUNCTION: void pcre_config ( int what, void* where ) ; FUNCTION: void pcre_config ( int what, void* where ) ;

View File

@ -4,7 +4,7 @@ USING:
arrays arrays
io.encodings.utf8 io.encodings.utf8
kernel kernel
math math math.bitwise
pcre.ffi pcre.utils pcre.ffi pcre.utils
sequences ; sequences ;
IN: pcre.info IN: pcre.info
@ -17,18 +17,20 @@ IN: pcre.info
PCRE_INFO_NAMECOUNT fullinfo ; PCRE_INFO_NAMECOUNT fullinfo ;
: name-table ( pcre extra -- addr ) : name-table ( pcre extra -- addr )
PCRE_INFO_NAMETABLE fullinfo ; [ drop alien-address 32 on-bits unmask ]
[ PCRE_INFO_NAMETABLE fullinfo ] 2bi + ;
: name-entry-size ( pcre extra -- size ) : name-entry-size ( pcre extra -- size )
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> utf8 alien>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 ;
! Exported ! Exported
: name-table-entries ( pcre extra -- addrs ) : name-table-entries ( pcre extra -- addrs )
[ name-table ] [ name-entry-size ] [ name-count ] 2tri gen-array-addrs [ name-table ] [ name-entry-size ] [ name-count ] 2tri
[ name-table-entry 2array ] map ; gen-array-addrs [ name-table-entry 2array ] map ;