From 3cf4e76bfa8de15c2f27d2c0cf4a9bbe958b02e6 Mon Sep 17 00:00:00 2001 From: Laurent ULRICH Date: Fri, 25 Mar 2022 19:43:51 +0000 Subject: [PATCH 1/2] Changed module path --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f117abc..63ac833 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module fruit.ovh/csv-parser +module git.orange.fruit.ovh/laurentu/csv-parser go 1.17 From 8e7dae363874d63343c980feb5f262196fd5fea5 Mon Sep 17 00:00:00 2001 From: Laurent ULRICH Date: Mon, 28 Mar 2022 07:04:45 +0000 Subject: [PATCH 2/2] Renamed Parser --- csv-parser.go | 8 ++++---- csv-parser_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/csv-parser.go b/csv-parser.go index 440c83a..00117d8 100644 --- a/csv-parser.go +++ b/csv-parser.go @@ -29,19 +29,19 @@ var EnclosersRunes = map[EncloserId]Encloser{ CurlyBrackets: Encloser{'{', '}'}, } -type CsvParser struct { +type Parser struct { Enclosers []EncloserId Delimiter string Fields []string Line string } -func (parser *CsvParser) Init() { +func (parser *Parser) Init() { parser.Enclosers = []EncloserId{DoubleQuotes, SquareBrackets} parser.Delimiter = " \t" } -func (parser *CsvParser) ExtractEnclosedFieldValue(endChar byte) error { +func (parser *Parser) ExtractEnclosedFieldValue(endChar byte) error { lineLen := len(parser.Line) for i := 1; i < lineLen; i++ { if parser.Line[i] == endChar && parser.Line[i-1] != '\\' { @@ -53,7 +53,7 @@ func (parser *CsvParser) ExtractEnclosedFieldValue(endChar byte) error { return errors.New("Encloser close not found") } -func (parser *CsvParser) Parse(CsvLine string) error { +func (parser *Parser) Parse(CsvLine string) error { var err error = nil parser.Fields = make([]string,0) diff --git a/csv-parser_test.go b/csv-parser_test.go index 987aabc..76fa165 100644 --- a/csv-parser_test.go +++ b/csv-parser_test.go @@ -6,7 +6,7 @@ import( func TestParse(t *testing.T) { - var parser CsvParser + var parser Parser var CsvTestValues = [...]string { "field1 field2 field3", // standard CSV @@ -38,7 +38,7 @@ func TestParse(t *testing.T) { } } func TestParseWithEscape(t *testing.T) { - var parser CsvParser + var parser Parser var CsvTestValues = [...]string { "\"\\\"field1 and more\" field2 [\\[field3] ", // Enclosed fields