whoops. Fix up find's return values when we've hit the end of file. How did that work?

This commit is contained in:
Geoff Leyland 2014-05-26 17:38:58 +12:00
parent e18409d73f
commit 46e65775bf

View File

@ -188,10 +188,15 @@ local function separated_values_iterator(file, parameters)
-- more. -- more.
if not first or last == #buffer then if not first or last == #buffer then
local s = file:read(buffer_size) local s = file:read(buffer_size)
-- if we read nothing from the file: -- if we read nothing from the file...
-- - and first is nil, then we found nothing. This will return nil. if not s then
-- - and last == #buffer, then the capture we found above is good. if first then
if not s then return first, last, capture end -- ...and last == #buffer, then the capture we found above is good.
return first - anchor_pos + 1, last - anchor_pos + 1, capture
else
return
end
end
buffer = buffer..s buffer = buffer..s
else else
return first - anchor_pos + 1, last - anchor_pos + 1, capture return first - anchor_pos + 1, last - anchor_pos + 1, capture