diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2023-06-22 11:41:48 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2023-06-22 11:41:48 -0300 |
| commit | ab6a94952215b1f66436d8eeebded1dad9fa5409 (patch) | |
| tree | ba66254537defc76602ce351d962b899ddfe1b29 /lua.h | |
| parent | 86e8039a72646cd9192fd08a6f1771c90b872ff6 (diff) | |
| parent | ea39042e13645f63713425c05cc9ee4cfdcf0a40 (diff) | |
| download | lua-ab6a94952215b1f66436d8eeebded1dad9fa5409.tar.gz lua-ab6a94952215b1f66436d8eeebded1dad9fa5409.tar.bz2 lua-ab6a94952215b1f66436d8eeebded1dad9fa5409.zip | |
Merge branch 'master' into nextversion
Diffstat (limited to 'lua.h')
| -rw-r--r-- | lua.h | 38 |
1 files changed, 25 insertions, 13 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lua.h $ | 2 | ** $Id: lua.h $ |
| 3 | ** Lua - A Scripting Language | 3 | ** Lua - A Scripting Language |
| 4 | ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) | 4 | ** Lua.org, PUC-Rio, Brazil (www.lua.org) |
| 5 | ** See Copyright Notice at the end of this file | 5 | ** See Copyright Notice at the end of this file |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| @@ -13,20 +13,19 @@ | |||
| 13 | #include <stddef.h> | 13 | #include <stddef.h> |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #include "luaconf.h" | 16 | #define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2023 Lua.org, PUC-Rio" |
| 17 | #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes" | ||
| 17 | 18 | ||
| 18 | 19 | ||
| 19 | #define LUA_VERSION_MAJOR "5" | 20 | #define LUA_VERSION_MAJOR_N 5 |
| 20 | #define LUA_VERSION_MINOR "5" | 21 | #define LUA_VERSION_MINOR_N 5 |
| 21 | #define LUA_VERSION_RELEASE "0" | 22 | #define LUA_VERSION_RELEASE_N 0 |
| 22 | 23 | ||
| 23 | #define LUA_VERSION_NUM 505 | 24 | #define LUA_VERSION_NUM (LUA_VERSION_MAJOR_N * 100 + LUA_VERSION_MINOR_N) |
| 24 | #define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 0) | 25 | #define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + LUA_VERSION_RELEASE_N) |
| 25 | 26 | ||
| 26 | #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR | 27 | |
| 27 | #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE | 28 | #include "luaconf.h" |
| 28 | #define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2022 Lua.org, PUC-Rio" | ||
| 29 | #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes" | ||
| 30 | 29 | ||
| 31 | 30 | ||
| 32 | /* mark for precompiled code ('<esc>Lua') */ | 31 | /* mark for precompiled code ('<esc>Lua') */ |
| @@ -164,7 +163,7 @@ LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud, | |||
| 164 | unsigned int seed); | 163 | unsigned int seed); |
| 165 | LUA_API void (lua_close) (lua_State *L); | 164 | LUA_API void (lua_close) (lua_State *L); |
| 166 | LUA_API lua_State *(lua_newthread) (lua_State *L); | 165 | LUA_API lua_State *(lua_newthread) (lua_State *L); |
| 167 | LUA_API int (lua_resetthread) (lua_State *L, lua_State *from); | 166 | LUA_API int (lua_closethread) (lua_State *L, lua_State *from); |
| 168 | 167 | ||
| 169 | LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf); | 168 | LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf); |
| 170 | 169 | ||
| @@ -426,6 +425,8 @@ LUA_API void (lua_closeslot) (lua_State *L, int idx); | |||
| 426 | 425 | ||
| 427 | #define LUA_NUMTAGS LUA_NUMTYPES | 426 | #define LUA_NUMTAGS LUA_NUMTYPES |
| 428 | 427 | ||
| 428 | #define lua_resetthread(L) lua_closethread(L,NULL) | ||
| 429 | |||
| 429 | /* }============================================================== */ | 430 | /* }============================================================== */ |
| 430 | 431 | ||
| 431 | /* | 432 | /* |
| @@ -496,8 +497,19 @@ struct lua_Debug { | |||
| 496 | /* }====================================================================== */ | 497 | /* }====================================================================== */ |
| 497 | 498 | ||
| 498 | 499 | ||
| 500 | #define LUAI_TOSTRAUX(x) #x | ||
| 501 | #define LUAI_TOSTR(x) LUAI_TOSTRAUX(x) | ||
| 502 | |||
| 503 | #define LUA_VERSION_MAJOR LUAI_TOSTR(LUA_VERSION_MAJOR_N) | ||
| 504 | #define LUA_VERSION_MINOR LUAI_TOSTR(LUA_VERSION_MINOR_N) | ||
| 505 | #define LUA_VERSION_RELEASE LUAI_TOSTR(LUA_VERSION_RELEASE_N) | ||
| 506 | |||
| 507 | #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR | ||
| 508 | #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE | ||
| 509 | |||
| 510 | |||
| 499 | /****************************************************************************** | 511 | /****************************************************************************** |
| 500 | * Copyright (C) 1994-2022 Lua.org, PUC-Rio. | 512 | * Copyright (C) 1994-2023 Lua.org, PUC-Rio. |
| 501 | * | 513 | * |
| 502 | * Permission is hereby granted, free of charge, to any person obtaining | 514 | * Permission is hereby granted, free of charge, to any person obtaining |
| 503 | * a copy of this software and associated documentation files (the | 515 | * a copy of this software and associated documentation files (the |