library-mirrors/lua-csv
1
0
Fork 0
mirror of https://github.com/geoffleyland/lua-csv.git synced 2024-12-06 00:34:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

csv.lua: tidy up truncating the buffer (not really the right word, since we're cutting off the beginning) and advancing anchor_pos (also a bad name)

Browse Source
This commit is contained in:
Geoff Leyland 2014-05-26 17:26:24 +12:00
parent 88e30b6720
commit 966ba6722f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lua/csv.lua
View File

@ -156,9 +156,9 @@ local function separated_values_iterator(file, parameters)
-- Cut the front off the buffer if we've already read it -- Cut the front off the buffer if we've already read it
local function truncate() local function truncate(p)
if anchor_pos > buffer_size then if p > buffer_size then
local remove = math.floor((anchor_pos-1) / buffer_size) * buffer_size local remove = math.floor((p-1) / buffer_size) * buffer_size
buffer = buffer:sub(remove + 1) buffer = buffer:sub(remove + 1)
anchor_pos = anchor_pos - remove anchor_pos = anchor_pos - remove
line_start = line_start - remove line_start = line_start - remove
@ -180,7 +180,6 @@ local function separated_values_iterator(file, parameters)
-- Find something in the buffer, extending it if necessary -- Find something in the buffer, extending it if necessary
local function find(pattern, offset) local function find(pattern, offset)
truncate()
local first, last, capture local first, last, capture
while true do while true do
first, last, capture = buffer:find(pattern, anchor_pos + offset - 1) first, last, capture = buffer:find(pattern, anchor_pos + offset - 1)
@ -203,7 +202,6 @@ local function separated_values_iterator(file, parameters)
-- Get a substring from the buffer, extending it if necessary -- Get a substring from the buffer, extending it if necessary
local function sub(a, b) local function sub(a, b)
truncate()
extend(b) extend(b)
local b = b == -1 and b or anchor_pos + b - 1 local b = b == -1 and b or anchor_pos + b - 1
return buffer:sub(anchor_pos + a - 1, b) return buffer:sub(anchor_pos + a - 1, b)
@ -217,6 +215,12 @@ local function separated_values_iterator(file, parameters)
local column_index_map local column_index_map
local function advance(n)
anchor_pos = anchor_pos + n
truncate(anchor_pos)
end
-- If the user hasn't specified a separator, try to work out what it is. -- If the user hasn't specified a separator, try to work out what it is.
local sep = parameters.separator local sep = parameters.separator
if not sep then if not sep then
@ -238,7 +242,7 @@ local function separated_values_iterator(file, parameters)
-- If the field is quoted, go find the other quote -- If the field is quoted, go find the other quote
if sub(1, 1) == '"' then if sub(1, 1) == '"' then
anchor_pos = anchor_pos + 1 advance(1)
local current_pos = 0 local current_pos = 0
repeat repeat
local a, b, c = find('"("?)', current_pos + 1) local a, b, c = find('"("?)', current_pos + 1)
@ -316,7 +320,7 @@ local function separated_values_iterator(file, parameters)
line_start = anchor_pos + sep_end line_start = anchor_pos + sep_end
end end
anchor_pos = anchor_pos + sep_end advance(sep_end)
end end
end end