texlive[50325] Build/source/texk/web2c/luatexdir: Sync with luatex
commits+lscarso at tug.org
commits+lscarso at tug.org
Sun Mar 10 23:27:11 CET 2019
Revision: 50325
http://tug.org/svn/texlive?view=revision&revision=50325
Author: lscarso
Date: 2019-03-10 23:27:11 +0100 (Sun, 10 Mar 2019)
Log Message:
-----------
Sync with luatex rev. 7112.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
trunk/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c
trunk/Build/source/texk/web2c/luatexdir/luazlib/lgzip.c
trunk/Build/source/texk/web2c/luatexdir/tex/nesting.c
Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2019-03-10 22:20:23 UTC (rev 50324)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2019-03-10 22:27:11 UTC (rev 50325)
@@ -1 +1 @@
-#define luatex_svn_revision 7097
+#define luatex_svn_revision 7110
Modified: trunk/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c 2019-03-10 22:20:23 UTC (rev 50324)
+++ trunk/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c 2019-03-10 22:27:11 UTC (rev 50325)
@@ -29,7 +29,7 @@
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 @@
/* 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 @@
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 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 @@
if (op < 0)
return pushresult(L, 0, NULL); /* error */
else {
- lua_pushnumber(L, zzip_tell(f));
+ lua_pushinteger(L, zzip_tell(f));
return 1;
}
}
Modified: trunk/Build/source/texk/web2c/luatexdir/luazlib/lgzip.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luazlib/lgzip.c 2019-03-10 22:20:23 UTC (rev 50324)
+++ trunk/Build/source/texk/web2c/luatexdir/luazlib/lgzip.c 2019-03-10 22:27:11 UTC (rev 50325)
@@ -59,7 +59,7 @@
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 @@
if (op == -1)
return pushresult(L, 0, NULL); /* error */
else {
- lua_pushnumber(L, op);
+ lua_pushinteger(L, op);
return 1;
}
}
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/nesting.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/nesting.c 2019-03-10 22:20:23 UTC (rev 50324)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/nesting.c 2019-03-10 22:27:11 UTC (rev 50325)
@@ -273,8 +273,8 @@
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 {
More information about the tex-live-commits
mailing list