suzanne.soy/compatibility
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first cut at submodules

Browse Source 
original commit: 3d69dfab863c116439ce5b747dbc69852db74938
This commit is contained in:
Matthew Flatt 2012-03-05 14:47:12 -07:00
parent e8c17f99a1
commit e4759d6931
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collects/mzlib/etc.rkt
View File

@ -245,7 +245,8 @@
(if (module-path-index? mpi)
(module-path-index-resolve mpi)
mpi))])
(let ([name (resolved-module-path-name srcmod)])
(let* ([name (resolved-module-path-name srcmod)]
[name (if (pair? name) (car name) name)])
(and (path? name)
(let-values ([(base name dir?) (split-path name)])
(and (path? base)

20
collects/mzlib/runtime-path.rkt
View File

@ -92,8 +92,14 @@
[vr (caddr p)])
(unless (module-path? p)
(error 'runtime-path "not a module path: ~.s" p))
(module-path-index-join p (and vr
(variable-reference->resolved-module-path vr))))]
(let ([base (and vr
(variable-reference->resolved-module-path vr))])
(if (and (pair? p)
(eq? (car p) 'submod)
(path? (cadr p)))
(module-path-index-join `(submod "." ,@(cddr p))
(module-path-index-join (cadr p) base))
(module-path-index-join p base))))]
[else (error 'runtime-path "unknown form: ~.s" p)])))
paths)))
@ -154,9 +160,13 @@
#`(quote
#,(hash-ref
ext-file-table
(module-path-index-resolve (module-path-index-join
(syntax->datum #'mp)
(syntax-source-module stx)))
(module-path-index-resolve
(let ([p (syntax->datum #'mp)]
[base (syntax-source-module stx)])
(if (and (pair? p) (eq? (car p) 'submod) (path? (cadr p)))
(module-path-index-join `(submod "." ,@(cddr p))
(module-path-index-join (cadr p) base))
(module-path-index-join p base))))
null))]))
)