- fixed incorrect handling of library-extension when searching wpo files
compile.ss original commit: 4c0726f7174ca2cdb6d1c5862da88fad6d10c840
This commit is contained in:
parent
cfe66a259b
commit
1e9941edee
3
LOG
3
LOG
|
@ -59,3 +59,6 @@
|
||||||
object to a time-utc object.
|
object to a time-utc object.
|
||||||
stats.c,
|
stats.c,
|
||||||
date.ms
|
date.ms
|
||||||
|
- fixed incorrect handling of library-extension when searching wpo files
|
||||||
|
compile.ss
|
||||||
|
7.ms
|
||||||
|
|
30
mats/7.ms
30
mats/7.ms
|
@ -1918,6 +1918,36 @@ evaluating module init
|
||||||
(equal?
|
(equal?
|
||||||
(separate-eval '(load "testfile-wpo-ab7-all.so"))
|
(separate-eval '(load "testfile-wpo-ab7-all.so"))
|
||||||
"invoking a\ninvoking c\ninvoking b\n#t\n#t\n#t\n")
|
"invoking a\ninvoking c\ninvoking b\n#t\n#t\n#t\n")
|
||||||
|
|
||||||
|
(begin
|
||||||
|
(with-output-to-file "testfile-wpo-extlib.chezscheme.sls"
|
||||||
|
(lambda ()
|
||||||
|
(pretty-print
|
||||||
|
'(library (testfile-wpo-extlib)
|
||||||
|
(export magic)
|
||||||
|
(import (rnrs))
|
||||||
|
(define magic 9))))
|
||||||
|
'replace)
|
||||||
|
(with-output-to-file "testfile-wpo-ext.ss"
|
||||||
|
(lambda ()
|
||||||
|
(pretty-print '(import (chezscheme) (testfile-wpo-extlib)))
|
||||||
|
(pretty-print '(pretty-print magic)))
|
||||||
|
'replace)
|
||||||
|
(separate-compile
|
||||||
|
'(lambda (x)
|
||||||
|
(parameterize ([compile-imported-libraries #t]
|
||||||
|
[generate-wpo-files #t])
|
||||||
|
(compile-program x)))
|
||||||
|
'wpo-ext)
|
||||||
|
#t)
|
||||||
|
|
||||||
|
(equal?
|
||||||
|
(separate-compile
|
||||||
|
'(lambda (x)
|
||||||
|
(parameterize ([generate-wpo-files #t])
|
||||||
|
(compile-whole-program (format "~a.wpo" x) (format "~a-all.so" x))))
|
||||||
|
'wpo-ext)
|
||||||
|
"()\n")
|
||||||
)
|
)
|
||||||
|
|
||||||
(mat compile-whole-library
|
(mat compile-whole-library
|
||||||
|
|
|
@ -792,7 +792,7 @@
|
||||||
(define read-library
|
(define read-library
|
||||||
(lambda (path libs-visible?)
|
(lambda (path libs-visible?)
|
||||||
(cond
|
(cond
|
||||||
[(find-library who path "wpo" (map (lambda (ext) (cons (car ext) ".wpo")) (library-extensions))) =>
|
[(find-library who path "wpo" (map (lambda (ext) (cons (car ext) (string-append (path-root (cdr ext)) ".wpo"))) (library-extensions))) =>
|
||||||
(lambda (fn)
|
(lambda (fn)
|
||||||
(let-values ([(no-program node*) (process-ir*! (read-input-file who fn) fn #f libs-visible?)])
|
(let-values ([(no-program node*) (process-ir*! (read-input-file who fn) fn #f libs-visible?)])
|
||||||
(values fn node*)))]
|
(values fn node*)))]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user