From ef2ad4f473b91bda7fca48c0ec435ff283a9a0f6 Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <d.kolesa@samsung.com>
Date: Tue, 3 Jun 2014 15:51:41 +0100
Subject: [PATCH] elua: fix xgettext --extract-all

---
 src/bin/elua/modules/xgettext/parser.lua | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/bin/elua/modules/xgettext/parser.lua b/src/bin/elua/modules/xgettext/parser.lua
index 78ea604942..c240cf5706 100644
--- a/src/bin/elua/modules/xgettext/parser.lua
+++ b/src/bin/elua/modules/xgettext/parser.lua
@@ -147,15 +147,23 @@ local parse_all = function(ls)
     local tok = ls.token
     while tok.name ~= "<eof>" do
         if tok.name == "<comment>" then
-            saved_comment = tok.value
+            saved_comments[#saved_comments + 1] = tok.value
+            ls:get()
+        elseif tok.name == "<flagcomment>" then
+            saved_flagcomments[#saved_flagcomments + 1] = tok.value
             ls:get()
         elseif tok.name == "<string>" then
-            local line    = ls.line_number
-            local val     = tok.value
-            local sc      = saved_comment
-            saved_comment = nil
+            local line = ls.line_number
+            local val = tok.value
+            local sc = saved_comments
+            saved_comments = {}
+            sc = tconc(sc, "\n")
+            local fsc = saved_flagcomments
+            saved_flagcomments = {}
             ls:get()
-            yield { val, comment = sc, line = line }
+            yield {
+                val, comment = sc, line = line, flags = fsc
+            }
         else
             ls:get()
         end