Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-24 20:45:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP for let-syntax

Browse source
This commit is contained in:
Justin Ethier 2017-11-21 19:07:52 -05:00
parent 09cb431219
commit 5b8f47af43
2 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
scheme/cyclone/transforms.sld
View file

@ -511,6 +511,12 @@
;TODO: modify this whole section to use macros:get-env instead of *defined-macros*. macro:get-env becomes the mac-env. any new scopes need to extend that env, and an env parameter needs to be added to (expand). any macros defined with define-syntax use that env as their mac-env (how to store that)? ;TODO: modify this whole section to use macros:get-env instead of *defined-macros*. macro:get-env becomes the mac-env. any new scopes need to extend that env, and an env parameter needs to be added to (expand). any macros defined with define-syntax use that env as their mac-env (how to store that)?
; expand : exp -> exp ; expand : exp -> exp
;; TODO: need a local version of each expand that receives a local env built by
;; let-syntax forms
;;(define (expand exp env rename-env local-env)
;;(define (_expand exp env rename-env)
(define (expand exp env rename-env) (define (expand exp env rename-env)
(define (log e) (define (log e)
(display (display
@ -578,6 +584,23 @@
;; of the macros are defined. may need to make a special pass ;; of the macros are defined. may need to make a special pass
;; to do loading or expansion of macro bodies ;; to do loading or expansion of macro bodies
`(define ,name ,(expand body env rename-env))))))) `(define ,name ,(expand body env rename-env)))))))
((let-syntax? exp)
(let* ((body (cddr exp))
(bindings (cadr exp))
(bindings-as-macros
(map
(lambda (b)
(let ((name (car b))
(binding (cadr b)))
(cons name (if (tagged-list? 'syntax-rules binding)
(expand binding env rename-env)
binding))))
bindings))
; TODO: (new-local-macro-env (append bindings-as-macros local-env))
)
(trace:error `(let-syntax ,bindings-as-macros))
(expand body env rename-env) ;; TODO: new-local-macro-env
))
((app? exp) ((app? exp)
(cond (cond
((symbol? (car exp)) ((symbol? (car exp))

22
tests/let-syntax.scm
View file

@ -9,17 +9,17 @@
;; (given-that if (set! if 'now)) ;; (given-that if (set! if 'now))
;; if)) ;; => now ;; if)) ;; => now
;;(let ((x 'outer))
;; (let-syntax ((m (syntax-rules () ((m) x))))
;; (let ((x 'inner))
;; (m)))) ;; Should be outer
(write
(let ((x 'outer)) (let ((x 'outer))
(define-syntax m ;; Testing this out, but let-syntax needs to work, too (let-syntax ((m (syntax-rules () ((m) x))))
(syntax-rules () ((m) x)))
(let ((x 'inner)) (let ((x 'inner))
(m))) ;; Should be outer (m)))) ;; Should be outer
)
(write (m)) ;; Should be an error, of course ;(write
;(let ((x 'outer))
; (define-syntax m ;; Testing this out, but let-syntax needs to work, too
; (syntax-rules () ((m) x)))
; (let ((x 'inner))
; (m))) ;; Should be outer
; )
;
;(write (m)) ;; Should be an error, of course