Merge branch 'daurnimator-pushstring-return'

4 files changed, 20 insertions, 0 deletions

diff --git a/README.md b/README.md
index 25bc911..08614a1 100644
--- a/README.md
+++ b/README.md
@@ -147,6 +147,7 @@ For Lua 5.1 additionally:
 * `lua_arith` (see [here][19])
 * `lua_compare`
 * `lua_len`, `lua_rawlen`, and `luaL_len`
+* `lua_pushstring`, `lua_pushlstring` (return value)
 * `lua_copy`
 * `lua_pushglobaltable`
 * `luaL_testudata`
diff --git a/c-api/compat-5.3.h b/c-api/compat-5.3.h
index 0083eb4..7dd77c6 100644
--- a/c-api/compat-5.3.h
+++ b/c-api/compat-5.3.h
@@ -119,6 +119,12 @@ COMPAT53_API void lua_copy (lua_State *L, int from, int to);
 #define lua_len COMPAT53_CONCAT(COMPAT53_PREFIX, _len)
 COMPAT53_API void lua_len (lua_State *L, int i);
 
+#define lua_pushstring(L, s) \
+  (lua_pushstring(L, (s)), lua_tostring(L, -1))
+
+#define lua_pushlstring(L, s, len) \
+  ((((len) == 0) ? lua_pushlstring(L, "", 0) : lua_pushlstring(L, (s), (len))), lua_tostring(L, -1))
+
 #ifndef luaL_newlibtable
 #  define luaL_newlibtable(L, l) \
   (lua_createtable(L, 0, sizeof(l)/sizeof(*(l))-1))
diff --git a/tests/test.lua b/tests/test.lua
index be16af9..582f55e 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -776,6 +776,9 @@ meta.__name = "XXX"
 print(mod.tolstring(ud):gsub(":.*$", ": yyy"))
 
 ___''
+print(mod.pushstring())
+
+___''
 print(mod.buffer())
 
 ___''
diff --git a/tests/testmod.c b/tests/testmod.c
index 2293064..868136b 100644
--- a/tests/testmod.c
+++ b/tests/testmod.c
@@ -246,6 +246,15 @@ static int test_tolstring (lua_State *L) {
   return 2;
 }
 
+static int test_pushstring (lua_State *L) {
+  lua_pushstring(L, lua_pushliteral(L, "abc"));
+  lua_pushstring(L, lua_pushlstring(L, "abc", 2));
+  lua_pushstring(L, lua_pushlstring(L, NULL, 0));
+  lua_pushstring(L, lua_pushstring(L, "abc"));
+  lua_pushboolean(L, NULL == lua_pushstring(L, NULL));
+  return 10;
+}
+
 static int test_buffer (lua_State *L) {
   luaL_Buffer b;
   char *p = luaL_buffinitsize(L, &b, LUAL_BUFFERSIZE+1);
@@ -285,6 +294,7 @@ static const luaL_Reg funcs[] = {
   { "uservalue", test_uservalue },
   { "globals", test_globals },
   { "tolstring", test_tolstring },
+  { "pushstring", test_pushstring },
   { "buffer", test_buffer },
   { "exec", test_exec },
   { NULL, NULL }