Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-16 09:17:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix for expand - seems to work for compiled macros now

Browse source
This commit is contained in:
Justin Ethier 2015-08-18 21:36:05 -04:00
parent 915915b75f
commit 1dc762a048
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scheme/cyclone/macros.sld
View file

@ -1,5 +1,6 @@
(define-library (scheme cyclone macros) (define-library (scheme cyclone macros)
(import (scheme base) (import (scheme base)
;(scheme write)
(scheme cyclone util)) (scheme cyclone util))
; TODO: really need export-all for these cyclone libs!! ; TODO: really need export-all for these cyclone libs!!
(export (export
@ -27,6 +28,10 @@
(define (macro:macro? exp defined-macros) (assoc (car exp) defined-macros)) (define (macro:macro? exp defined-macros) (assoc (car exp) defined-macros))
(define (macro:expand exp defined-macros) (define (macro:expand exp defined-macros)
;(display "/* ")
;(newline)
;(display "entered macro:expand exp")
;(display " */")
(let ((rename (lambda (sym) ;; TODO: not good enough, need to actually rename, and keep same results if (let ((rename (lambda (sym) ;; TODO: not good enough, need to actually rename, and keep same results if
sym)) ;; the same symbol is renamed more than once sym)) ;; the same symbol is renamed more than once
(compare? (lambda (sym-a sym-b) ;; TODO: the compare function from exrename. (compare? (lambda (sym-a sym-b) ;; TODO: the compare function from exrename.
@ -46,13 +51,21 @@
; then can try passing in an environment with create-environment. ; then can try passing in an environment with create-environment.
; once eval is extended to work with macros, this could allow it to ; once eval is extended to work with macros, this could allow it to
; expand a macro contained within another ; expand a macro contained within another
;(display "/* ")
;(newline)
;(display (list macro (car exp)
; (Cyc-get-cvar (cdr macro))
; (macro? (Cyc-get-cvar (cdr macro)))))
;(display " */")
;; assumes ER macro ;; assumes ER macro
(if macro (if macro
((Cyc-get-cvar (cdr macro)) ((Cyc-get-cvar (cdr macro))
;exp ;exp
; could be a raw lambda, if that is the case try quoting it ; could be a raw lambda, if that is the case try quoting it
(if (macro? (Cyc-get-cvar (cdr macro))) (if (or (macro? (Cyc-get-cvar (cdr macro)))
(procedure? (cdr macro)))
; TODO: what about macros? (if (macro? (Cyc-get-cvar (cdr macro)))
exp exp
(list 'quote exp)) (list 'quote exp))
rename rename