Changeset 34889 in project

Timestamp:

11/12/17 00:08:23 (3 years ago)

Author:

Kon Lovett

Message:

fix quoting when sep char , fix quoting when # or ???

Location:

release/4/csv-xml/trunk

Files:

• csv-out.impl (modified) (2 diffs)
• csv-xml.scm (modified) (1 diff)
• csv-xml.setup (modified) (1 diff)
• tests/run.scm (modified) (2 diffs)

release/4/csv-xml/trunk/csv-out.impl

@@ -154 +154 @@
             always-quote?
             (quote-doubling? str)
+            (and separator-char (string-index str separator-char))
             (and quote-controls? (string-index str char-set:iso-control))) )
         ;
@@ -174 +175 @@
             (csv-line-object->string (number->string obj)) )
           (else
-            (->string obj) ) ) )
+            (csv-line-object->string (->string obj)) ) ) )
       ;
       (lambda (obj)

release/4/csv-xml/trunk/csv-xml.scm

@@ -33 +33 @@
 (import scheme)
 
-(import (except chicken provide))
+#;(import (except chicken provide))
+(import chicken)
 
 ;;;

release/4/csv-xml/trunk/csv-xml.setup

@@ -5 +5 @@
 (verify-extension-name "csv-xml")
 
-(setup-shared+static-extension-module (extension-name) (extension-version "0.12.0")
+(setup-shared+static-extension-module (extension-name) (extension-version "0.12.1")
   #:types? #t
   #:inline? #t

release/4/csv-xml/trunk/tests/run.scm

@@ -171 +171 @@
   (call-with-output-string
    (lambda (out)
-     (let ((writer (writer-spec separator-char: delimiter)))
+     (let ((writer (writer-spec separator-char: delimiter always-quote?: #f)))
        (list->csv rows (make-csv-writer out writer))))))
 
@@ -178 +178 @@
 (let* ((delimiter #\,)
        (csv (write-csv rows delimiter)))
-  ;(printf "Serialized form:\n~a\n" csv)
+  (printf "Serialized form (always-quote?: #f):\n~a\n" csv)
   (let ((result (read-csv csv delimiter)))
     (test "Roundtrip" rows result) ) )