Skip to content

Commit

Permalink
update lua5.4.7
Browse files Browse the repository at this point in the history
  • Loading branch information
actboy168 committed May 11, 2024
1 parent 22784bf commit 453b1c0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion 3rd/lua/lgc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,7 @@ static void fullinc (lua_State *L, global_State *g) {
/* finish any pending sweep phase to start a new cycle */
luaC_runtilstate(L, bitmask(GCSpause));
luaC_runtilstate(L, bitmask(GCSpropagate)); /* start new cycle */
g->gcstate = GCSenteratomic; /* go straight to atomic phase ??? */
g->gcstate = GCSenteratomic; /* go straight to atomic phase */
luaC_runtilstate(L, bitmask(GCScallfin)); /* run up to finalizers */
/* estimate must be correct after a full GC cycle */
lua_assert(g->GCestimate == gettotalbytes(g));
Expand Down
2 changes: 1 addition & 1 deletion 3rd/lua/lmathlib.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ static lua_Number I2d (Rand64 x) {
SRand64 sx = (SRand64)(trim64(x) >> shift64_FIG);
lua_Number res = (lua_Number)(sx) * scaleFIG;
if (sx < 0)
res += 1.0; /* correct the two's complement if negative */
res += l_mathop(1.0); /* correct the two's complement if negative */
lua_assert(0 <= res && res < 1);
return res;
}
Expand Down
6 changes: 3 additions & 3 deletions 3rd/lua/lua.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
#include <stddef.h>


#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2023 Lua.org, PUC-Rio"
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2024 Lua.org, PUC-Rio"
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"


#define LUA_VERSION_MAJOR_N 5
#define LUA_VERSION_MINOR_N 4
#define LUA_VERSION_RELEASE_N 6
#define LUA_VERSION_RELEASE_N 7

#define LUA_VERSION_NUM (LUA_VERSION_MAJOR_N * 100 + LUA_VERSION_MINOR_N)
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + LUA_VERSION_RELEASE_N)
Expand Down Expand Up @@ -511,7 +511,7 @@ struct lua_Debug {


/******************************************************************************
* Copyright (C) 1994-2023 Lua.org, PUC-Rio.
* Copyright (C) 1994-2024 Lua.org, PUC-Rio.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
Expand Down
2 changes: 1 addition & 1 deletion 3rd/lua/lvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static int l_strton (const TValue *obj, TValue *result) {
if (!cvt2num(obj)) /* is object not a string? */
return 0;
else {
TString *st = tsvalue(obj);
TString *st = tsvalue(obj);
return (luaO_str2num(getstr(st), result) == tsslen(st) + 1);
}
}
Expand Down

0 comments on commit 453b1c0

Please sign in to comment.