stopped treating single quotes like quotes

masak · Aug 20, 2009 · be4e202 · be4e202
1 parent 3e71665
commit be4e202
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/TODO b/TODO
@@ -1,8 +1,5 @@
 Some new ideas await tuits:
 
-* Similarly, make single quotes not quote things by default. Perhaps
-  not even a flag is needed in this case.
-
 * Fields with embedded double-quote characters must be enclosed within
   double-quote characters, and each of the embedded double-quote
   characters must be represented by a pair of double-quote characters.

diff --git a/lib/Text/CSV.pm b/lib/Text/CSV.pm
@@ -2,19 +2,15 @@ grammar Text::CSV::Line {
     regex TOP { ^ <value> ** ',' $ }
     regex value {
         | <pure_text>
-        | \s* \' <single_quote_contents> \' \s*
-        | \s* \" <double_quote_contents> \" \s*
+        | \s* \" <quoted_contents> \" \s*
     }
-    regex single_quote_contents { <pure_text> ** [ <[",]> | \h ] }
-    regex double_quote_contents { <pure_text> ** [ <[',]> | \h ] }
-    regex pure_text { [<!before <['",]>> .]+ }
+    regex quoted_contents { <pure_text> ** [ <[,]> | \h ] }
+    regex pure_text { [<!before <[",]>> .]+ }
 }
 
 class Text::CSV {
     sub extract_text($m, :$trim) {
-        my $text = ($m<single_quote_contents>
-                    // $m<double_quote_contents>
-                    // $m).Str;
+        my $text = ($m<quoted_contents> // $m).Str;
         return $trim ?? $text.trim !! $text;
     }
 

diff --git a/t/03-quotes.t b/t/03-quotes.t
@@ -9,18 +9,22 @@ sub ok_becomes($input, $output, $description = '') {
 
 ok_becomes q[[[foo,bar,baz
 'foo','bar','baz'
-'foo','bar' , 'baz']]], [ [<foo bar baz>] xx 3 ], 'single quotes';
+'foo','bar' , 'baz']]],
+           [ [<foo bar baz>],
+             ["'foo'", "'bar'", "'baz'"],
+             ["'foo'", "'bar' ", " 'baz'"] ],
+           'single quotes carry no special significance';
 
 ok_becomes q[[[foo,bar,baz
 "foo","bar","baz"
 "foo","bar" , "baz"]]], [ [<foo bar baz>] xx 3 ], 'double quotes';
 
-dies_ok { Text::CSV.read(q[[[foo,ba'r,ba'z]]]) },
-        'mid-string single quotes illegal';
+lives_ok { Text::CSV.read(q[[[foo,ba'r,ba'z]]]) },
+         'mid-string single quotes legal';
 dies_ok { Text::CSV.read(q[[[foo,ba"r,ba"z]]]) },
         'mid-string double quotes illegal';
 
-is +Text::CSV.read(q[[[foo,'bar,baz']]])[0], 2, 'can single-quote commas';
+is +Text::CSV.read(q[[[foo,'bar,baz']]])[0], 3, 'cannot single-quote commas';
 is +Text::CSV.read(q[[[foo,"bar,baz"]]])[0], 2, 'can double-quote commas';
 
 done_testing;