Skip to content

Added support for CR as line-end char #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kriyative wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for CR as line-end char #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/clojure_csv/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ and quotes. The main functions are parse-csv and write-csv."}
(.reset reader)
result))

(defn- cr-at-reader-pos?
"Given a reader, returns true if the reader is currently pointing at an \r
character. Reader will not be changed when the function returns."
[^Reader reader]
(let [next-char (reader-peek reader)]
(== next-char (int \return))))

(defn- custom-eol-at-reader-pos?
"Given a reader and an end-of-line string, returns true if the reader is
currently pointing at an instance of the end-of-line string. Reader will not
Expand All @@ -61,12 +68,13 @@ and quotes. The main functions are parse-csv and write-csv."}

(defn- eol-at-reader-pos?
"Given a reader and optionally an end-of-line string, returns true if the
reader is currently pointing at an end-of-line (LF/CRLF/the end-of-line arg).
reader is currently pointing at an end-of-line (LF/CRLF/CR/the end-of-line arg).
Reader will not be changed when the function returns. Note that if the
EOL is specified, it will not check for LF/CRLF."
EOL is specified, it will not check for LF/CRLF/CR."
([^Reader reader]
(or (lf-at-reader-pos? reader)
(crlf-at-reader-pos? reader)))
(crlf-at-reader-pos? reader)
(cr-at-reader-pos? reader)))
([^Reader reader end-of-line]
(if end-of-line
(custom-eol-at-reader-pos? reader end-of-line)
Expand All @@ -76,7 +84,7 @@ and quotes. The main functions are parse-csv and write-csv."}
"Given a reader that is pointing at an end-of-line
(LF/CRLF/the end-of-line arg), moves the reader forward to the
first character after the end-of-line sequence. Note that if the EOL is
specified, it will not check for LF/CRLF."
specified, it will not check for LF/CRLF/CR."
([^Reader reader]
;; If we peek and see a newline (LF), then the EOL is just an LF, skip 1.
;; Otherwise, the EOL is a CRLF, so skip 2.
Expand Down
6 changes: 5 additions & 1 deletion test/clojure_csv/test/utils.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@
nil)))
(is (= true (#'clojure-csv.core/eol-at-reader-pos? (StringReader. "\r\nabc")
nil)))
(is (= false (#'clojure-csv.core/eol-at-reader-pos? (StringReader. "\r\tabc")
(is (= true (#'clojure-csv.core/eol-at-reader-pos? (StringReader. "\r\tabc")
nil)))

(is (= false (#'clojure-csv.core/eol-at-reader-pos? (StringReader. "\t\tabc")
nil)))

;; Testing for user-specified EOLs
(is (= true (#'clojure-csv.core/eol-at-reader-pos? (StringReader. "abc")
"abc")))
Expand Down