From ecbdb7a945cc392bfb0c9c7a04228e3eb729e5ab Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Sat, 25 Sep 2021 13:01:01 -0400 Subject: [PATCH] Reverted bledthrough changes. --- src/api/api.h | 2 -- src/api/regex.c | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/api/api.h b/src/api/api.h index e7bc57ea..2e9bdb2e 100644 --- a/src/api/api.h +++ b/src/api/api.h @@ -8,8 +8,6 @@ #define API_TYPE_FONT "Font" #define API_TYPE_PROCESS "Process" -#define API_CONSTANT_DEFINE(L, idx, key, n) (lua_pushnumber(L, n), lua_setfield(L, idx - 1, key)) - void api_load_libs(lua_State *L); #endif diff --git a/src/api/regex.c b/src/api/regex.c index e0f94056..1043b1c5 100644 --- a/src/api/regex.c +++ b/src/api/regex.c @@ -101,11 +101,17 @@ int luaopen_regex(lua_State *L) { lua_setfield(L, -2, "__name"); lua_pushvalue(L, -1); lua_setfield(L, LUA_REGISTRYINDEX, "regex"); - API_CONSTANT_DEFINE(L, -1, "ANCHORED", PCRE2_ANCHORED); - API_CONSTANT_DEFINE(L, -1, "ENDANCHORED", PCRE2_ENDANCHORED); - API_CONSTANT_DEFINE(L, -1, "NOTBOL", PCRE2_NOTBOL); - API_CONSTANT_DEFINE(L, -1, "NOTEOL", PCRE2_NOTEOL); - API_CONSTANT_DEFINE(L, -1, "NOTEMPTY", PCRE2_NOTEMPTY); - API_CONSTANT_DEFINE(L, -1, "NOTEMPTY_ATSTART", PCRE2_NOTEMPTY_ATSTART); + lua_pushnumber(L, PCRE2_ANCHORED); + lua_setfield(L, -2, "ANCHORED"); + lua_pushnumber(L, PCRE2_ANCHORED) ; + lua_setfield(L, -2, "ENDANCHORED"); + lua_pushnumber(L, PCRE2_NOTBOL); + lua_setfield(L, -2, "NOTBOL"); + lua_pushnumber(L, PCRE2_NOTEOL); + lua_setfield(L, -2, "NOTEOL"); + lua_pushnumber(L, PCRE2_NOTEMPTY); + lua_setfield(L, -2, "NOTEMPTY"); + lua_pushnumber(L, PCRE2_NOTEMPTY_ATSTART); + lua_setfield(L, -2, "NOTEMPTY_ATSTART"); return 1; }