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

Pass appropriate lambda ID when compiling closure

Browse source
This commit is contained in:
Justin Ethier 2018-09-20 17:52:29 -04:00
parent 3b0a6b2fd6
commit 107f5ce75a
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scheme/cyclone/cgen.sld
View file

@ -359,7 +359,7 @@
; IR (2): ; IR (2):
((tagged-list? '%closure exp) ((tagged-list? '%closure exp)
(c-compile-closure exp append-preamble cont trace cps?)) (c-compile-closure exp append-preamble cont ast-id trace cps?))
; Global definition ; Global definition
((define? exp) ((define? exp)
(c-compile-global exp append-preamble cont trace)) (c-compile-global exp append-preamble cont trace))
@ -910,7 +910,7 @@
((tagged-list? '%closure fun) ((tagged-list? '%closure fun)
(let* ((cfun (c-compile-closure (let* ((cfun (c-compile-closure
fun append-preamble cont trace cps?)) fun append-preamble cont ast-id trace cps?))
(this-cont (string-append "(closure)" (c:body cfun))) (this-cont (string-append "(closure)" (c:body cfun)))
(cargs (c-compile-args (cargs (c-compile-args
args append-preamble " " this-cont ast-id trace cps?)) args append-preamble " " this-cont ast-id trace cps?))
@ -1043,8 +1043,6 @@
(add-global-inline (add-global-inline
var var
(define-c->inline-var exp)) (define-c->inline-var exp))
TODO: seem to be getting ast-id's that don't match closure var's. something is getting set incorrectly
(trace:error `(JAE DEBUG-ast c-compile-global ,(ast-lambda-id body)
(add-global (add-global
(define-c->inline-var exp) (define-c->inline-var exp)
#t ;; always a lambda #t ;; always a lambda
@ -1228,8 +1226,7 @@ TODO: seem to be getting ast-id's that don't match closure var's. something is g
(with-fnc ast-id (lambda (fnc) (with-fnc ast-id (lambda (fnc)
(trace:info `(c-compile-closure-element-ref ,ast-id ,var ,idx ,fnc)) (trace:info `(c-compile-closure-element-ref ,ast-id ,var ,idx ,fnc))
(cond (cond
((and #f ;; TODO: temporarily disabled ((and (adbf:well-known fnc)
(adbf:well-known fnc)
(pair? (adbf:all-params fnc)) (pair? (adbf:all-params fnc))
(equal? (adbf:closure-size fnc) 1)) (equal? (adbf:closure-size fnc) 1))
(mangle (car (adbf:all-params fnc)))) (mangle (car (adbf:all-params fnc))))
@ -1252,7 +1249,7 @@ TODO: seem to be getting ast-id's that don't match closure var's. something is g
;; the closure. The closure conversion phase tags each access ;; the closure. The closure conversion phase tags each access
;; to one with the corresponding index so `lambda` can use them. ;; to one with the corresponding index so `lambda` can use them.
;; ;;
(define (c-compile-closure exp append-preamble cont trace cps?) (define (c-compile-closure exp append-preamble cont ast-id trace cps?)
(let* ((lam (closure->lam exp)) (let* ((lam (closure->lam exp))
(free-vars (free-vars
(map (map
@ -1260,7 +1257,7 @@ TODO: seem to be getting ast-id's that don't match closure var's. something is g
(if (tagged-list? '%closure-ref free-var) (if (tagged-list? '%closure-ref free-var)
(let ((var (cadr free-var)) (let ((var (cadr free-var))
(idx (number->string (- (caddr free-var) 1)))) (idx (number->string (- (caddr free-var) 1))))
(c-compile-closure-element-ref (ast:lambda-id lam) var idx) (c-compile-closure-element-ref ast-id var idx)
;(string-append ;(string-append
; "((closureN)" (mangle var) ")->elements[" idx "]") ; "((closureN)" (mangle var) ")->elements[" idx "]")
) )
@ -1330,9 +1327,8 @@ TODO: seem to be getting ast-id's that don't match closure var's. something is g
))))) )))))
;(trace:info (list 'JAE-DEBUG trace macro?)) ;(trace:info (list 'JAE-DEBUG trace macro?))
(cond (cond
;; TODO: temporarily disabled (use-obj-instead-of-closure?
;;(use-obj-instead-of-closure? (create-object))
;; (create-object))
(else (else
(c-code/vars (c-code/vars
(string-append "&" cv-name) (string-append "&" cv-name)