pcre: ensure we aren't using 16 or 32 bit pcre because that's not tested

diff --git a/extra/pcre/ffi/ffi.factor b/extra/pcre/ffi/ffi.factor
index adf63bd8ac05aa0e54dc281f5541e82db701ee82..5985ef3c798185172fbd1e38fdb043379bf16222 100644 (file)
--- a/extra/pcre/ffi/ffi.factor
+++ b/extra/pcre/ffi/ffi.factor
@@ -132,6 +132,10 @@ CONSTANT: PCRE_CONFIG_STACKRECURSE            5
 CONSTANT: PCRE_CONFIG_UNICODE_PROPERTIES      6
 CONSTANT: PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
 CONSTANT: PCRE_CONFIG_BSR                     8
+CONSTANT: PCRE_CONFIG_JIT                     9
+CONSTANT: PCRE_CONFIG_UTF16                  10
+CONSTANT: PCRE_CONFIG_JITTARGET              11
+CONSTANT: PCRE_CONFIG_UTF32                  12
 
 
 STRUCT: pcre_extra
@@ -187,3 +191,5 @@ FUNCTION: int pcre_get_substring_list ( c-string subject,
 FUNCTION: c-string pcre_version ( ) ;
 
 FUNCTION: uchar* pcre_maketables ( ) ;
+
+FUNCTION: void pcre_free ( void* pcre ) ;

diff --git a/extra/pcre/pcre-tests.factor b/extra/pcre/pcre-tests.factor
index 3963c5b2d4727d0d708b194fb1af16954d12ee99..2a78fa4a0befbf7343829cb11bf92bb9d7ac53c9 100644 (file)
--- a/extra/pcre/pcre-tests.factor
+++ b/extra/pcre/pcre-tests.factor
@@ -35,6 +35,10 @@ os unix? [ [ 10 ] [ PCRE_CONFIG_NEWLINE config ] unit-test ] when
 
 [ 1 ] [ PCRE_CONFIG_UNICODE_PROPERTIES config ] unit-test
 
+! libpcre must not support 16 or 32 bit code points.
+[ 0 ] [ PCRE_CONFIG_UTF16 config ] unit-test
+[ 0 ] [ PCRE_CONFIG_UTF32 config ] unit-test
+
 ! Tests for findall
 [
     { { f "1999-01-12" } { "year" "1999" } { "month" "01" } { "day" "12" } }