diff options
| -rwxr-xr-x | src/algo.h | 6 | ||||
| -rwxr-xr-x | src/lpcre.c | 6 | ||||
| -rwxr-xr-x | src/lposix.c | 1 | ||||
| -rwxr-xr-x | src/ltre.c | 1 |
4 files changed, 7 insertions, 7 deletions
@@ -11,7 +11,9 @@ static int gsub_exec (TUserdata *ud, TArgExec *argE, int offset); static int split_exec (TUserdata *ud, TArgExec *argE, int offset); static int compile_regex (lua_State *L, const TArgComp *argC, TUserdata **pud); static int generate_error (lua_State *L, const TUserdata *ud, int errcode); +#ifdef DO_NAMED_SUBPATTERNS static void do_named_subpatterns (lua_State *L, TUserdata *ud, const char *text); +#endif static TUserdata* check_ud (lua_State *L, int stackpos) { @@ -444,7 +446,9 @@ static int generic_tfind (lua_State *L, int tfind) { push_substring_table (L, ud, argE.text); else push_offset_table (L, ud, argE.startoffset); - DO_NAMED_SUBPATTERNS (L, ud, argE.text); +#ifdef DO_NAMED_SUBPATTERNS + do_named_subpatterns (L, ud, argE.text); +#endif return 3; } else if (res == CODE_NOMATCH) diff --git a/src/lpcre.c b/src/lpcre.c index da1dfcc..02fcff3 100755 --- a/src/lpcre.c +++ b/src/lpcre.c @@ -49,9 +49,7 @@ extern flag_pair pcre_error_flags[]; #define PULL(st,from) (st = (from)) #define OPTLOCALE(trg,L,pos) (trg = luaL_optstring (L, pos, NULL)) #if PCRE_MAJOR >= 4 -# define DO_NAMED_SUBPATTERNS do_named_subpatterns -#else -# define DO_NAMED_SUBPATTERNS(L,ud,text) ((void)L) +# define DO_NAMED_SUBPATTERNS 1 #endif @@ -153,7 +151,7 @@ static void do_named_subpatterns (lua_State *L, TPcre *ud, const char *text) { for (i = 0; i < namecount; i++) { int n = (tabptr[0] << 8) | tabptr[1]; /* number of the capturing parenthesis */ if (n > 0 && n <= NSUB(ud)) { /* check range */ - lua_pushstring (L, tabptr + 2); /* name of the capture, zero terminated */ + lua_pushstring (L, (char *)(tabptr + 2)); /* name of the capture, zero terminated */ PUSH_SUB_OR_FALSE (L, ud, text, n); lua_rawset (L, -3); } diff --git a/src/lposix.c b/src/lposix.c index a8c0216..2c737c8 100755 --- a/src/lposix.c +++ b/src/lposix.c @@ -67,7 +67,6 @@ #define BASE(st) (st) #define PULL(st,from) ((void)st) #define OPTLOCALE(trg,L,pos) ((void)trg) -#define DO_NAMED_SUBPATTERNS(L,ud,text) ((void)L) typedef struct { regex_t r; @@ -44,7 +44,6 @@ #define BASE(st) (st) #define PULL(st,from) ((void)st) #define OPTLOCALE(trg,L,pos) ((void)trg) -#define DO_NAMED_SUBPATTERNS(L,ud,text) ((void)L) typedef struct { regex_t r; |