Support calling lexer.lineno several times in a row

mpeterv · Feb 2, 2016 · 5baf4d0 · 5baf4d0
1 parent 1923361
commit 5baf4d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lua/pl/lexer.lua b/lua/pl/lexer.lua
@@ -198,26 +198,26 @@ function lexer.scan(s,matches,filter,options)
                         local _, newlines = tok:gsub("\n", {})
                         line_nr = line_nr + newlines
                     end
-                    if res then
+                    while res do
                         local tp = type(res)
                         -- insert a token list
                         if tp == 'table' then
-                            yield('','')
+                            res = yield('','')
                             for _,t in ipairs(res) do
-                                yield(t[1],t[2])
+                                res = yield(t[1],t[2])
                             end
                         elseif tp == 'string' then -- or search up to some special pattern
                             i1,i2 = strfind(s,res,idx)
                             if i1 then
                                 tok = strsub(s,i1,i2)
                                 idx = i2 + 1
-                                yield('',tok)
+                                res = yield('',tok)
                             else
-                                yield('','')
+                                res = yield('','')
                                 idx = sz + 1
                             end
                         else
-                            yield(line_nr,idx)
+                            res = yield(line_nr,idx)
                         end
                     end
 

diff --git a/tests/test-lexer.lua b/tests/test-lexer.lua
@@ -128,5 +128,6 @@ bar
 
 iter()
 asserteq(lexer.lineno(iter), 1)
+asserteq(lexer.lineno(iter), 1)
 iter()
 asserteq(lexer.lineno(iter), 2)