[q-lang-cvs] q-csv csv.q,1.3,1.4
Brought to you by:
agraef
From: Albert G. - T. u. <ag...@us...> - 2008-01-12 04:30:54
|
Update of /cvsroot/q-lang/q-csv In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22288 Modified Files: csv.q Log Message: remove extra trailing whitespace Index: csv.q =================================================================== RCS file: /cvsroot/q-lang/q-csv/csv.q,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** csv.q 10 Jan 2008 23:40:16 -0000 1.3 --- csv.q 12 Jan 2008 04:30:49 -0000 1.4 *************** *** 17,22 **** /* The CSV library provides an interface to read and write comma separated ! value files. The reading and writing functions abide by RFC 4180 ! (http://www.ietf.org/rfc/rfc4180.txt) except for additional parameters that allow field delimiters and quote delimiters to be changed. */ --- 17,22 ---- /* The CSV library provides an interface to read and write comma separated ! value files. The reading and writing functions abide by RFC 4180 ! (http://www.ietf.org/rfc/rfc4180.txt) except for additional parameters that allow field delimiters and quote delimiters to be changed. */ *************** *** 64,68 **** freadcsv_data F:File = freadcsv_ (true, F, ",", "\""); ! freadcsv_data (F:File, FieldDelim:String) = freadcsv_ (true, F, FieldDelim, "\""); freadcsv_data (F:File, FieldDelim:String, StrDelim:String) --- 64,68 ---- freadcsv_data F:File = freadcsv_ (true, F, ",", "\""); ! freadcsv_data (F:File, FieldDelim:String) = freadcsv_ (true, F, FieldDelim, "\""); freadcsv_data (F:File, FieldDelim:String, StrDelim:String) *************** *** 71,80 **** freadcsv_string F:File = freadcsv_ (false, F, ",", "\""); ! freadcsv_string (F:File, FieldDelim:String) = freadcsv_ (false, F, FieldDelim, "\""); freadcsv_string (F:File, FieldDelim:String, StrDelim:String) = freadcsv_ (false, F, FieldDelim, StrDelim); ! fwritecsv_data F:File Rec:Tuple = fwritecsv_ (true, F, ",", "\"") Rec; fwritecsv_data (F:File, FieldDelim:String) Rec:Tuple --- 71,80 ---- freadcsv_string F:File = freadcsv_ (false, F, ",", "\""); ! freadcsv_string (F:File, FieldDelim:String) = freadcsv_ (false, F, FieldDelim, "\""); freadcsv_string (F:File, FieldDelim:String, StrDelim:String) = freadcsv_ (false, F, FieldDelim, StrDelim); ! fwritecsv_data F:File Rec:Tuple = fwritecsv_ (true, F, ",", "\"") Rec; fwritecsv_data (F:File, FieldDelim:String) Rec:Tuple *************** *** 83,87 **** = fwritecsv_ (true, F, FieldDelim, StrDelim) Rec; ! fwritecsv_string F:File Rec:Tuple = fwritecsv_ (false, F, ",", "\"") Rec; fwritecsv_string (F:File, FieldDelim:String) Rec:Tuple --- 83,87 ---- = fwritecsv_ (true, F, FieldDelim, StrDelim) Rec; ! fwritecsv_string F:File Rec:Tuple = fwritecsv_ (false, F, ",", "\"") Rec; fwritecsv_string (F:File, FieldDelim:String) Rec:Tuple *************** *** 94,119 **** freadfilecsv_data F:File = [] if feof F; ! = [freadcsv_ (true, F, ",", "\"") | freadfilecsv_data F]; freadfilecsv_data (F:File, FieldDelim:String) = [] if feof F; ! = [freadcsv_ (true, F, FieldDelim, "\"") | freadfilecsv_data (F, FieldDelim)]; ! freadfilecsv_data (F:File, FieldDelim:String, StrDelim:String) = [] if feof F; ! = [freadcsv_ (true, F, FieldDelim, StrDelim) | freadfilecsv_data (F, FieldDelim, StrDelim)]; freadfilecsv_string F:File = [] if feof F; ! = [freadcsv_ (false, F, ",", "\"") | freadfilecsv_string F]; freadfilecsv_string (F:File, FieldDelim:String) = [] if feof F; ! = [freadcsv_ (false, F, FieldDelim, "\"") | freadfilecsv_string (F, FieldDelim)]; ! freadfilecsv_string (F:File, FieldDelim:String, StrDelim:String) = [] if feof F; ! = [freadcsv_ (false, F, FieldDelim, StrDelim) | freadfilecsv_string (F, FieldDelim, StrDelim)]; --- 94,119 ---- freadfilecsv_data F:File = [] if feof F; ! = [freadcsv_ (true, F, ",", "\"") | freadfilecsv_data F]; freadfilecsv_data (F:File, FieldDelim:String) = [] if feof F; ! = [freadcsv_ (true, F, FieldDelim, "\"") | freadfilecsv_data (F, FieldDelim)]; ! freadfilecsv_data (F:File, FieldDelim:String, StrDelim:String) = [] if feof F; ! = [freadcsv_ (true, F, FieldDelim, StrDelim) | freadfilecsv_data (F, FieldDelim, StrDelim)]; freadfilecsv_string F:File = [] if feof F; ! = [freadcsv_ (false, F, ",", "\"") | freadfilecsv_string F]; freadfilecsv_string (F:File, FieldDelim:String) = [] if feof F; ! = [freadcsv_ (false, F, FieldDelim, "\"") | freadfilecsv_string (F, FieldDelim)]; ! freadfilecsv_string (F:File, FieldDelim:String, StrDelim:String) = [] if feof F; ! = [freadcsv_ (false, F, FieldDelim, StrDelim) | freadfilecsv_string (F, FieldDelim, StrDelim)]; *************** *** 137,141 **** public freadcsv ARGS, fwritecsv ARGS REC; ! /* freadcsv ARGS = freadcsv_data ARGS fwritecsv ARGS = fwritecsv_data ARGS REC */ --- 137,141 ---- public freadcsv ARGS, fwritecsv ARGS REC; ! /* freadcsv ARGS = freadcsv_data ARGS fwritecsv ARGS = fwritecsv_data ARGS REC */ |