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

Merge pull request #299 from arthurmaciel/remove-pending-parens

Browse source 
Moved trailing parens into correct position
This commit is contained in:
Justin Ethier 2019-01-25 21:20:33 -05:00 • committed by GitHub
commit 1e5dce8a40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 55 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

174
scheme/cyclone/cgen.sld
View file

@ -18,8 +18,7 @@
(scheme cyclone ast) (scheme cyclone ast)
(scheme cyclone cps-optimizations) (scheme cyclone cps-optimizations)
(scheme cyclone util) (scheme cyclone util)
(scheme cyclone libraries) (scheme cyclone libraries))
)
(export (export
mta:code-gen mta:code-gen
autogen autogen
@ -32,15 +31,13 @@
emits* emits*
emit-newline emit-newline
;; Helpers ;; Helpers
self-closure-call? self-closure-call?)
)
(inline (inline
global-not-lambda? global-not-lambda?
global-lambda? global-lambda?
c:num-args c:num-args
c:allocs c:allocs
st:->var st:->var)
)
(begin (begin
(define *optimize-well-known-lambdas* #f) (define *optimize-well-known-lambdas* #f)
@ -133,9 +130,7 @@
(emit (c-macro-return-direct arity)) (emit (c-macro-return-direct arity))
(emit (c-macro-return-direct-with-closure arity)) (emit (c-macro-return-direct-with-closure arity))
(when *optimize-well-known-lambdas* (when *optimize-well-known-lambdas*
(emit (c-macro-return-direct-with-object arity))) (emit (c-macro-return-direct-with-object arity))) ))
)
)
(emit-c-arity-macros (+ arity 1)))) (emit-c-arity-macros (+ arity 1))))
;; Generate macros to call a closures ;; Generate macros to call a closures
@ -241,8 +236,7 @@
"}")) "}"))
(wrap " else { \\\n") (wrap " else { \\\n")
" ((clo)->fn)(td, " n ", clo" args ")" " ((clo)->fn)(td, " n ", clo" args ")"
(wrap ";\\\n}") (wrap ";\\\n}"))))
)))
(define (c-macro-n-prefix n prefix) (define (c-macro-n-prefix n prefix)
(if (> n 0) (if (> n 0)
@ -277,8 +271,7 @@
":" ":"
;; TODO: escape backslashes ;; TODO: escape backslashes
(symbol->string (cdr trace)) (symbol->string (cdr trace))
"\");\n" "\");\n")))
)))
(define (st:->var trace) (define (st:->var trace)
(cdr trace)) (cdr trace))
@ -421,8 +414,7 @@
(lambda (cvar a b) (lambda (cvar a b)
(c-code/vars (c-code/vars
(string-append c-make-macro "(" cvar "," (c:body a) "," (c:body b) ");") (string-append c-make-macro "(" cvar "," (c:body a) "," (c:body b) ");")
(append (c:allocs a) (c:allocs b)))) (append (c:allocs a) (c:allocs b)))))
)
(_c-compile-scalars (_c-compile-scalars
(lambda (args) (lambda (args)
(cond (cond
@ -471,8 +463,7 @@
(string-append (string-append
cvar-name deref-op "elements[" (number->string i) "] = " cvar-name deref-op "elements[" (number->string i) "] = "
(c:body idx-code) (c:body idx-code)
";"))))))))) ";"))))))))))
)
(cond (cond
((zero? len) ((zero? len)
(c-code/vars (c-code/vars
@ -516,10 +507,7 @@
(string-append (string-append
cvar-name deref-op "data[" (number->string i) "] = (unsigned char)" cvar-name deref-op "data[" (number->string i) "] = (unsigned char)"
byte-val byte-val
";")))) ";"))))))))))
))))
)
)
(cond (cond
((zero? len) ((zero? len)
(c-code/vars (c-code/vars
@ -544,8 +532,7 @@
(cond (cond
(use-alloca (use-alloca
(let ((tmp-name (mangle (gensym 'tmp))) (let ((tmp-name (mangle (gensym 'tmp)))
(blen (number->string (string-byte-length exp))) (blen (number->string (string-byte-length exp))))
)
(c-code/vars (c-code/vars
(string-append "" cvar-name) ; Code is just the variable name (string-append "" cvar-name) ; Code is just the variable name
(list ; Allocate integer on the C stack (list ; Allocate integer on the C stack
@ -562,8 +549,7 @@
(->cstr exp) (->cstr exp)
";\n" ";\n"
"memcpy(((string_type *)" cvar-name ")->str, " tmp-name "," blen ");\n" "memcpy(((string_type *)" cvar-name ")->str, " tmp-name "," blen ");\n"
"((string_type *)" cvar-name ")->str[" blen "] = '\\0';" "((string_type *)" cvar-name ")->str[" blen "] = '\\0';")))))
)))))
(else (else
(c-code/vars (c-code/vars
(string-append "&" cvar-name) ; Code is just the variable name (string-append "&" cvar-name) ; Code is just the variable name
@ -605,8 +591,7 @@
(string-append (string-append
"alloc_bignum(data, " cvar-name "); " "alloc_bignum(data, " cvar-name "); "
;; TODO: need error checking, this is just a first cut: ;; TODO: need error checking, this is just a first cut:
"mp_read_radix(&bignum_value(" cvar-name "), \"" num2str "\", 10);")))) "mp_read_radix(&bignum_value(" cvar-name "), \"" num2str "\", 10);")))))
)
((complex? exp) ((complex? exp)
(let* ((cvar-name (mangle (gensym 'c))) (let* ((cvar-name (mangle (gensym 'c)))
(num2str (lambda (n) (num2str (lambda (n)
@ -620,8 +605,7 @@
(rnum (num2str (real-part exp))) (rnum (num2str (real-part exp)))
(inum (num2str (imag-part exp))) (inum (num2str (imag-part exp)))
(addr-op (if use-alloca "" "&")) (addr-op (if use-alloca "" "&"))
(c-make-macro (if use-alloca "alloca_complex_num" "make_complex_num")) (c-make-macro (if use-alloca "alloca_complex_num" "make_complex_num")))
)
(c-code/vars (c-code/vars
(string-append addr-op cvar-name) ; Code is just the variable name (string-append addr-op cvar-name) ; Code is just the variable name
(list ; Allocate on the C stack (list ; Allocate on the C stack
@ -640,8 +624,7 @@
(else (else
(number->string exp)))) (number->string exp))))
(addr-op (if use-alloca "" "&")) (addr-op (if use-alloca "" "&"))
(c-make-macro (if use-alloca "alloca_double" "make_double")) (c-make-macro (if use-alloca "alloca_double" "make_double")))
)
(c-code/vars (c-code/vars
(string-append addr-op cvar-name) ; Code is just the variable name (string-append addr-op cvar-name) ; Code is just the variable name
(list ; Allocate on the C stack (list ; Allocate on the C stack
@ -749,8 +732,7 @@
(if (or (prim:cont? p) (if (or (prim:cont? p)
(equal? (prim/c-var-assign p) "object") (equal? (prim/c-var-assign p) "object")
(prim/c-var-pointer p) ;; Assume returns object (prim/c-var-pointer p) ;; Assume returns object
(prim->c-func-uses-alloca? p use-alloca?) (prim->c-func-uses-alloca? p use-alloca?))
)
"" ""
"&") "&")
cv-name) cv-name)
@ -826,8 +808,7 @@
((tagged-list? '%closure-ref inner-cref)) ((tagged-list? '%closure-ref inner-cref))
(equal? self (cadr inner-cref)) (equal? self (cadr inner-cref))
((equal? 0 (caddr ast))) ((equal? 0 (caddr ast)))
((equal? closure-index (caddr inner-cref))) ((equal? closure-index (caddr inner-cref))))
)
#t)) #t))
; c-compile-ref : ref-exp -> string ; c-compile-ref : ref-exp -> string
@ -908,14 +889,12 @@
(equal? (car args) (cdr trace)) (equal? (car args) (cdr trace))
;; Make sure continuation is not a lambda, because ;; Make sure continuation is not a lambda, because
;; that means a closure may be allocated ;; that means a closure may be allocated
(ref? (cadr args)) (ref? (cadr args)))
)
(let* ((cgen-lis (let* ((cgen-lis
(map (map
(lambda (e) (lambda (e)
(c-compile-exp e append-preamble "" ast-id "" cps?)) (c-compile-exp e append-preamble "" ast-id "" cps?))
(cddr args)) ;; Skip the closure (cddr args))) ;; Skip the closure
)
(cgen-allocs (cgen-allocs
(apply string-append (apply string-append
(map (lambda (a) (c:allocs->str (c:allocs a))) cgen-lis))) (map (lambda (a) (c:allocs->str (c:allocs a))) cgen-lis)))
@ -936,12 +915,9 @@
(mangle arg) (mangle arg)
" = " " = "
(c:body body-exp) (c:body body-exp)
";" ";"))
)
)
parent-args parent-args
cgen-lis))) cgen-lis))))
)
;;(trace:info `(loop ,args ,(cadr args) ,cgen-lis ,parent-args)) ;;(trace:info `(loop ,args ,(cadr args) ,cgen-lis ,parent-args))
(c-code (c-code
(string-append (string-append
@ -949,8 +925,7 @@
"\n" "\n"
cgen-body ;; TODO: (c:body cgen) ;; TODO: re-assign function args, longer-term using temp variables cgen-body ;; TODO: (c:body cgen) ;; TODO: re-assign function args, longer-term using temp variables
"\n" "\n"
"continue;"))) "continue;"))))
)
((prim? fun) ((prim? fun)
(let* ((c-fun (let* ((c-fun
@ -1009,7 +984,7 @@
;(mangle (car args)) ;(mangle (car args))
;")->elements[" ;")->elements["
;(number->string (- (cadr args) 1))"]" ;(number->string (- (cadr args) 1))"]"
)))) ))))
;; TODO: may not be good enough, closure app could be from an element ;; TODO: may not be good enough, closure app could be from an element
((tagged-list? '%closure-ref fun) ((tagged-list? '%closure-ref fun)
@ -1032,8 +1007,7 @@
(set-c-call-arity! (c:num-args cargs)) (set-c-call-arity! (c:num-args cargs))
(let* ((wkf (well-known-lambda (car args))) (let* ((wkf (well-known-lambda (car args)))
(fnc (if wkf (adb:get/default (ast:lambda-id wkf) #f) #f)) (fnc (if wkf (adb:get/default (ast:lambda-id wkf) #f) #f))
(adbf:fnc (adb:get/default ast-id #f)) (adbf:fnc (adb:get/default ast-id #f)))
)
(cond (cond
;; Handle recursive calls via iteration, if possible ;; Handle recursive calls via iteration, if possible
((and adbf:fnc ((and adbf:fnc
@ -1042,9 +1016,7 @@
(self-closure-call? (self-closure-call?
fun fun
(car (adbf:all-params adbf:fnc)) (car (adbf:all-params adbf:fnc))
(adbf:self-closure-index adbf:fnc) (adbf:self-closure-index adbf:fnc)))
)
)
(let* ((params (map mangle (cdr (adbf:all-params adbf:fnc)))) (let* ((params (map mangle (cdr (adbf:all-params adbf:fnc))))
(tmp-params (map (tmp-params (map
(lambda (param) (lambda (param)
@ -1077,8 +1049,7 @@
(map (map
(lambda (p tmp) (lambda (p tmp)
(string-append " " p " = " tmp "; ")) (string-append " " p " = " tmp "; "))
params tmp-params))) params tmp-params))))
)
;(trace:error `(JAE ,fun ,ast-id ,params ,args (c:num-args cargs))) ;(trace:error `(JAE ,fun ,ast-id ,params ,args (c:num-args cargs)))
(c-code/vars (c-code/vars
(string-append (string-append
@ -1092,14 +1063,11 @@
(mangle (car (adbf:all-params adbf:fnc))) ;; Call back into self after GC (mangle (car (adbf:all-params adbf:fnc))) ;; Call back into self after GC
(if (> (c:num-args cargs) 0) "," "") (if (> (c:num-args cargs) 0) "," "")
(string-join params ", ") (string-join params ", ")
");" ");")
)
(map (map
(lambda (param) (lambda (param)
(string-append " object " param "; ")) (string-append " object " param "; "))
tmp-params) tmp-params))))
))
)
((and wkf fnc ((and wkf fnc
*optimize-well-known-lambdas* *optimize-well-known-lambdas*
@ -1107,8 +1075,7 @@
(equal? (adbf:closure-size fnc) 1)) (equal? (adbf:closure-size fnc) 1))
(let* ((lid (ast:lambda-id wkf)) (let* ((lid (ast:lambda-id wkf))
(c-lambda-fnc-str (string-append "__lambda_" (number->string lid))) (c-lambda-fnc-str (string-append "__lambda_" (number->string lid)))
(c-lambda-fnc-gc-ret-str (string-append "__lambda_gc_ret_" (number->string lid))) (c-lambda-fnc-gc-ret-str (string-append "__lambda_gc_ret_" (number->string lid))))
)
(c-code (c-code
(string-append (string-append
(c:allocs->str (c:allocs cfun) "\n") (c:allocs->str (c:allocs cfun) "\n")
@ -1122,17 +1089,14 @@
c-lambda-fnc-str c-lambda-fnc-str
(if (> num-cargs 0) "," "") (if (> num-cargs 0) "," "")
(c:body cargs) (c:body cargs)
");")) ");"))))
)
)
;; TODO: here and in other case, if well-known but closure size does not match, use ;; TODO: here and in other case, if well-known but closure size does not match, use
;; other macro to at least call out the __lambda_ function directly. seemed to ;; other macro to at least call out the __lambda_ function directly. seemed to
;; speed up C compile times (let's test that!) ;; speed up C compile times (let's test that!)
;; ;;"#define return_direct_with_clo" n "(td, clo, _fn" args ") { \\\n" ;; ;;"#define return_direct_with_clo" n "(td, clo, _fn" args ") { \\\n"
((and wkf fnc) ((and wkf fnc)
(let* ((lid (ast:lambda-id wkf)) (let* ((lid (ast:lambda-id wkf))
(c-lambda-fnc-str (string-append "__lambda_" (number->string lid))) (c-lambda-fnc-str (string-append "__lambda_" (number->string lid))))
)
(c-code (c-code
(string-append (string-append
(c:allocs->str (c:allocs cfun) "\n") (c:allocs->str (c:allocs cfun) "\n")
@ -1185,8 +1149,7 @@
(equal? (adbf:closure-size fnc) 1)) (equal? (adbf:closure-size fnc) 1))
(let* ((lid (ast:lambda-id (closure->lam fun))) (let* ((lid (ast:lambda-id (closure->lam fun)))
(c-lambda-fnc-str (string-append "__lambda_" (number->string lid))) (c-lambda-fnc-str (string-append "__lambda_" (number->string lid)))
(c-lambda-fnc-gc-ret-str (string-append "__lambda_gc_ret_" (number->string lid))) (c-lambda-fnc-gc-ret-str (string-append "__lambda_gc_ret_" (number->string lid))))
)
(c-code (c-code
(string-append (string-append
(c:allocs->str (c:allocs cfun) "\n") (c:allocs->str (c:allocs cfun) "\n")
@ -1200,12 +1163,10 @@
c-lambda-fnc-str c-lambda-fnc-str
(if (> num-cargs 0) "," "") (if (> num-cargs 0) "," "")
(c:body cargs) (c:body cargs)
");")) ");"))))
))
((adbf:well-known fnc) ((adbf:well-known fnc)
(let* ((lid (ast:lambda-id (closure->lam fun))) (let* ((lid (ast:lambda-id (closure->lam fun)))
(c-lambda-fnc-str (string-append "__lambda_" (number->string lid))) (c-lambda-fnc-str (string-append "__lambda_" (number->string lid))))
)
(c-code (c-code
(string-append (string-append
(c:allocs->str (c:allocs cfun) "\n") (c:allocs->str (c:allocs cfun) "\n")
@ -1276,12 +1237,9 @@
(c-code "") (c-code "")
vars/vals)) vars/vals))
(body-exp (c-compile-exp (body-exp (c-compile-exp
body append-preamble cont ast-id trace cps?)) body append-preamble cont ast-id trace cps?)))
)
;;(trace:error `(JAE DEBUG body ,body ,vars/vals ,exp)) ;;(trace:error `(JAE DEBUG body ,body ,vars/vals ,exp))
(c:append vexps body-exp) (c:append vexps body-exp)))
)
)
(else (else
(error `(Unsupported function application ,exp))))))) (error `(Unsupported function application ,exp)))))))
@ -1358,8 +1316,7 @@
(ast:lambda-id body) (ast:lambda-id body)
(st:add-function! trace var) (st:add-function! trace var)
#f ;; inline, so disable CPS on this pass #f ;; inline, so disable CPS on this pass
) )))
))
(c-code/vars "" (list "")))) (c-code/vars "" (list ""))))
@ -1371,8 +1328,7 @@
(lambda-data (lambda-data
`(,precompiled-sym `(,precompiled-sym
,(caddr exp) ;; Args ,(caddr exp) ;; Args
,(cadddr exp) ;; Body ,(cadddr exp))) ;; Body
))
(lid (allocate-lambda #f lambda-data)) (lid (allocate-lambda #f lambda-data))
(total-num-args (total-num-args
(let ((count 1)) ;; Start at 1 because there will be one less comma than args (let ((count 1)) ;; Start at 1 because there will be one less comma than args
@ -1383,8 +1339,7 @@
count)) ;; args count)) ;; args
;; Subtract "internal" args added for runtime ;; Subtract "internal" args added for runtime
(num-args (num-args
(- total-num-args 4)) (- total-num-args 4)))
)
;; Is the function also defined inline? ;; Is the function also defined inline?
;(trace:error `(JAE define-c ,exp)) ;(trace:error `(JAE define-c ,exp))
(cond (cond
@ -1411,9 +1366,7 @@
(string-append "mclosure0(" cv-name ", (function_type)__lambda_" (string-append "mclosure0(" cv-name ", (function_type)__lambda_"
(number->string lid) ");" cv-name ".num_args = " (number->string lid) ");" cv-name ".num_args = "
(number->string num-args) (number->string num-args)
";"))) ";")))))
)
)
(c-code/vars "" (list "")))) (c-code/vars "" (list ""))))
;; Symbol compilation ;; Symbol compilation
@ -1562,12 +1515,9 @@
(when (and (ref? arg) (member arg (adbf:assigned-to-var fnc))) (when (and (ref? arg) (member arg (adbf:assigned-to-var fnc)))
;(trace:error `(JAE closure for ,(ast:lambda-id ast-fnc) self ref is index ,index)) ;(trace:error `(JAE closure for ,(ast:lambda-id ast-fnc) self ref is index ,index))
(adbf:set-self-closure-index! fnc index) (adbf:set-self-closure-index! fnc index)
(adb:set! (ast:lambda-id ast-fnc) fnc) (adb:set! (ast:lambda-id ast-fnc) fnc))
) (set! index (+ index 1)))
(set! index (+ index 1)) closure-args))
)
closure-args)
)
(else #f)))) (else #f))))
;; c-compile-closure : closure-exp (string -> void) -> string ;; c-compile-closure : closure-exp (string -> void) -> string
@ -1607,8 +1557,7 @@
(and *optimize-well-known-lambdas* (and *optimize-well-known-lambdas*
(adbf:well-known fnc) ;; Only optimize well-known functions (adbf:well-known fnc) ;; Only optimize well-known functions
;(equal? (length free-vars) 1) ;; Sanity check ;(equal? (length free-vars) 1) ;; Sanity check
(equal? (adbf:closure-size fnc) 1) ;; From closure conv (equal? (adbf:closure-size fnc) 1))))) ;; From closure conv
))))
(macro? (assoc (st:->var trace) (get-macros))) (macro? (assoc (st:->var trace) (get-macros)))
(call/cc? (and (equal? (car trace) "scheme/base.sld") (call/cc? (and (equal? (car trace) "scheme/base.sld")
(equal? (st:->var trace) 'call/cc))) (equal? (st:->var trace) 'call/cc)))
@ -1626,8 +1575,7 @@
(let ((decl (if use-alloca? (let ((decl (if use-alloca?
(string-append "closureN_type * " cv-name " = alloca(sizeof(closureN_type));\n") (string-append "closureN_type * " cv-name " = alloca(sizeof(closureN_type));\n")
(string-append "closureN_type " cv-name ";\n"))) (string-append "closureN_type " cv-name ";\n")))
(sep (if use-alloca? "->" ".")) (sep (if use-alloca? "->" ".")))
)
(string-append (string-append
decl decl
;; Not ideal, but one more special case to type check call/cc ;; Not ideal, but one more special case to type check call/cc
@ -1666,8 +1614,7 @@
(if (> (length free-vars) 0) "," "") (if (> (length free-vars) 0) "," "")
(string-join free-vars ", ") (string-join free-vars ", ")
");" ");"
cv-name ".num_args = " (number->string (compute-num-args lam)) ";" cv-name ".num_args = " (number->string (compute-num-args lam)) ";")))))
)))))
;(trace:info (list 'JAE-DEBUG trace macro?)) ;(trace:info (list 'JAE-DEBUG trace macro?))
(cond (cond
(use-obj-instead-of-closure? (use-obj-instead-of-closure?
@ -1737,9 +1684,7 @@
(and (not has-closure?) ;; Only top-level functions for now (and (not has-closure?) ;; Only top-level functions for now
(pair? trace) (pair? trace)
(not (null? (cdr trace))) (not (null? (cdr trace)))
(adbv:direct-rec-call? (adb:get (cdr trace)))) (adbv:direct-rec-call? (adb:get (cdr trace))))))
)
)
(formals* (formals*
(string-append (string-append
(if has-closure? (if has-closure?
@ -1785,13 +1730,11 @@
;; Only trace when entering initial defined function ;; Only trace when entering initial defined function
(cond (cond
(has-closure? (has-closure?
(if has-loop? "\n while(1) {\n" "") (if has-loop? "\n while(1) {\n" ""))
)
(else (else
(string-append (string-append
(st:->code trace) (st:->code trace)
(if has-loop? "\n while(1) {\n" "") (if has-loop? "\n while(1) {\n" "")))))
))))
body) body)
" ") " ")
"; \n" "; \n"
@ -1995,8 +1938,7 @@
(string-split (string-split
(string-replace-all params-str "object" "") (string-replace-all params-str "object" "")
#\,)) #\,))
#\,)) #\,)))
)
(emit* (emit*
"static void __lambda_gc_ret_" "static void __lambda_gc_ret_"
(number->string (car l)) (number->string (car l))
@ -2026,8 +1968,7 @@
(cadadr l) (cadadr l)
" {" " {"
(car (cddadr l)) (car (cddadr l))
" }" " }"))
))
((equal? 'precompiled-inline-lambda (caadr l)) ((equal? 'precompiled-inline-lambda (caadr l))
(emit* (emit*
"static object __lambda_" "static object __lambda_"
@ -2035,8 +1976,7 @@
(cadadr l) (cadadr l)
" {" " {"
(car (cddadr l)) (car (cddadr l))
" }" " }"))
))
((member (car l) inline-lambdas) ((member (car l) inline-lambdas)
(emit ((caadr l) (string-append "__lambda_" (number->string (car l)))))) (emit ((caadr l) (string-append "__lambda_" (number->string (car l))))))
(else (else
@ -2082,8 +2022,7 @@
(if head-pair (if head-pair
(emit* "(((closure)cont)->fn)(data, 1, cont, &" head-pair ");") (emit* "(((closure)cont)->fn)(data, 1, cont, &" head-pair ");")
(emit* "(((closure)cont)->fn)(data, 1, cont, NULL);")) (emit* "(((closure)cont)->fn)(data, 1, cont, NULL);"))
(emit* " } ")) (emit* " } "))))
))
; Emit entry point ; Emit entry point
(cond (cond
@ -2172,8 +2111,7 @@
(emits* (emits*
"make_pair(" pair-sym ", find_or_add_symbol(\"" (symbol->string (car g)) "make_pair(" pair-sym ", find_or_add_symbol(\"" (symbol->string (car g))
"\"), &" cvar-sym ");\n") "\"), &" cvar-sym ");\n")
(set! pairs (cons pair-sym pairs)) (set! pairs (cons pair-sym pairs))))
))
*globals*) *globals*)
(for-each (for-each
(lambda (g) (lambda (g)
@ -2224,8 +2162,7 @@
(emit* (emit*
"mclosure1(" this-clo "mclosure1(" this-clo
", c_" (lib:name->string lib-name) "_entry_pt" ", c_" (lib:name->string lib-name) "_entry_pt"
", &" prev-clo ");") ", &" prev-clo ");"))
)
(reverse required-libs)) ;; Init each lib's dependencies 1st (reverse required-libs)) ;; Init each lib's dependencies 1st
(emit* (emit*
;; Start cont chain, but do not assume closcall1 macro was defined ;; Start cont chain, but do not assume closcall1 macro was defined
@ -2255,8 +2192,7 @@
(emit* (emit*
" mclosure1(clo, c_" (lib:name->string lib-name) "_entry_pt_first_lambda, ((closure1_type *)cont)->element);\n" " mclosure1(clo, c_" (lib:name->string lib-name) "_entry_pt_first_lambda, ((closure1_type *)cont)->element);\n"
" object buf[1]; buf[0] = cont;\n" " object buf[1]; buf[0] = cont;\n"
" GC(data, (closure)&clo, buf, 1);\n")) " GC(data, (closure)&clo, buf, 1);\n"))))
))
(emit "}") (emit "}")
(if program? (if program?