xeals/origami.el
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify test parser

Browse Source
This commit is contained in:
Greg Sexton 2014-05-29 21:46:06 +01:00
parent 26e35f4227
commit bdc0815218
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
origami.el
View File

@ -396,8 +396,9 @@ recursion. We fail if we don't consume something."
(origami-run-parser (origami-parser-item) content)))) (origami-run-parser (origami-parser-item) content))))
(defun origami-parser-paired (start children end create) (defun origami-parser-paired (start children end create)
"CHILDREN should be a zero-arg lambda returning a parser to ;; TODO: make this a macro so I don't have to pass in the thunk?
allow for recursive nesting." "CHILDREN should be a zero-arg lambda -- a thunk -- returning a
parser to allow for recursive nesting of a parser."
(origami-do (begin <- start) (origami-do (begin <- start)
(children <- (funcall children)) (children <- (funcall children))
(end <- end) (end <- end)
@ -433,18 +434,15 @@ allow for recursive nesting."
origami-fold-root-node))))) origami-fold-root-node)))))
(defun origami-test-parser (create) (defun origami-test-parser (create)
(origami-parser-0+ (origami-parser-conj (let ((pair (origami-parser-paired (origami-parser-char "{")
(origami-do
(origami-parser-drop-until-regex "[{}]")
(origami-parser-1?
(origami-parser-paired (origami-parser-char "{")
(lambda () (origami-test-parser create)) (lambda () (origami-test-parser create))
(origami-parser-char "}") (origami-parser-char "}")
create))) create)))
(origami-parser-paired (origami-parser-char "{") (origami-parser-0+ (origami-parser-conj
(lambda () (origami-test-parser create)) (origami-do
(origami-parser-char "}") (origami-parser-drop-until-regex "[{}]")
create)))) (origami-parser-1? pair))
pair))))
(defun origami-get-parser (buffer) (defun origami-get-parser (buffer)
;; TODO: remove hardcoding! ;; TODO: remove hardcoding!