diff --git a/autotests/html/highlight.lua.html b/autotests/html/highlight.lua.html
--- a/autotests/html/highlight.lua.html
+++ b/autotests/html/highlight.lua.html
@@ -8,35 +8,35 @@
-- Metatables
t = {
- __add=function(a,b)return a+b end,
- __sub=function(a,b)return a-b end,
- __mul=function(a,b)return a*b end,
- __div=function(a,b)return a/b end,
- __mod=function(a,b)return a%b end,
- __pow=function(a,b)return a^b end,
- __unm=function(a)return -a end,
- __idiv=function(a,b)return a//b end,
- __band=function(a,b)return a&b end,
- __bor=function(a,b)return a|b end,
- __bxor=function(a,b)return a~b end,
- __bnot=function(a)return ~a end,
- __shl=function(a,b)return a<<b end,
- __shr=function(a,b)return a>>b end,
- __concat=function(a,b)return a..b end,
- __len=function(a)return #a end,
- __eq=function(a,b)return a==b end,
- __lt=function(a,b)return a<b end,
- __le=function(a,b)return a<=b end,
- __index=function(t,k)return t[k] end,
- __newindex=function(t,k,v)return t[k]=v end,
- __call=function(f, ...)return f(...) end,
-
- __tostring=function(a)return tostring(a) end,
- __pairs=function(t)return pairs(a) end,
+ __add=function(a,b)return a+b end,
+ __sub=function(a,b)return a-b end,
+ __mul=function(a,b)return a*b end,
+ __div=function(a,b)return a/b end,
+ __mod=function(a,b)return a%b end,
+ __pow=function(a,b)return a^b end,
+ __unm=function(a)return -a end,
+ __idiv=function(a,b)return a//b end,
+ __band=function(a,b)return a&b end,
+ __bor=function(a,b)return a|b end,
+ __bxor=function(a,b)return a~b end,
+ __bnot=function(a)return ~a end,
+ __shl=function(a,b)return a<<b end,
+ __shr=function(a,b)return a>>b end,
+ __concat=function(a,b)return a..b end,
+ __len=function(a)return #a end,
+ __eq=function(a,b)return a==b end,
+ __lt=function(a,b)return a<b end,
+ __le=function(a,b)return a<=b end,
+ __index=function(t,k)return t[k] end,
+ __newindex=function(t,k,v)return t[k]=v end,
+ __call=function(f, ...)return f(...) end,
+
+ __tostring=function(a)return tostring(a) end,
+ __pairs=function(t)return pairs(a) end,
-- setmetatable
__metatable=true
-- Garbage collector
- __gc=function() end
+ __gc=function() end
-- Weak table
__mode='k' -- or 'v'
}
@@ -158,7 +158,7 @@
local x = 20
for i=1,10 do
local y = 0
- a[i] = function () y=y+1; return x+y end
+ a[i] = function () y=y+1; return x+y end
end
--! \brief gfind is deprecated
diff --git a/autotests/html/test.pbl.html b/autotests/html/test.pbl.html
--- a/autotests/html/test.pbl.html
+++ b/autotests/html/test.pbl.html
@@ -85,7 +85,7 @@
-- Behave like the [message] tag.
wesnoth.fire("message",
{ speaker = "narrator", message = t.sentence })
- end
+ end
>>
[/lua]
[/event]
diff --git a/autotests/reference/highlight.lua.ref b/autotests/reference/highlight.lua.ref
--- a/autotests/reference/highlight.lua.ref
+++ b/autotests/reference/highlight.lua.ref
@@ -2,35 +2,35 @@
-- Metatables
t = {
- __add=function(a,b)return a+b end,
- __sub=function(a,b)return a-b end,
- __mul=function(a,b)return a*b end,
- __div=function(a,b)return a/b end,
- __mod=function(a,b)return a%b end,
- __pow=function(a,b)return a^b end,
- __unm=function(a)return -a end,
- __idiv=function(a,b)return a//b end,
- __band=function(a,b)return a&b end,
- __bor=function(a,b)return a|b end,
- __bxor=function(a,b)return a~b end,
- __bnot=function(a)return ~a end,
- __shl=function(a,b)return a<<b end,
- __shr=function(a,b)return a>>b end,
- __concat=function(a,b)return a..b end,
- __len=function(a)return #a end,
- __eq=function(a,b)return a==b end,
- __lt=function(a,b)return a<b end,
- __le=function(a,b)return a<=b end,
- __index=function(t,k)return t[k] end,
- __newindex=function(t,k,v)return t[k]=v end,
- __call=function(f, ...)return f(...) end,
-
- __tostring=function(a)return tostring(a) end,
- __pairs=function(t)return pairs(a) end,
+ __add=function(a,b)return a+b end,
+ __sub=function(a,b)return a-b end,
+ __mul=function(a,b)return a*b end,
+ __div=function(a,b)return a/b end,
+ __mod=function(a,b)return a%b end,
+ __pow=function(a,b)return a^b end,
+ __unm=function(a)return -a end,
+ __idiv=function(a,b)return a//b end,
+ __band=function(a,b)return a&b end,
+ __bor=function(a,b)return a|b end,
+ __bxor=function(a,b)return a~b end,
+ __bnot=function(a)return ~a end,
+ __shl=function(a,b)return a<<b end,
+ __shr=function(a,b)return a>>b end,
+ __concat=function(a,b)return a..b end,
+ __len=function(a)return #a end,
+ __eq=function(a,b)return a==b end,
+ __lt=function(a,b)return a<b end,
+ __le=function(a,b)return a<=b end,
+ __index=function(t,k)return t[k] end,
+ __newindex=function(t,k,v)return t[k]=v end,
+ __call=function(f, ...)return f(...) end,
+
+ __tostring=function(a)return tostring(a) end,
+ __pairs=function(t)return pairs(a) end,
-- setmetatable
__metatable=true
-- Garbage collector
- __gc=function() end
+ __gc=function() end
-- Weak table
__mode='k' -- or 'v'
}
@@ -152,7 +152,7 @@
local x = 20
for i=1,10 do
local y = 0
- a[i] = function () y=y+1; return x+y end
+ a[i] = function () y=y+1; return x+y end
end
--! \brief gfind is deprecated
diff --git a/autotests/reference/test.pbl.ref b/autotests/reference/test.pbl.ref
--- a/autotests/reference/test.pbl.ref
+++ b/autotests/reference/test.pbl.ref
@@ -79,7 +79,7 @@
-- Behave like the [message] tag.
wesnoth.fire("message",
{ speaker = "narrator", message = t.sentence })
- end
+ end
>>
[/lua]
[/event]
diff --git a/data/syntax/lua.xml b/data/syntax/lua.xml
--- a/data/syntax/lua.xml
+++ b/data/syntax/lua.xml
@@ -8,6 +8,11 @@
CHANGES
+ [ Version 1.05 (2019-06-03) by Jonathan Poelen ]
+
+ - warn and coroutine.kill (Lua 5.4)
+ - end of a function as Keyword rather than Control
+
[ Version 1.04 (2018-04-30) by Jonathan Poelen ]
- based on Lua 5.3
@@ -43,7 +48,7 @@
- NOTE, FIXME, TODO alerts added on comments
- improved highlighting
-->
-
+
- and
@@ -121,12 +126,14 @@
- tonumber
- tostring
- type
+ - warn
- xpcall
- coroutine.create
- coroutine.isyieldable
- coroutine.resume
+ - coroutine.kill
- coroutine.running
- coroutine.status
- coroutine.wrap
@@ -453,7 +460,7 @@
-
+
@@ -479,6 +486,11 @@
+
+
+
+
+
@@ -536,3 +548,4 @@
+