Fix containing-module on opcodes (fixes issue #326).

lib/chibi/modules.scm

@@ -75,7 +75,13 @@
       (cond ((find-module-file (string-append dir file))
              => (lambda (x) (cons 'begin (file->sexp-list x))))
             (else (error "couldn't find include" file))))
-    (env-parent-set! env (module-env mod))
+    (cond
+     ((equal? '(chibi) name)
+      (env-define! env '*features* *features*)
+      (env-define! env '*shared-object-extension* *shared-object-extension*)
+      (%import env (primitive-environment 7) #f #t))
+     (else
+      (resolve-module-imports env (module-meta-data mod))))
     (let lp ((ls (module-meta-data mod)) (res '()))
       (cond
        ((not (pair? ls))
@@ -99,7 +105,9 @@
            (let lp2 ((ls2 (cdar ls)) (res res))
              (cond
               ((pair? ls2)
-               (lp2 (cdr ls2) (cons (analyze (car ls2) env) res)))
+               (let ((x (analyze (car ls2) env)))
+                 (eval (car ls2) env)
+                 (lp2 (cdr ls2) (cons x res))))
               (else
                (lp (cdr ls) res)))))
           (else
@@ -127,10 +135,12 @@
 
 (define (module-defines? name mod var-name)
   (let lp ((ls (module-ast (analyze-module name))))
-    (and (pair? ls)
+    (cond
-         (or (and (set? (car ls))
+     ((null? ls) #f)
-                  (eq? var-name (ref-name (set-var (car ls)))))
+     ((and (set? (car ls))
-             (lp (cdr ls))))))
+           (eq? var-name (ref-name (set-var (car ls))))))
+     ((seq? (car ls)) (lp (append (seq-ls (car ls)) (cdr ls))))
+     (else (lp (cdr ls))))))
 
 (define (containing-module x)
   (let lp1 ((ls (reverse *modules*)))
@@ -141,13 +151,19 @@
                  (lp1 (cdr ls))
                  (let ((cell (env-cell env (car e-ls))))
                    (if (and (eq? x (cdr cell))
-                            (module-defines? (caar ls) (cdar ls) (car cell)))
+                            (or (opcode? x)
+                                (module-defines? (caar ls) (cdar ls) (car cell))))
                        (car ls)
                        (lp2 (cdr e-ls))))))))))
 
 (define (procedure-analysis x . o)
+  (cond
+   ((opcode? x)
+    #f)
+   (else
     (let ((name (if (procedure? x) (procedure-name x) x))
-        (mod (or (and (pair? o) (car o)) (containing-module x))))
+          (mod (or (and (pair? o) (car o))
+                   (containing-module x))))
       (and mod
            (let lp ((ls (module-ast (analyze-module (module-name mod)))))
              (and (pair? ls)
@@ -158,7 +174,7 @@
                    ((seq? (car ls))
                     (lp (append (seq-ls (car ls)) (cdr ls))))
                    (else
-                  (lp (cdr ls)))))))))
+                    (lp (cdr ls)))))))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; finding all available modules

lib/chibi/modules.sld

@@ -11,5 +11,6 @@
           (only (meta)
                 module-env module-meta-data module-exports
                 make-module load-module find-module resolve-import
+                resolve-module-imports
                 module-name-prefix module-name->file *modules*))
   (include "modules.scm"))

lib/meta-7.scm

@@ -137,6 +137,19 @@
    (else
     (error "couldn't find import" x))))
 
+(define (resolve-module-imports env meta)
+  (for-each
+   (lambda (x)
+     (case (and (pair? x) (car x))
+       ((import import-immutable)
+        (for-each
+         (lambda (m)
+           (let* ((mod2-name+imports (resolve-import m))
+                  (mod2 (load-module (car mod2-name+imports))))
+             (%import env (module-env mod2) (cdr mod2-name+imports) #t)))
+         (cdr x)))))
+   meta))
+
 (define (eval-module name mod . o)
   (let ((env (if (pair? o) (car o) (make-environment)))
         (meta (module-meta-data mod))
@@ -165,17 +178,7 @@
       (module-meta-data-set!
        mod
        `((error "module attempted to reference itself while loading" ,name)))
-      (for-each
+      (resolve-module-imports env meta)
-       (lambda (x)
-         (case (and (pair? x) (car x))
-           ((import import-immutable)
-            (for-each
-             (lambda (m)
-               (let* ((mod2-name+imports (resolve-import m))
-                      (mod2 (load-module (car mod2-name+imports))))
-                 (%import env (module-env mod2) (cdr mod2-name+imports) #t)))
-             (cdr x)))))
-       meta)
       (protect
           (exn (else
                 (module-meta-data-set! mod meta)