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

fix up accidental global variables. Thanks on Ashwyn Hirschi

Browse Source
This commit is contained in:
Geoff Leyland 2013-12-05 15:01:41 +13:00
parent daa18891f3
commit 7294a1bc72
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/csv.lua
View File

@ -74,7 +74,7 @@ end
-- what to do with them. Mostly this is about checking we've got the columns -- what to do with them. Mostly this is about checking we've got the columns
-- we need and writing a nice complaint if we haven't. -- we need and writing a nice complaint if we haven't.
local function build_column_index_map(header, column_name_map) local function build_column_index_map(header, column_name_map)
column_index_map = {} local column_index_map = {}
-- Match the columns in the file to the columns in the name map -- Match the columns in the file to the columns in the name map
local found = {} local found = {}
@ -126,6 +126,7 @@ local function transform_field(value, index, map, filename, line, column)
local field = map[index] local field = map[index]
if field then if field then
if field.transform then if field.transform then
local ok
ok, value = pcall(field.transform, value) ok, value = pcall(field.transform, value)
if not ok then if not ok then
error(("%s:%d:%d: Couldn't read field '%s': %s"): error(("%s:%d:%d: Couldn't read field '%s': %s"):
@ -221,6 +222,7 @@ local function separated_values_iterator(file, parameters)
local field_start_line = line local field_start_line = line
local field_start_column = anchor_pos - line_start + 1 local field_start_column = anchor_pos - line_start + 1
local field_end, sep_end, this_sep local field_end, sep_end, this_sep
local tidy
-- 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