From c34d34b142b835ece2a1ba616d761d9790d1fa32 Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Sun, 10 Mar 2019 22:27:11 +0000 Subject: Sync with luatex rev. 7112. git-svn-id: svn://tug.org/texlive/trunk@50325 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/luatex_svnversion.h | 2 +- Build/source/texk/web2c/luatexdir/luazip/src/luazip.c | 14 +++++++------- Build/source/texk/web2c/luatexdir/luazlib/lgzip.c | 4 ++-- Build/source/texk/web2c/luatexdir/tex/nesting.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h index 672814ea5ef..b44d044ecb2 100644 --- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1 +1 @@ -#define luatex_svn_revision 7097 +#define luatex_svn_revision 7110 diff --git a/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c b/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c index cebd343cece..fe841982de0 100644 --- a/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c +++ b/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c @@ -29,7 +29,7 @@ static int pushresult (lua_State *L, int i, const char *filename) { lua_pushfstring(L, "%s: %s", filename, zzip_strerror(zzip_errno(errno))); else lua_pushfstring(L, "%s", zzip_strerror(zzip_errno(errno))); - lua_pushnumber(L, zzip_errno(errno)); + lua_pushinteger(L, zzip_errno(errno)); return 3; } } @@ -150,7 +150,7 @@ static int zip_openfile (lua_State *L) { /* replaces the string by the table with the string inside */ lua_replace(L, 2); } - + if (lua_istable(L, 2)) { int i, m, n; @@ -248,9 +248,9 @@ static int zip_readfile (lua_State *L) { return 0; lua_newtable(L); - lua_pushstring(L, "compressed_size"); lua_pushnumber(L, ent->d_csize); lua_settable(L, -3); - lua_pushstring(L, "compression_method"); lua_pushnumber(L, ent->d_compr); lua_settable(L, -3); - lua_pushstring(L, "uncompressed_size"); lua_pushnumber(L, ent->st_size); lua_settable(L, -3); + lua_pushstring(L, "compressed_size"); lua_pushinteger(L, ent->d_csize); lua_settable(L, -3); + lua_pushstring(L, "compression_method"); lua_pushinteger(L, ent->d_compr); lua_settable(L, -3); + lua_pushstring(L, "uncompressed_size"); lua_pushinteger(L, ent->st_size); lua_settable(L, -3); lua_pushstring(L, "filename"); lua_pushstring(L, ent->d_name); lua_settable(L, -3); return 1; @@ -321,7 +321,7 @@ static int zzip_fscanf (ZZIP_FILE *f, const char *format, ...) static int read_number (lua_State *L, ZZIP_FILE *f) { lua_Number d; if (zzip_fscanf(f, LUA_NUMBER_SCAN, &d) == 1) { - lua_pushnumber(L, d); + lua_pushinteger(L, d); return 1; } else return 0; // read fails @@ -459,7 +459,7 @@ static int ff_seek (lua_State *L) { if (op < 0) return pushresult(L, 0, NULL); /* error */ else { - lua_pushnumber(L, zzip_tell(f)); + lua_pushinteger(L, zzip_tell(f)); return 1; } } diff --git a/Build/source/texk/web2c/luatexdir/luazlib/lgzip.c b/Build/source/texk/web2c/luatexdir/luazlib/lgzip.c index 9a10e9242b6..a6efceb838a 100644 --- a/Build/source/texk/web2c/luatexdir/luazlib/lgzip.c +++ b/Build/source/texk/web2c/luatexdir/luazlib/lgzip.c @@ -59,7 +59,7 @@ static int pushresult (lua_State *L, int i, const char *filename) { lua_pushfstring(L, "%s: %s", filename, strerror(errno)); else lua_pushfstring(L, "%s", strerror(errno)); - lua_pushnumber(L, errno); + lua_pushinteger(L, errno); return 3; } } @@ -318,7 +318,7 @@ static int f_seek (lua_State *L) { if (op == -1) return pushresult(L, 0, NULL); /* error */ else { - lua_pushnumber(L, op); + lua_pushinteger(L, op); return 1; } } diff --git a/Build/source/texk/web2c/luatexdir/tex/nesting.c b/Build/source/texk/web2c/luatexdir/tex/nesting.c index 0e50c1031dc..bbad50b3cdb 100644 --- a/Build/source/texk/web2c/luatexdir/tex/nesting.c +++ b/Build/source/texk/web2c/luatexdir/tex/nesting.c @@ -273,8 +273,8 @@ halfword pop_tail(void) while (vlink(n) != cur_list.tail_field) n = vlink(n); } - flush_node(cur_list.tail_field); cur_list.tail_field = n; + alink(r) = null; vlink(n) = null; return r; } else { -- cgit v1.2.3