enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

elua: xgettext fixes

This commit is contained in:
Daniel Kolesa 2014-06-10 14:37:57 +01:00
parent bdae95f57a
commit 17698c9c7e
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/elua/modules/xgettext/lexer.lua
View File

@ -213,7 +213,7 @@ local lex_tbl = {
["="] = function(ls) ["="] = function(ls)
local oc = ls.current local oc = ls.current
local c = next_char(ls) local c = next_char(ls)
if c ~= "=" then return c end if c ~= "=" then return c
else next_char(ls); return c .. "=" end else next_char(ls); return c .. "=" end
end, end,
['"' ] = function(ls) ['"' ] = function(ls)

19
src/bin/elua/modules/xgettext/parser.lua
View File

@ -180,14 +180,14 @@ local parse_kw = function(ls, keywords)
local n1argt, n2argt, cxargt = n1arg and (n1arg[2] ~= "<name>"), local n1argt, n2argt, cxargt = n1arg and (n1arg[2] ~= "<name>"),
n2arg and (n2arg[2] ~= "<name>"), n2arg and (n2arg[2] ~= "<name>"),
cxarg and (cxarg[2] ~= "<name>") cxarg and (cxarg[2] ~= "<name>")
if not args then goto skip end if not args then return false end
if an and #args ~= an then goto skip end if an and #args ~= an then return false end
if #args < n1 then goto skip end if #args < n1 then return false end
if n2 and #args < n2 then goto skip end if n2 and #args < n2 then return false end
if cx and #args < cx then goto skip end if cx and #args < cx then return false end
if not n1argt then goto skip end if not n1argt then return false end
if n2 and not n2argt then goto skip end if n2 and not n2argt then return false end
if cx and not cxargt then goto skip end if cx and not cxargt then return false end
local sc = saved_comments local sc = saved_comments
saved_comments = {} saved_comments = {}
sc = tconc(sc, "\n") sc = tconc(sc, "\n")
@ -214,7 +214,7 @@ local parse = function(ls, keywords, flags)
elseif tok.name == "<name>" then elseif tok.name == "<name>" then
if keywords[tok.value] then if keywords[tok.value] then
local status, str = pcall(parse_kw, keywords) local status, str = pcall(parse_kw, keywords)
if status then if status and str then
str:generate() str:generate()
end end
elseif flags[tok.value] then elseif flags[tok.value] then
@ -228,7 +228,6 @@ local parse = function(ls, keywords, flags)
else else
ls:get() ls:get()
end end
::skip::
end end
end end