andrius
/
gash
mirror of https://git.savannah.gnu.org/git/gash.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

checkpoint

This commit is contained in:
Jan Nieuwenhuizen 2018-07-15 20:47:09 +02:00
parent 83f20d1ff8
commit e7bfd347fa
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gash/peg.scm
View File

@ -218,33 +218,46 @@
(define (transform ast)
(when (> %debug-level 1)
(format (current-error-port) "transform ast=~s\n" ast))
(pretty-print ast (current-error-port)))
(match ast
;; FIXME: flatten?
((('pipeline _ ...) _ ...)
(map transform (keyword-flatten '(and assignent command literal name or pipeline substitution) ast)))
((('literal _ ...) _ ...)
(map transform (keyword-flatten '(and assignent command literal name or pipeline substitution) ast)))
((('assignent _ ...) _ ...)
(map transform (keyword-flatten '(and assignent command literal name or pipeline substitution) ast)))
(('script o ...) `(script ,@(map transform o)))
;; (('pipeline o)
;; (let ((commands (list (transform o))))
;; `(pipeline ,@(cons (trace commands) commands))))
;; FIXME: how to get rid of PEG's gratuitous parentheses/heterogeneous grouping
(('pipeline o)
(let ((commands (list (transform o))))
(('pipeline o ...)
(let ((commands (map transform o)))
`(pipeline ,@(cons (trace commands) commands))))
(('pipeline h (and t ('command _ ...) ...))
(let ((commands (list (transform h) (transform t))))
`(pipeline ,@(cons (trace commands) commands))))
(('pipeline h (and t (('command _ ...) ...)))
(let ((commands (cons (transform h) (map transform t))))
`(pipeline ,@(cons (trace commands) commands))))
((and o (('pipeline _ ...) ...)) (map transform o))
;; (('pipeline h (and t ('command _ ...) ...))
;; (let ((commands (list (transform h) (transform t))))
;; `(pipeline ,@(cons (trace commands) commands))))
;; (('pipeline h (and t (('command _ ...) ...)))
;; (let ((commands (cons (transform h) (map transform t))))
;; `(pipeline ,@(cons (trace commands) commands))))
;;((and o (('pipeline _ ...) ...)) (map transform o))
(('command o ...) `(command ,@(map transform o)))
(('literal o) (transform o))
(('name o) o)
(('number o) o)
;;(('assignment a b) `(assignment ,(transform a) ,(transform b)))
;;(('assignment a b) `(assignment ,(transform a) ',(transform b)))
;; FIXME: flatten?
(('assignment a (and b ('literal _ ...))) `(assignment ,(transform a) ,(transform b)))
(('assignment a b)
`(assignment ,(transform a) ',(map transform b)))