Skip to content

Commit fc8998e

Browse files
committed
Fix Lua 5.5 in usage and documentation
Follows up the commits eea104d ("fix(Lua 5.5): prevent change on control variable") and 6fc4af9 ("feat: Add standard support for Lua 5.5 (lunarmodules#132) (lunarmodules#133)").
1 parent f47ad69 commit fc8998e

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

docsrc/config.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Option Type Default v
5757
``only`` Array of patterns (Do not filter)
5858
============================= ======================================== ===================
5959

60-
An example of a config which makes ``luacheck`` ensure that only globals from the portable intersection of Lua 5.1, Lua 5.2, Lua 5.3 and LuaJIT 2.0 are used, as well as disables detection of unused arguments:
60+
An example of a config which makes ``luacheck`` ensure that only globals from the portable intersection of Lua 5.1, Lua 5.2, Lua 5.3, Lua 5.4, Lua 5.5 and LuaJIT 2.0 are used, as well as disables detection of unused arguments:
6161

6262
.. code-block:: lua
6363
:linenos:

src/luacheck/main.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Links:
7979

8080
parser:group("Options for configuring allowed globals",
8181
parser:option("--std", "Set standard globals, default is max. <std> can be one of:\n" ..
82-
" max - union of globals of Lua 5.1, Lua 5.2, Lua 5.3 and LuaJIT 2.x;\n" ..
82+
" max - union of globals of Lua 5.1, Lua 5.2, Lua 5.3, Lua 5.4, Lua 5.5 and LuaJIT 2.x;\n" ..
8383
" min - intersection of globals of Lua 5.1, Lua 5.2, Lua 5.3 and LuaJIT 2.x;\n" ..
8484
" lua51 - globals of Lua 5.1 without deprecated ones;\n" ..
8585
" lua51c - globals of Lua 5.1;\n" ..
@@ -89,6 +89,8 @@ Links:
8989
" lua53c - globals of Lua 5.3 with LUA_COMPAT_5_2;\n" ..
9090
" lua54 - globals of Lua 5.4;\n" ..
9191
" lua54c - globals of Lua 5.4 with LUA_COMPAT_5_3;\n" ..
92+
" lua55 - globals of Lua 5.5;\n" ..
93+
" lua55c - globals of Lua 5.5 with LUA_COMPAT_MATHLIB, LUA_COMPAT_LOOPVAR and LUA_COMPAT_GLOBAL;\n" ..
9294
" luajit - globals of LuaJIT 2.x;\n" ..
9395
" ngx_lua - globals of Openresty lua-nginx-module 0.10.10, including standard LuaJIT 2.x globals;\n" ..
9496
" love - globals added by LÖVE;\n" ..

0 commit comments

Comments
 (0)