mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-29 16:30:19 +02:00
Code Activity

peg: split define-nonterm into two functions for better readability.

Browse source 
* module/ice-9/peg.scm (define-nonterm): Split for readability.
This commit is contained in:
Noah Lavine 2011-01-29 12:40:37 -05:00 • committed by Andy Wingo
parent add20d35be
commit f4576d8161
1 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

56
module/ice-9/peg.scm
View file

@ -365,6 +365,34 @@
;; the point of diminishing returns on my box. ;; the point of diminishing returns on my box.
(define *cache-size* 512) (define *cache-size* 512)
(define (code-for-non-cache-case matchf accumsym symsym)
(safe-bind
(str strlen at res body)
`(lambda (,str ,strlen ,at)
(let ((,res (,matchf ,str ,strlen ,at)))
;; Try to match the nonterminal.
(if ,res
;; If we matched, do some post-processing to figure out
;; what data to propagate upward.
(let ((,at (car ,res))
(,body (cadr ,res)))
,(cond
((eq? accumsym 'name)
`(list ,at ',symsym))
((eq? accumsym 'all)
`(list (car ,res)
(cond
((not (list? ,body))
(list ',symsym ,body))
((null? ,body) ',symsym)
((symbol? (car ,body))
(list ',symsym ,body))
(#t (cons ',symsym ,body)))))
((eq? accumsym 'none) `(list (car ,res) '()))
(#t (begin res))))
;; If we didn't match, just return false.
#f)))))
;; Defines a new nonterminal symbol accumulating with ACCUM. ;; Defines a new nonterminal symbol accumulating with ACCUM.
(define-syntax define-nonterm (define-syntax define-nonterm
(lambda (x) (lambda (x)
@ -376,33 +404,7 @@
(accumsym (syntax->datum #'accum)) (accumsym (syntax->datum #'accum))
(c (datum->syntax x (gensym))));; the cache (c (datum->syntax x (gensym))));; the cache
;; CODE is the code to parse the string if the result isn't cached. ;; CODE is the code to parse the string if the result isn't cached.
(let ((code (let ((code (code-for-non-cache-case matchf accumsym symsym)))
(safe-bind
(str strlen at res body)
`(lambda (,str ,strlen ,at)
(let ((,res (,matchf ,str ,strlen ,at)))
;; Try to match the nonterminal.
(if ,res
;; If we matched, do some post-processing to figure out
;; what data to propagate upward.
(let ((,at (car ,res))
(,body (cadr ,res)))
,(cond
((eq? accumsym 'name)
`(list ,at ',symsym))
((eq? accumsym 'all)
`(list (car ,res)
(cond
((not (list? ,body))
(list ',symsym ,body))
((null? ,body) ',symsym)
((symbol? (car ,body))
(list ',symsym ,body))
(#t (cons ',symsym ,body)))))
((eq? accumsym 'none) `(list (car ,res) '()))
(#t (begin res))))
;; If we didn't match, just return false.
#f))))))
#`(begin #`(begin
(define #,c (make-vector *cache-size* #f));; the cache (define #,c (make-vector *cache-size* #f));; the cache
(define (sym str strlen at) (define (sym str strlen at)