Reuh/anselme
1
0
Fork 0
mirror of https://github.com/Reuh/anselme.git synced 2025-10-27 16:49:31 +00:00
Code Releases Activity

Improve variable redefinition error

Browse source
This commit is contained in:
Étienne Fildadut 2022-01-16 02:34:25 +01:00
parent eb3a1d3f2c
commit b60f53df01
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
parser/preparser.lua
View file

@ -288,7 +288,13 @@ local function parse_line(line, state, namespace)
if not exp then return nil, ("expected \"= expression\" after %q in definition line; at %s"):format(rem, line.source) end if not exp then return nil, ("expected \"= expression\" after %q in definition line; at %s"):format(rem, line.source) end
-- define identifier -- define identifier
if state.functions[fqm] then return nil, ("trying to define variable %q, but a function with the same name exists; at %s"):format(fqm, line.source) end if state.functions[fqm] then return nil, ("trying to define variable %q, but a function with the same name exists; at %s"):format(fqm, line.source) end
if state.variables[fqm] then return nil, ("trying to define variable %q but it is already defined; at %s"):format(fqm, line.source) end if state.variables[fqm] then
if state.variables[fqm].type == "pending definition" then
return nil, ("trying to define variable %q but it is already defined at %s; at %s"):format(fqm, state.variables[fqm].value.source, line.source)
else
return nil, ("trying to define variable %q but it is already defined; at %s"):format(fqm, line.source)
end
end
r.fqm = fqm r.fqm = fqm
r.expression = exp r.expression = exp
state.variables[fqm] = { type = "pending definition", value = { expression = nil, source = r.source } } state.variables[fqm] = { type = "pending definition", value = { expression = nil, source = r.source } }

4
test/tests/define override.lua
View file

@ -1,6 +1,6 @@
local _={} local _={}
_[1]={"error","trying to define variable \"define override.a\" but it is already defined; at test/tests/define override.ans:3"} _[1]={"error","trying to define variable \"define override.a\" but it is already defined at test/tests/define override.ans:1; at test/tests/define override.ans:3"}
return {_[1]} return {_[1]}
--[[ --[[
{ "error", 'trying to define variable "define override.a" but it is already defined; at test/tests/define override.ans:3' } { "error", 'trying to define variable "define override.a" but it is already defined at test/tests/define override.ans:1; at test/tests/define override.ans:3' }
]]-- ]]--