vxcontrol/lualibs-lrexlib
1
0
Fork 0
mirror of https://github.com/vxcontrol/lualibs-lrexlib.git synced 2026-07-01 09:25:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

1. Fix locale handling (PCRE2).

Browse Source 
2. Place all functions dealing with chartables adjacent (PCRE, PCRE2).
This commit is contained in:
Shmuel Zeigerman
2017-06-23 00:07:48 +03:00
parent 9ac52e5a29
commit e3e3b8b275
3 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pcre/lpcre.c
+11 -11
View File
@@ -87,11 +87,6 @@ const char chartables_typename[] = "chartables";
******************************************************************************
*/
static void push_chartables_meta (lua_State *L) {
lua_pushinteger (L, INDEX_CHARTABLES_META);
lua_rawget (L, ALG_ENVIRONINDEX);
}
static int getcflags (lua_State *L, int pos) {
switch (lua_type (L, pos)) {
case LUA_TNONE:
@@ -138,6 +133,11 @@ static void checkarg_dfa_exec (lua_State *L, TArgExec *argE, TPcre **ud) {
}
#endif
static void push_chartables_meta (lua_State *L) {
lua_pushinteger (L, INDEX_CHARTABLES_META);
lua_rawget (L, ALG_ENVIRONINDEX);
}
static int Lpcre_maketables (lua_State *L) {
*(const void**)lua_newuserdata (L, sizeof(void*)) = pcre_maketables();
push_chartables_meta (L);
@@ -169,6 +169,12 @@ static int chartables_gc (lua_State *L) {
return 0;
}
static int chartables_tostring (lua_State *L) {
void **ud = check_chartables (L, 1);
lua_pushfstring (L, "%s (%p)", chartables_typename, ud);
return 1;
}
static void checkarg_compile (lua_State *L, int pos, TArgComp *argC) {
argC->locale = NULL;
argC->tables = NULL;
@@ -341,12 +347,6 @@ static int Lpcre_tostring (lua_State *L) {
return 1;
}
static int chartables_tostring (lua_State *L) {
void **ud = check_chartables (L, 1);
lua_pushfstring (L, "%s (%p)", chartables_typename, ud);
return 1;
}
static int Lpcre_version (lua_State *L) {
lua_pushstring (L, pcre_version ());
return 1;
src/pcre2/lpcre2.c
+23 -18
View File
@@ -65,6 +65,7 @@ typedef struct {
PCRE2_SIZE * ovector;
int ncapt;
const unsigned char * tables;
pcre2_compile_context *ccontext;
int freed;
} TPcre2;
@@ -96,11 +97,6 @@ static int push_error_message (lua_State *L, int errorcode) //### is this functi
return 0;
}
static void push_chartables_meta (lua_State *L) {
lua_pushinteger (L, INDEX_CHARTABLES_META);
lua_rawget (L, ALG_ENVIRONINDEX);
}
static int getcflags (lua_State *L, int pos) {
switch (lua_type (L, pos)) {
case LUA_TNONE:
@@ -145,6 +141,11 @@ static void checkarg_dfa_exec (lua_State *L, TArgExec *argE, TPcre2 **ud) {
argE->wscount = luaL_optint (L, 6, 50);
}
static void push_chartables_meta (lua_State *L) {
lua_pushinteger (L, INDEX_CHARTABLES_META);
lua_rawget (L, ALG_ENVIRONINDEX);
}
static int Lpcre2_maketables (lua_State *L) {
*(const void**)lua_newuserdata (L, sizeof(void*)) = pcre2_maketables(NULL); //### argument NULL
push_chartables_meta (L);
@@ -176,6 +177,12 @@ static int chartables_gc (lua_State *L) {
return 0;
}
static int chartables_tostring (lua_State *L) {
void **ud = check_chartables (L, 1);
lua_pushfstring (L, "%s (%p)", chartables_typename, ud);
return 1;
}
static void checkarg_compile (lua_State *L, int pos, TArgComp *argC) {
argC->locale = NULL;
argC->tables = NULL;
@@ -193,23 +200,26 @@ static int compile_regex (lua_State *L, const TArgComp *argC, TPcre2 **pud) {
int errcode;
PCRE2_SIZE erroffset;
TPcre2 *ud;
const unsigned char *tables = NULL;
ud = (TPcre2*)lua_newuserdata (L, sizeof (TPcre2));
memset (ud, 0, sizeof (TPcre2)); /* initialize all members to 0 */
lua_pushvalue (L, ALG_ENVIRONINDEX);
lua_setmetatable (L, -2);
memset (ud, 0, sizeof (TPcre2)); /* initialize all members to 0 */
ud->ccontext = pcre2_compile_context_create(NULL);
if (ud->ccontext == NULL)
return luaL_error (L, "malloc failed");
if (argC->locale) {
char old_locale[256];
strcpy (old_locale, setlocale (LC_CTYPE, NULL)); /* store the locale */
if (NULL == setlocale (LC_CTYPE, argC->locale)) /* set new locale */
return luaL_error (L, "cannot set locale");
ud->tables = tables = pcre2_maketables (NULL); /* make tables with new locale */ //### argument NULL
ud->tables = pcre2_maketables (NULL); /* make tables with new locale */ //### argument NULL
pcre2_set_character_tables(ud->ccontext, ud->tables);
setlocale (LC_CTYPE, old_locale); /* restore the old locale */
}
else if (argC->tables) {
tables = argC->tables;
pcre2_set_character_tables(ud->ccontext, argC->tables);
lua_pushinteger (L, INDEX_CHARTABLES_LINK);
lua_rawget (L, ALG_ENVIRONINDEX);
lua_pushvalue (L, -2);
@@ -219,7 +229,7 @@ static int compile_regex (lua_State *L, const TArgComp *argC, TPcre2 **pud) {
}
ud->pr = pcre2_compile ((PCRE2_SPTR)argC->pattern, argC->patlen, argC->cflags, &errcode,
&erroffset, /*tables*/NULL); //### DOUBLE-CHECK ALL ARGUMENTS
&erroffset, ud->ccontext); //### DOUBLE-CHECK ALL ARGUMENTS
if (!ud->pr) {
if (push_error_message(L, errcode))
return luaL_error (L, "%s (pattern offset: %d)", lua_tostring(L,-1), erroffset + 1);
@@ -338,9 +348,10 @@ static int Lpcre2_gc (lua_State *L) {
TPcre2 *ud = check_ud (L);
if (ud->freed == 0) { /* precaution against "manual" __gc calling */
ud->freed = 1;
if (ud->pr) pcre2_code_free (ud->pr);
if (ud->pr) pcre2_code_free (ud->pr);
//if (ud->tables) pcre_free ((void *)ud->tables); //###
pcre2_match_data_free (ud->match_data);
if (ud->ccontext) pcre2_compile_context_free (ud->ccontext);
if (ud->match_data) pcre2_match_data_free (ud->match_data);
}
return 0;
}
@@ -354,12 +365,6 @@ static int Lpcre2_tostring (lua_State *L) {
return 1;
}
static int chartables_tostring (lua_State *L) {
void **ud = check_chartables (L, 1);
lua_pushfstring (L, "%s (%p)", chartables_typename, ud);
return 1;
}
static int Lpcre2_version (lua_State *L) {
char buf[64];
pcre2_config(PCRE2_CONFIG_VERSION, buf);
test/pcre_sets.lua
+1 -1
View File
@@ -28,7 +28,7 @@ end
local function set_f_find (lib, flg)
local cp1251 =
"ÀÁÂÃÄŨÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÜÛÚÝÞßàáâãäå¸æçèéêëìíîïðñòóôõö÷øùüûúýþÿ"
"ÀÁÂÃÄŨÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäå¸æçèéêëìíîïðñòóôõö÷øùúûüýþÿ"
local loc = "Russian_Russia.1251"
return {
Name = "Function find",