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

Cleanup

Browse source
This commit is contained in:
Justin Ethier 2015-08-26 00:40:01 -04:00
parent eeed5a3975
commit 9c3f177650
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scheme/cyclone/macros.sld
View file

@ -1,6 +1,6 @@
(define-library (scheme cyclone macros) (define-library (scheme cyclone macros)
(import (scheme base) (import (scheme base)
(scheme write) ;(scheme write) ;; Debug only
(scheme eval) ;; TODO: without this line, compilation just (scheme eval) ;; TODO: without this line, compilation just
;; silently fails. WTF?? ;; silently fails. WTF??
(scheme cyclone util)) (scheme cyclone util))
@ -24,7 +24,6 @@
(define (macro:get-defined-macros) *macro:defined-macros*) (define (macro:get-defined-macros) *macro:defined-macros*)
;; Macro section ;; Macro section
;; TODO: place this in another module? could speed development
(define (define-syntax? exp) (define (define-syntax? exp)
(tagged-list? 'define-syntax exp)) (tagged-list? 'define-syntax exp))
@ -43,12 +42,6 @@
(macro (assoc (car exp) defined-macros)) (macro (assoc (car exp) defined-macros))
(compiled-macro? (or (macro? (Cyc-get-cvar (cdr macro))) (compiled-macro? (or (macro? (Cyc-get-cvar (cdr macro)))
(procedure? (cdr macro))))) (procedure? (cdr macro)))))
;TODO: restructure this to use eval if the macro is not a proc.
; then can try passing in an environment with create-environment.
; once eval is extended to work with macros, this could allow it to
; expand a macro contained within another
;; Invoke ER macro ;; Invoke ER macro
(cond (cond
((not macro) ((not macro)
@ -59,32 +52,21 @@
rename rename
compare?)) compare?))
(else (else
;; Assume evaluated macro
(let* ((env-vars (map car defined-macros)) (let* ((env-vars (map car defined-macros))
(env-vals (map (lambda (v) (env-vals (map (lambda (v)
(list 'macro (cdr v))) (list 'macro (cdr v)))
defined-macros)) defined-macros))
;; Pass defined macros so nested macros can be expanded
(env (create-environment env-vars env-vals))) (env (create-environment env-vars env-vals)))
;; Assume evaluated macro
(newline)
(display "/* ")
(display (list 'evaluating-macro macro exp env-vars env-vals))
(display " */ ")
(eval (eval
(list (list
(cdr macro) (cdr macro)
(list 'quote exp) (list 'quote exp)
rename rename
compare?) compare?)
;; TODO: at the moment this causes building cyclone to break because not env))))))
;; all macros can be evaluated correctly. suspect some shortcomings in
;; eval compared to compilation? anyway, as of now this line breaks:
;; 1) scheme/base.sld due to macros defined in this module being evaluated
;; 2) test2.scm, because we're trying to debug this issue
env
))
))))
; TODO: get macro name, transformer ; TODO: get macro name, transformer
; TODO: base off of syntactic closures instead of ER macros??
; TODO: let-syntax forms ; TODO: let-syntax forms
)) ))