Update Lua 5.4 to 5.4.0-rc3 and bump version to 535.0.3+540rc3

khvzak · khvzak · commit 26fde6ba83ca · 2020-05-28T23:17:26.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "lua-src"
-version = "535.0.2+540rc1"
+version = "535.0.3+540rc3"
 authors = ["Aleksandr Orlenko <zxteam@protonmail.com>"]
 edition = "2018"
 repository = "https://github.com/khvzak/lua-src-rs"
 keywords = ["lua", "lua51", "lua52", "lua53", "lua54"]
 readme = "README.md"
 license = "MIT"
 description = """
-Sources of Lua 5.1/5.2/5.3/5.4(rc1) and logic to build them.
+Sources of Lua 5.1/5.2/5.3/5.4(rc3) and logic to build them.
 """
 
 [workspace]
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # lua-src
 
-This crate contains the sources of Lua 5.1/5.2/5.3/5.4(rc1) and logic to build them.
+This crate contains the sources of Lua 5.1/5.2/5.3/5.4(rc3) and logic to build them.
 Intended to be consumed by the [mlua](https://crates.io/crates/mlua) crate.
 
 # License
diff --git a/lua-5.4.0/lauxlib.c b/lua-5.4.0/lauxlib.c
@@ -87,7 +87,7 @@ static int pushglobalfuncname (lua_State *L, lua_Debug *ar) {
       lua_remove(L, -2);  /* remove original name */
     }
     lua_copy(L, -1, top + 1);  /* copy name to proper place */
-    lua_settop(L, top + 1);  /* remove table "loaded" an name copy */
+    lua_settop(L, top + 1);  /* remove table "loaded" and name copy */
     return 1;
   }
   else {
diff --git a/lua-5.4.0/ldump.c b/lua-5.4.0/ldump.c
@@ -196,7 +196,7 @@ static void dumpFunction (DumpState *D, const Proto *f, TString *psource) {
 
 static void dumpHeader (DumpState *D) {
   dumpLiteral(D, LUA_SIGNATURE);
-  dumpInt(D, LUAC_VERSION);
+  dumpByte(D, LUAC_VERSION);
   dumpByte(D, LUAC_FORMAT);
   dumpLiteral(D, LUAC_DATA);
   dumpByte(D, sizeof(Instruction));
diff --git a/lua-5.4.0/ljumptab.h b/lua-5.4.0/ljumptab.h
@@ -16,7 +16,7 @@
 #define vmbreak		vmfetch(); vmdispatch(GET_OPCODE(i));
 
 
-static void *disptab[NUM_OPCODES] = {
+static const void *const disptab[NUM_OPCODES] = {
 
 #if 0
 ** you can update the following list with this command:
diff --git a/lua-5.4.0/lmathlib.c b/lua-5.4.0/lmathlib.c
@@ -328,7 +328,7 @@ static Rand64 nextrand (Rand64 *state) {
 */
 
 /* must throw out the extra (64 - FIGS) bits */
-#define shift64_FIG  	(64 - FIGS)
+#define shift64_FIG	(64 - FIGS)
 
 /* to scale to [0, 1), multiply by scaleFIG = 2^(-FIGS) */
 #define scaleFIG	(l_mathop(0.5) / ((Rand64)1 << (FIGS - 1)))
diff --git a/lua-5.4.0/loadlib.c b/lua-5.4.0/loadlib.c
@@ -67,6 +67,13 @@ static const char *const CLIBS = "_CLIBS";
 #define setprogdir(L)           ((void)0)
 
 
+/*
+** Special type equivalent to '(void*)' for functions in gcc
+** (to suppress warnings when converting function pointers)
+*/
+typedef void (*voidf)(void);
+
+
 /*
 ** system-dependent functions
 */
@@ -206,7 +213,7 @@ static void *lsys_load (lua_State *L, const char *path, int seeglb) {
 
 
 static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
-  lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
+  lua_CFunction f = (lua_CFunction)(voidf)GetProcAddress((HMODULE)lib, sym);
   if (f == NULL) pusherror(L);
   return f;
 }
@@ -269,8 +276,6 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
 #endif
 
 
-#define AUXMARK         "\1"	/* auxiliary mark */
-
 
 /*
 ** return registry.LUA_NOENV as a boolean
diff --git a/lua-5.4.0/lobject.h b/lua-5.4.0/lobject.h
@@ -356,8 +356,7 @@ typedef struct GCObject {
 
 
 /*
-** Header for string value; string bytes follow the end of this structure
-** (aligned according to 'UTString'; see next).
+** Header for string value; string bytes follow the end of this structure.
 */
 typedef struct TString {
   CommonHeader;
diff --git a/lua-5.4.0/lopcodes.c b/lua-5.4.0/lopcodes.c
@@ -10,8 +10,6 @@
 #include "lprefix.h"
 
 
-#include <stddef.h>
-
 #include "lopcodes.h"
 
 
diff --git a/lua-5.4.0/lopcodes.h b/lua-5.4.0/lopcodes.h
@@ -201,9 +201,9 @@ OP_MOVE,/*	A B	R[A] := R[B]					*/
 OP_LOADI,/*	A sBx	R[A] := sBx					*/
 OP_LOADF,/*	A sBx	R[A] := (lua_Number)sBx				*/
 OP_LOADK,/*	A Bx	R[A] := K[Bx]					*/
-OP_LOADKX,/*	A 	R[A] := K[extra arg]				*/
-OP_LOADFALSE,/*	A  	R[A] := false					*/
-OP_LFALSESKIP,/*A 	R[A] := false; pc++				*/
+OP_LOADKX,/*	A	R[A] := K[extra arg]				*/
+OP_LOADFALSE,/*	A	R[A] := false					*/
+OP_LFALSESKIP,/*A	R[A] := false; pc++				*/
 OP_LOADTRUE,/*	A	R[A] := true					*/
 OP_LOADNIL,/*	A B	R[A], R[A+1], ..., R[A+B] := nil		*/
 OP_GETUPVAL,/*	A B	R[A] := UpValue[B]				*/
@@ -263,11 +263,11 @@ OP_BNOT,/*	A B	R[A] := ~R[B]					*/
 OP_NOT,/*	A B	R[A] := not R[B]				*/
 OP_LEN,/*	A B	R[A] := length of R[B]				*/
 
-OP_CONCAT,/*	A B  	R[A] := R[A].. ... ..R[A + B - 1]		*/
+OP_CONCAT,/*	A B	R[A] := R[A].. ... ..R[A + B - 1]		*/
 
 OP_CLOSE,/*	A	close all upvalues >= R[A]			*/
 OP_TBC,/*	A	mark variable A "to be closed"			*/
-OP_JMP,/*	sJ	pc += sJ  					*/
+OP_JMP,/*	sJ	pc += sJ					*/
 OP_EQ,/*	A B k	if ((R[A] == R[B]) ~= k) then pc++		*/
 OP_LT,/*	A B k	if ((R[A] <  R[B]) ~= k) then pc++		*/
 OP_LE,/*	A B k	if ((R[A] <= R[B]) ~= k) then pc++		*/
@@ -279,15 +279,15 @@ OP_LEI,/*	A sB k	if ((R[A] <= sB) ~= k) then pc++		*/
 OP_GTI,/*	A sB k	if ((R[A] > sB) ~= k) then pc++			*/
 OP_GEI,/*	A sB k	if ((R[A] >= sB) ~= k) then pc++		*/
 
-OP_TEST,/*	A k 	if (not R[A] == k) then pc++			*/
+OP_TEST,/*	A k	if (not R[A] == k) then pc++			*/
 OP_TESTSET,/*	A B k	if (not R[B] == k) then pc++ else R[A] := R[B]	*/
 
 OP_CALL,/*	A B C	R[A], ... ,R[A+C-2] := R[A](R[A+1], ... ,R[A+B-1]) */
 OP_TAILCALL,/*	A B C k	return R[A](R[A+1], ... ,R[A+B-1])		*/
 
 OP_RETURN,/*	A B C k	return R[A], ... ,R[A+B-2]	(see note)	*/
-OP_RETURN0,/*	  	return 						*/
-OP_RETURN1,/*	A 	return R[A]					*/
+OP_RETURN0,/*		return						*/
+OP_RETURN1,/*	A	return R[A]					*/
 
 OP_FORLOOP,/*	A Bx	update counters; if loop continues then pc-=Bx; */
 OP_FORPREP,/*	A Bx	<check values and prepare counters>;
@@ -301,9 +301,9 @@ OP_SETLIST,/*	A B C k	R[A][(C-1)*FPF+i] := R[A+i], 1 <= i <= B	*/
 
 OP_CLOSURE,/*	A Bx	R[A] := closure(KPROTO[Bx])			*/
 
-OP_VARARG,/*	A C  	R[A], R[A+1], ..., R[A+C-2] = vararg		*/
+OP_VARARG,/*	A C	R[A], R[A+1], ..., R[A+C-2] = vararg		*/
 
-OP_VARARGPREP,/*A 	(adjust vararg parameters)			*/
+OP_VARARGPREP,/*A	(adjust vararg parameters)			*/
 
 OP_EXTRAARG/*	Ax	extra (larger) argument for previous opcode	*/
 } OpCode;
diff --git a/lua-5.4.0/lopnames.h b/lua-5.4.0/lopnames.h
@@ -7,6 +7,9 @@
 #if !defined(lopnames_h)
 #define lopnames_h
 
+#include <stddef.h>
+
+
 /* ORDER OP */
 
 static const char *const opnames[] = {
diff --git a/lua-5.4.0/loslib.c b/lua-5.4.0/loslib.c
@@ -91,7 +91,7 @@
 
 /* ISO C definitions */
 #define l_gmtime(t,r)		((void)(r)->tm_sec, gmtime(t))
-#define l_localtime(t,r)  	((void)(r)->tm_sec, localtime(t))
+#define l_localtime(t,r)	((void)(r)->tm_sec, localtime(t))
 
 #endif				/* } */
 
diff --git a/lua-5.4.0/lparser.c b/lua-5.4.0/lparser.c
@@ -1822,8 +1822,9 @@ static void exprstat (LexState *ls) {
     restassign(ls, &v, 1);
   }
   else {  /* stat -> func */
-    Instruction *inst = &getinstruction(fs, &v.v);
+    Instruction *inst;
     check_condition(ls, v.v.k == VCALL, "syntax error");
+    inst = &getinstruction(fs, &v.v);
     SETARG_C(*inst, 1);  /* call statement uses no results */
   }
 }
diff --git a/lua-5.4.0/lprefix.h b/lua-5.4.0/lprefix.h
@@ -33,7 +33,7 @@
 /*
 ** Windows stuff
 */
-#if defined(_WIN32) 	/* { */
+#if defined(_WIN32)	/* { */
 
 #if !defined(_CRT_SECURE_NO_WARNINGS)
 #define _CRT_SECURE_NO_WARNINGS  /* avoid warnings about ISO C functions */
diff --git a/lua-5.4.0/ltable.h b/lua-5.4.0/ltable.h
@@ -27,7 +27,7 @@
 
 
 /* returns the Node, given the value of a table entry */
-#define nodefromval(v) 	cast(Node *, (v))
+#define nodefromval(v)	cast(Node *, (v))
 
 
 LUAI_FUNC const TValue *luaH_getint (Table *t, lua_Integer key);
diff --git a/lua-5.4.0/lundump.c b/lua-5.4.0/lundump.c
@@ -276,7 +276,7 @@ static void fchecksize (LoadState *S, size_t size, const char *tname) {
 static void checkHeader (LoadState *S) {
   /* skip 1st char (already read and checked) */
   checkliteral(S, &LUA_SIGNATURE[1], "not a binary chunk");
-  if (loadInt(S) != LUAC_VERSION)
+  if (loadByte(S) != LUAC_VERSION)
     error(S, "version mismatch");
   if (loadByte(S) != LUAC_FORMAT)
     error(S, "format mismatch");
diff --git a/lua-5.4.0/lundump.h b/lua-5.4.0/lundump.h
@@ -18,7 +18,12 @@
 #define LUAC_INT	0x5678
 #define LUAC_NUM	cast_num(370.5)
 
-#define LUAC_VERSION	LUA_VERSION_NUM
+/*
+** Encode major-minor version in one byte, one nibble for each
+*/
+#define MYINT(s)	(s[0]-'0')  /* assume one-digit numerals */
+#define LUAC_VERSION	(MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR))
+
 #define LUAC_FORMAT	0	/* this is the official format */
 
 /* load one chunk; from lundump.c */
diff --git a/lua-5.4.0/lvm.h b/lua-5.4.0/lvm.h
@@ -41,9 +41,9 @@
 ** Rounding modes for float->integer coercion
  */
 typedef enum {
-  F2Ieq,  /* no rounding; accepts only integral values */
+  F2Ieq,     /* no rounding; accepts only integral values */
   F2Ifloor,  /* takes the floor of the number */
-  F2Iceil,  /* takes the ceil of the number */
+  F2Iceil    /* takes the ceil of the number */
 } F2Imod;
 
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ static int pushglobalfuncname (lua_State L, lua_Debug ar) {`
`87`	`87`	`lua_remove(L, -2); /* remove original name */`
`88`	`88`	`}`
`89`	`89`	`lua_copy(L, -1, top + 1); /* copy name to proper place */`
`90`		`- lua_settop(L, top + 1); /* remove table "loaded" an name copy */`
	`90`	`+ lua_settop(L, top + 1); /* remove table "loaded" and name copy */`
`91`	`91`	`return 1;`
`92`	`92`	`}`
`93`	`93`	`else {`