Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-09 22:17:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

friendlier error message for self-referential modules

Browse source
This commit is contained in:
Alex Shinn 2012-07-19 22:27:15 +09:00
parent a9784b56f8
commit 680e2fe169
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/meta.scm
View file

@ -1,5 +1,5 @@
;; meta.scm -- meta langauge for describing modules ;; meta.scm -- meta langauge for describing modules
;; Copyright (c) 2009-2011 Alex Shinn. All rights reserved. ;; Copyright (c) 2009-2012 Alex Shinn. All rights reserved.
;; BSD-style license: http://synthcode.com/license.txt ;; BSD-style license: http://synthcode.com/license.txt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -12,6 +12,7 @@
(define (module-env mod) (vector-ref mod 1)) (define (module-env mod) (vector-ref mod 1))
(define (module-env-set! mod env) (vector-set! mod 1 env)) (define (module-env-set! mod env) (vector-set! mod 1 env))
(define (module-meta-data mod) (vector-ref mod 2)) (define (module-meta-data mod) (vector-ref mod 2))
(define (module-meta-data-set! mod x) (vector-set! mod 2 x))
(define (module-exports mod) (define (module-exports mod)
(or (%module-exports mod) (env-exports (module-env mod)))) (or (%module-exports mod) (env-exports (module-env mod))))
@ -134,6 +135,7 @@
(define (eval-module name mod . o) (define (eval-module name mod . o)
(let ((env (if (pair? o) (car o) (make-environment))) (let ((env (if (pair? o) (car o) (make-environment)))
(meta (module-meta-data mod))
(dir (module-name-prefix name))) (dir (module-name-prefix name)))
(define (load-modules files extension fold?) (define (load-modules files extension fold?)
(for-each (for-each
@ -150,6 +152,10 @@
(load path env))))) (load path env)))))
(else (error "couldn't find include" f))))) (else (error "couldn't find include" f)))))
files)) files))
;; catch cyclic references
(module-meta-data-set!
mod
`((error "module attempted to reference itself while loading" ,name)))
(for-each (for-each
(lambda (x) (lambda (x)
(case (and (pair? x) (car x)) (case (and (pair? x) (car x))
@ -160,7 +166,7 @@
(mod2 (load-module (car mod2-name+imports)))) (mod2 (load-module (car mod2-name+imports))))
(%import env (module-env mod2) (cdr mod2-name+imports) #t))) (%import env (module-env mod2) (cdr mod2-name+imports) #t)))
(cdr x))))) (cdr x)))))
(module-meta-data mod)) meta)
(for-each (for-each
(lambda (x) (lambda (x)
(case (and (pair? x) (car x)) (case (and (pair? x) (car x))
@ -171,8 +177,11 @@
((include-shared) ((include-shared)
(load-modules (cdr x) *shared-object-extension* #f)) (load-modules (cdr x) *shared-object-extension* #f))
((body begin) ((body begin)
(for-each (lambda (expr) (eval expr env)) (cdr x))))) (for-each (lambda (expr) (eval expr env)) (cdr x)))
(module-meta-data mod)) ((error)
(apply error (cdr x)))))
meta)
(module-meta-data-set! mod meta)
(warn-undefs env #f) (warn-undefs env #f)
env)) env))