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

Improvements to expand-body

Browse source
This commit is contained in:
Justin Ethier 2016-04-29 22:39:45 -04:00
parent 743adfa4f5
commit be99e732a6
1 changed files with 87 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
scheme/cyclone/transforms.sld
View file

@ -839,9 +839,65 @@
(expand-body '() exp env)) (expand-body '() exp env))
;; Helper to expand a lambda body, so we can splice in any begin's ;; Helper to expand a lambda body, so we can splice in any begin's
;(define (expand-body result exp env)
; (cond
; ((null? exp) (reverse result))
; ;; Splice in begin contents and keep expanding body
; ((begin? (car exp))
; (let* ((expr (car exp))
; (begin-exprs (begin->exps expr)))
; (expand-body
; result
; (append begin-exprs (cdr exp))
; env)))
; (else
; (let ((macro #f))
; (when (and (app? (car exp))
; (symbol? (caar exp)))
; (set! macro (env:lookup (caar exp) env #f)))
; (if (tagged-list? 'macro macro)
; ;; Expand macro here so we can catch begins in the expanded code,
; ;; including nested begins
; (let ((expanded (macro:expand (car exp) macro env)))
; ;; Call with expanded macro in case we need to expand again
; (expand-body
; result
; (cons expanded (cdr exp))
; env))
; ;; No macro, use main expand function to process
; (expand-body
; (cons
; (expand (car exp) env)
; result)
; (cdr exp)
; env))))))
;; TODO: plan is, rewrite this to enhance it, test, commit, then figure
;; out why there is an infinite loop when we use this in cyclone.scm
;; for library compilation (in particular, for scheme base).
(define (expand-body result exp env) (define (expand-body result exp env)
;(display `(expand-body ,exp) (current-error-port))
(if (null? exp)
(reverse result)
(let ((this-exp (car exp)))
(cond (cond
((null? exp) (reverse result)) ((or (const? this-exp)
(prim? this-exp)
(ref? this-exp)
(quote? this-exp))
(expand-body (cons this-exp result) (cdr exp) env))
((or (define? this-exp)
(define-c? this-exp)
(define-syntax? this-exp)
(lambda? this-exp)
(set!? this-exp)
(if? this-exp))
(expand-body
(cons
(expand this-exp env)
result)
(cdr exp)
env))
;; Splice in begin contents and keep expanding body ;; Splice in begin contents and keep expanding body
((begin? (car exp)) ((begin? (car exp))
(let* ((expr (car exp)) (let* ((expr (car exp))
@ -870,58 +926,7 @@
(expand (car exp) env) (expand (car exp) env)
result) result)
(cdr exp) (cdr exp)
env)))))) env))))))))
;;(define (expand-body result exp env)
;; (if (null? exp)
;; (reverse result)
;; (let ((this-exp (car exp)))
;; (cond
;; ;; Splice in begin contents and keep expanding body
;; ((begin? (car exp))
;; (let* ((expr (car exp))
;; (begin-exprs (begin->exps expr)))
;; (expand-body
;; result
;; (append begin-exprs (cdr exp))
;; env)))
;; ((or (const? this-exp)
;; (prim? this-exp)
;; (ref? this-exp)
;; (quote? this-exp))
;; (expand-body (cons this-exp result) (cdr exp) env))
;; ((or (define? this-exp)
;; (define-c? this-exp)
;; (define-syntax? this-exp)
;; (lambda? this-exp)
;; (set!? this-exp)
;; (if? this-exp))
;; (expand-body
;; (cons
;; (expand this-exp env)
;; result)
;; (cdr exp)
;; env))
;; (else
;; (let ((macro #f))
;; (when (and (app? (car exp))
;; (symbol? (caar exp)))
;; (set! macro (env:lookup (caar exp) env #f)))
;; (if (tagged-list? 'macro macro)
;; ;; Expand macro here so we can catch begins in the expanded code,
;; ;; including nested begins
;; (let ((expanded (macro:expand (car exp) macro env)))
;; ;; Call with expanded macro in case we need to expand again
;; (expand-body
;; result
;; (cons expanded (cdr exp))
;; env))
;; ;; No macro, use main expand function to process
;; (expand-body
;; (cons
;; (expand (car exp) env)
;; result)
;; (cdr exp)
;; env))))))))
;; Top-level analysis ;; Top-level analysis