From b2af5ff97e8500ebcae8d8089f1f13b8584830b3 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 30 May 2014 14:29:34 +0100 Subject: [PATCH] elua: pass opts, flags around --- src/bin/elua/apps/xgettext.lua | 2 +- src/bin/elua/modules/xgettext/generator.lua | 4 ++-- src/bin/elua/modules/xgettext/parser.lua | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/elua/apps/xgettext.lua b/src/bin/elua/apps/xgettext.lua index eaaad2f378..43e0b5298d 100644 --- a/src/bin/elua/apps/xgettext.lua +++ b/src/bin/elua/apps/xgettext.lua @@ -373,7 +373,7 @@ for i, fname in ipairs(input_files) do f:close() end parsed_files[#parsed_files + 1] = generator.init(fpath, fcontents, - keywords) + keywords, flags, opts) else args_nolua[#args_nolua] = fname local f = assert(cutil.popenv(hasxgettext, "r", diff --git a/src/bin/elua/modules/xgettext/generator.lua b/src/bin/elua/modules/xgettext/generator.lua index edc33230ce..3917b1b136 100644 --- a/src/bin/elua/modules/xgettext/generator.lua +++ b/src/bin/elua/modules/xgettext/generator.lua @@ -22,8 +22,8 @@ local gen_message = function(str) return table.concat(ret, "\n") end -return { init = function(chunkname, input, keywords) - local ps = parser.init(chunkname, input, keywords) +return { init = function(chunkname, input, keywords, flags, opts) + local ps = parser.init(chunkname, input, keywords, flags, opts) local msg = ps() local rets = {} while msg do diff --git a/src/bin/elua/modules/xgettext/parser.lua b/src/bin/elua/modules/xgettext/parser.lua index 8fe21c12c0..63b23652b9 100644 --- a/src/bin/elua/modules/xgettext/parser.lua +++ b/src/bin/elua/modules/xgettext/parser.lua @@ -131,8 +131,8 @@ local parse = function(ls, keywords) end end -return { init = function (chunkname, input, keywords) - local ls = lexer.init(chunkname, input) +return { init = function (chunkname, input, keywords, flags, opts) + local ls = lexer.init(chunkname, input, opts) ls:get() local coro = coroutine.wrap(parse, ls, keywords) coro(ls, keywords)