--- parser3/src/classes/file.C 2008/07/03 09:36:16 1.173 +++ parser3/src/classes/file.C 2008/08/29 08:24:17 1.177 @@ -5,12 +5,10 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_FILE_C="$Date: 2008/07/03 09:36:16 $"; +static const char * const IDENT_FILE_C="$Date: 2008/08/29 08:24:17 $"; #include "pa_config_includes.h" -#include "pcre.h" - #include "classes.h" #include "pa_vmethod_frame.h" @@ -616,10 +614,14 @@ static void _list(Request& r, MethodPara if(params.count()>1) { regexp=¶ms.as_no_junction(1, "regexp must not be code").as_string(); - const char* pattern=regexp->cstr(); + const char* pattern=regexp->cstr(String::L_UNSPECIFIED); const char* errptr; int erroffset; - regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, + int options=PCRE_EXTRA | PCRE_DOTALL; + if(r.charsets.source().isUTF8()) + options=options|PCRE_UTF8; + + regexp_code=pcre_compile(pattern, options, &errptr, &erroffset, r.charsets.source().pcre_tables); @@ -653,8 +655,8 @@ static void _list(Request& r, MethodPara else if(exec_result<0) { (*pcre_free)(regexp_code); throw Exception(0, - regexp, - "regular expression execute (%d)", + regexp, + print_pcre_exec_error_text(exec_result), exec_result); } }