Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
illuna-minetest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Illuna-Minetest
illuna-minetest
Commits
a6ba042c
Commit
a6ba042c
authored
10 years ago
by
ShadowNinja
Browse files
Options
Downloads
Patches
Plain Diff
Add strict module
Also fix leaking globals found by it.
parent
6afdb22b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
builtin/common/strict.lua
+47
-0
47 additions, 0 deletions
builtin/common/strict.lua
builtin/game/auth.lua
+2
-2
2 additions, 2 deletions
builtin/game/auth.lua
builtin/game/item_entity.lua
+1
-1
1 addition, 1 deletion
builtin/game/item_entity.lua
builtin/init.lua
+1
-0
1 addition, 0 deletions
builtin/init.lua
with
51 additions
and
3 deletions
builtin/common/strict.lua
0 → 100644
+
47
−
0
View file @
a6ba042c
-- Always warn when creating a global variable, even outside of a function.
-- This ignores mod namespaces (variables with the same name as the current mod).
local
WARN_INIT
=
false
local
function
warn
(
message
)
print
(
os.date
(
"%H:%M:%S: WARNING: "
)
..
message
)
end
local
meta
=
{}
local
declared
=
{}
function
meta
:
__newindex
(
name
,
value
)
local
info
=
debug.getinfo
(
2
,
"Sl"
)
local
desc
=
(
"%s:%d"
):
format
(
info
.
short_src
,
info
.
currentline
)
if
not
declared
[
name
]
then
if
info
.
what
~=
"main"
and
info
.
what
~=
"C"
then
warn
((
"Assignment to undeclared global %q inside"
..
" a function at %s."
)
:
format
(
name
,
desc
))
end
declared
[
name
]
=
true
end
-- Ignore mod namespaces
if
WARN_INIT
and
(
not
core
.
get_current_modname
or
name
~=
core
.
get_current_modname
())
then
warn
((
"Global variable %q created at %s."
)
:
format
(
name
,
desc
))
end
rawset
(
self
,
name
,
value
)
end
function
meta
:
__index
(
name
)
local
info
=
debug.getinfo
(
2
,
"Sl"
)
if
not
declared
[
name
]
and
info
.
what
~=
"C"
then
warn
((
"Undeclared global variable %q accessed at %s:%s"
)
:
format
(
name
,
info
.
short_src
,
info
.
currentline
))
end
return
rawget
(
self
,
name
)
end
setmetatable
(
_G
,
meta
)
This diff is collapsed.
Click to expand it.
builtin/game/auth.lua
+
2
−
2
View file @
a6ba042c
...
...
@@ -7,7 +7,7 @@
function
core
.
string_to_privs
(
str
,
delim
)
assert
(
type
(
str
)
==
"string"
)
delim
=
delim
or
','
privs
=
{}
local
privs
=
{}
for
_
,
priv
in
pairs
(
string
.
split
(
str
,
delim
))
do
privs
[
priv
:
trim
()]
=
true
end
...
...
@@ -17,7 +17,7 @@ end
function
core
.
privs_to_string
(
privs
,
delim
)
assert
(
type
(
privs
)
==
"table"
)
delim
=
delim
or
','
list
=
{}
local
list
=
{}
for
priv
,
bool
in
pairs
(
privs
)
do
if
bool
then
table.insert
(
list
,
priv
)
...
...
This diff is collapsed.
Click to expand it.
builtin/game/item_entity.lua
+
1
−
1
View file @
a6ba042c
...
...
@@ -56,7 +56,7 @@ core.register_entity(":__builtin:item", {
item_texture
=
core
.
registered_items
[
itemname
].
inventory_image
item_type
=
core
.
registered_items
[
itemname
].
type
end
prop
=
{
local
prop
=
{
is_visible
=
true
,
visual
=
"wielditem"
,
textures
=
{
itemname
},
...
...
This diff is collapsed.
Click to expand it.
builtin/init.lua
+
1
−
0
View file @
a6ba042c
...
...
@@ -17,6 +17,7 @@ local gamepath = scriptdir.."game"..DIR_DELIM
local
commonpath
=
scriptdir
..
"common"
..
DIR_DELIM
local
asyncpath
=
scriptdir
..
"async"
..
DIR_DELIM
dofile
(
commonpath
..
"strict.lua"
)
dofile
(
commonpath
..
"serialize.lua"
)
dofile
(
commonpath
..
"misc_helpers.lua"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment