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

Cleanup

Browse source
This commit is contained in:
Justin Ethier 2015-08-18 21:59:12 -04:00
parent 5abd750697
commit 322696e4c1
1 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
scheme/cyclone/macros.sld
View file

@ -37,15 +37,7 @@
(compare? (lambda (sym-a sym-b) ;; TODO: the compare function from exrename.
(eq? sym-a sym-b))) ;; this may need to be more sophisticated
)
;(cond
; ;; compiled macro
; ;((macro? (car exp))
; ; ((car exp)
; ; exp
; ; rename
; ; compare?))
; (else
(let ((macro (assoc (car exp) defined-macros)))
(let ((macro (assoc (car exp) defined-macros)))
;TODO: restructure this to use eval if the macro is not a proc.
; then can try passing in an environment with create-environment.
@ -58,19 +50,20 @@
; (macro? (Cyc-get-cvar (cdr macro)))))
;(display " */")
;; assumes ER macro
(if macro
((Cyc-get-cvar (cdr macro))
;exp
; could be a raw lambda, if that is the case try quoting it
(if (or (macro? (Cyc-get-cvar (cdr macro)))
(procedure? (cdr macro)))
; TODO: what about macros? (if (macro? (Cyc-get-cvar (cdr macro)))
exp
(list 'quote exp))
rename
compare?)
exp))));)) ;; TODO: error instead??
;; Invoke ER macro
(if macro
((Cyc-get-cvar (cdr macro))
;; Pass expression differently depending upon if this is a
;; compiled macro or a cons one that will be called via eval.
;;
;; If a raw lambda (IE, exec using eval), try quoting it
(if (or (macro? (Cyc-get-cvar (cdr macro)))
(procedure? (cdr macro)))
exp
(list 'quote exp))
rename
compare?)
exp)))) ;; TODO: error instead??
; TODO: get macro name, transformer
; TODO: base off of syntactic closures instead of ER macros??