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

Implement recursive parsing

Browse Source
This commit is contained in:
Greg Sexton 2014-05-07 21:50:50 +01:00
parent 1f46c0f3d8
commit fc5db446d4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
origami.el
View File

@ -388,8 +388,10 @@ have to prefix with '^' if you wish to match the beginning."
(origami-parser-return nil))) (origami-parser-return nil)))
(defun origami-parser-paired (start end children create) (defun origami-parser-paired (start end children create)
"CHILDREN should be a zero-arg lambda returning a parser to
allow for recursive nesting."
(origami-do (begin <- start) (origami-do (begin <- start)
(children <- (origami-parser-0+ children)) (children <- (funcall children))
(end <- end) (end <- end)
(origami-parser-return (funcall create begin end children)))) (origami-parser-return (funcall create begin end children))))
@ -422,6 +424,18 @@ have to prefix with '^' if you wish to match the beginning."
car car
origami-fold-root-node))))) origami-fold-root-node)))))
(defun origami-test-parser (create)
(origami-parser-0+ (origami-parser-conj
(origami-do
(origami-parser-consume-while (origami-parser-not
(origami-parser-conj (origami-parser-char "{")
(origami-parser-char "}"))))
(origami-parser-paired (origami-parser-char "{")
(origami-parser-char "}")
(lambda () (origami-test-parser create))
create))
(origami-parser-consume-while (origami-parser-not (origami-parser-char "}"))))))
(defun origami-get-parser (buffer) (defun origami-get-parser (buffer)
;; TODO: remove hardcoding! ;; TODO: remove hardcoding!
(let ((create (lambda (beg end children) (let ((create (lambda (beg end children)
@ -430,12 +444,7 @@ have to prefix with '^' if you wish to match the beginning."
buffer buffer
children children
(origami-get-cached-tree buffer))))) (origami-get-cached-tree buffer)))))
(origami-parser-0+ (origami-do (origami-test-parser create)))
(origami-parser-paired (origami-parser-regex "public .*{")
(origami-parser-char "}")
(origami-parser-consume-while
(origami-parser-not (origami-parser-char "}")))
create)))))
(defun origami-get-fold-tree (buffer) (defun origami-get-fold-tree (buffer)
"Facade. Build the tree if it hasn't already been built "Facade. Build the tree if it hasn't already been built