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

Generalise origami-build-pair-tree

Browse Source
This commit is contained in:
Greg Sexton 2014-11-15 16:22:45 +00:00
parent 81fba32332
commit 775d3058a8
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
origami-parsers.el
View File

@ -43,8 +43,6 @@
:type 'hook :type 'hook
:group 'origami) :group 'origami)
;;; TODO: generalize to take a function? then could use a regex or
;;; begin-defun etc?
(defun origami-get-positions (content regex) (defun origami-get-positions (content regex)
(with-temp-buffer (with-temp-buffer
(insert content) (insert content)
@ -54,13 +52,13 @@
(setq acc (cons (cons (match-string 0) (point)) acc))) (setq acc (cons (cons (match-string 0) (point)) acc)))
(reverse acc)))) (reverse acc))))
(defun origami-build-pair-tree (create positions) (defun origami-build-pair-tree (create open close positions)
;; this is so horrible, but fast ;; this is so horrible, but fast
(let (acc beg (should-continue t)) (let (acc beg (should-continue t))
(while (and should-continue positions) (while (and should-continue positions)
(cond ((equal (caar positions) "{") (cond ((equal (caar positions) open)
(if beg ;go down a level (if beg ;go down a level
(let* ((res (origami-build-pair-tree create positions)) (let* ((res (origami-build-pair-tree create open close positions))
(new-pos (car res)) (new-pos (car res))
(children (cdr res))) (children (cdr res)))
(setq positions (cdr new-pos)) (setq positions (cdr new-pos))
@ -69,7 +67,7 @@
;; begin a new pair ;; begin a new pair
(setq beg (cdar positions)) (setq beg (cdar positions))
(setq positions (cdr positions)))) (setq positions (cdr positions))))
((equal (caar positions) "}") ((equal (caar positions) close)
(if beg (if beg
(progn ;close with no children (progn ;close with no children
(setq acc (cons (funcall create beg (cdar positions) 0 nil) acc)) (setq acc (cons (funcall create beg (cdar positions) 0 nil) acc))
@ -81,7 +79,7 @@
(defun origami-c-style-parser (create) (defun origami-c-style-parser (create)
(lambda (content) (lambda (content)
(let ((positions (origami-get-positions content "[{}]"))) (let ((positions (origami-get-positions content "[{}]")))
(cdr (origami-build-pair-tree create positions))))) (cdr (origami-build-pair-tree create "{" "}" positions)))))
(defun origami-lisp-parser (create regex) (defun origami-lisp-parser (create regex)
(lambda (content) (lambda (content)