[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master fdb3d99 44/60: Fix some code in simple-csv-parser.el
From: |
Junpeng Qiu |
Subject: |
[elpa] master fdb3d99 44/60: Fix some code in simple-csv-parser.el |
Date: |
Tue, 25 Oct 2016 17:45:15 +0000 (UTC) |
branch: master
commit fdb3d9995958e90c63ad895ace26bab7c47f209f
Author: Junpeng Qiu <address@hidden>
Commit: Junpeng Qiu <address@hidden>
Fix some code in simple-csv-parser.el
---
examples/simple-csv-parser-tests.el | 2 +-
examples/simple-csv-parser.el | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/examples/simple-csv-parser-tests.el
b/examples/simple-csv-parser-tests.el
index 1cb1e9d..d118c12 100644
--- a/examples/simple-csv-parser-tests.el
+++ b/examples/simple-csv-parser-tests.el
@@ -30,7 +30,7 @@
(ert-deftest test-simple-csv ()
(should
(equal
- (s-parse-csv "a1s,b,d,e,f\na,,c,d,")
+ (s-parse-csv "a1s,b,d,e,f\na,,c,d,\n")
'(("a1s" "b" "d" "e" "f")
("a" "" "c" "d" "")))))
diff --git a/examples/simple-csv-parser.el b/examples/simple-csv-parser.el
index 2132ecd..91feaed 100644
--- a/examples/simple-csv-parser.el
+++ b/examples/simple-csv-parser.el
@@ -27,15 +27,16 @@
(require 'parsec)
(defun s-csv-file ()
- (parsec-many (s-csv-line)))
+ (parsec-return (parsec-many (s-csv-line))
+ (parsec-eof)))
(defun s-csv-line ()
- (prog1 (s-csv-cells)
+ (parsec-return (s-csv-cells)
(s-csv-eol)))
(defun s-csv-eol ()
(parsec-or (parsec-str "\n")
- (parsec-eob)))
+ (parsec-eof)))
(defun s-csv-cells ()
(cons (s-csv-cell-content) (s-csv-remaining-cells)))
- [elpa] master 89dd2ac 54/60: Fix some wording in README, (continued)
- [elpa] master 89dd2ac 54/60: Fix some wording in README, Junpeng Qiu, 2016/10/25
- [elpa] master 55515ca 48/60: Add missing dependencies, Junpeng Qiu, 2016/10/25
- [elpa] master 2e9f962 59/60: Add new package parsec to externals-list, Junpeng Qiu, 2016/10/25
- [elpa] master 3827d26 36/60: Add docs for user-interface functions & combinators, Junpeng Qiu, 2016/10/25
- [elpa] master 8c108be 56/60: Add parsec-peek and parsec-peek-p, Junpeng Qiu, 2016/10/25
- [elpa] master 6001a70 12/60: Refine and add more parsec API, Junpeng Qiu, 2016/10/25
- [elpa] master da878fa 18/60: Use parsec-query for other return values, Junpeng Qiu, 2016/10/25
- [elpa] master 054a753 06/60: Rename to parsec, Junpeng Qiu, 2016/10/25
- [elpa] master 2cce1e3 37/60: Rename parsec-from-just to parsec-from-maybe, Junpeng Qiu, 2016/10/25
- [elpa] master cdb8c0d 47/60: Remove unused symbols, Junpeng Qiu, 2016/10/25
- [elpa] master fdb3d99 44/60: Fix some code in simple-csv-parser.el,
Junpeng Qiu <=
- [elpa] master 701964f 57/60: Prepare headers for GNU ELPA, Junpeng Qiu, 2016/10/25
- [elpa] master cbd3352 55/60: Add parsec-lookahead, Junpeng Qiu, 2016/10/25
- [elpa] master a951fbe 41/60: Unify tag names, Junpeng Qiu, 2016/10/25
- [elpa] master dfb3af0 60/60: Add 'packages/parsec/' from commit '8f0c266d8b9b0ee5fcf9b80c518644b2849ff3b3', Junpeng Qiu, 2016/10/25
- [elpa] master 6cc3100 07/60: Fix indentations, Junpeng Qiu, 2016/10/25
- [elpa] master d98e8c8 05/60: Add url-encoded string parser, Junpeng Qiu, 2016/10/25
- [elpa] master a268b9f 08/60: Add more APIs, Junpeng Qiu, 2016/10/25
- [elpa] master 13637e1 15/60: Rename parsec-do-parse to parsec-with-input, Junpeng Qiu, 2016/10/25
- [elpa] master ba23b01 19/60: Add more APIs, Junpeng Qiu, 2016/10/25
- [elpa] master f3ce070 09/60: Add simple scheme parser, Junpeng Qiu, 2016/10/25