From da000c7dffd8a5325a69719607bdc5307dc73100 Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 22 Nov 2012 20:00:29 +0200 Subject: beta 2012.11.22 18:09 --- scripts/context/lua/mtxrun.lua | 27 +++++++++++++++++++++++++++ scripts/context/stubs/mswin/mtxrun.lua | 27 +++++++++++++++++++++++++++ scripts/context/stubs/unix/mtxrun | 27 +++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) (limited to 'scripts') diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 897c39260..5e924b07d 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -6008,6 +6008,33 @@ end -- inspect(lpeg.match(pattern,[[key="value"]])) +local newline = S('\r\n') + +function parsers.csvsplitter(specification) + specification = specification or { } + local separator = specification.separator + local quotechar = specification.quote + local separator = S(separator ~= "" and separator or ",") + local whatever = C((1 - separator - newline)^0) + if quotechar and quotechar ~= "" then + local quotedata = nil + for chr in gmatch(quotechar,".") do + local quotechar = P(chr) + local quoteword = quotechar * C((1 - quotechar)^0) * quotechar + if quotedata then + quotedata = quotedata + quoteword + else + quotedata = quoteword + end + end + whatever = quotedata + whatever + end + local parser = Ct((Ct(whatever * (separator * whatever)^0) * S("\n\r"))^0 ) + return function(data) + return lpegmatch(parser,data) + end +end + end -- of closure diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 897c39260..5e924b07d 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -6008,6 +6008,33 @@ end -- inspect(lpeg.match(pattern,[[key="value"]])) +local newline = S('\r\n') + +function parsers.csvsplitter(specification) + specification = specification or { } + local separator = specification.separator + local quotechar = specification.quote + local separator = S(separator ~= "" and separator or ",") + local whatever = C((1 - separator - newline)^0) + if quotechar and quotechar ~= "" then + local quotedata = nil + for chr in gmatch(quotechar,".") do + local quotechar = P(chr) + local quoteword = quotechar * C((1 - quotechar)^0) * quotechar + if quotedata then + quotedata = quotedata + quoteword + else + quotedata = quoteword + end + end + whatever = quotedata + whatever + end + local parser = Ct((Ct(whatever * (separator * whatever)^0) * S("\n\r"))^0 ) + return function(data) + return lpegmatch(parser,data) + end +end + end -- of closure diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 897c39260..5e924b07d 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -6008,6 +6008,33 @@ end -- inspect(lpeg.match(pattern,[[key="value"]])) +local newline = S('\r\n') + +function parsers.csvsplitter(specification) + specification = specification or { } + local separator = specification.separator + local quotechar = specification.quote + local separator = S(separator ~= "" and separator or ",") + local whatever = C((1 - separator - newline)^0) + if quotechar and quotechar ~= "" then + local quotedata = nil + for chr in gmatch(quotechar,".") do + local quotechar = P(chr) + local quoteword = quotechar * C((1 - quotechar)^0) * quotechar + if quotedata then + quotedata = quotedata + quoteword + else + quotedata = quoteword + end + end + whatever = quotedata + whatever + end + local parser = Ct((Ct(whatever * (separator * whatever)^0) * S("\n\r"))^0 ) + return function(data) + return lpegmatch(parser,data) + end +end + end -- of closure -- cgit v1.2.3