X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-modules.cc;h=ef3a11cc2c84648fa25be8f63cca186c9882cbc7;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=f34e7e30416356949bc461e52e38fd27d4d5e0d7;hpb=652f454fae6ed31ced7f9c3ce22dbc5752460a8c;p=lilypond.git

diff --git a/lily/lily-modules.cc b/lily/lily-modules.cc
index f34e7e3041..ef3a11cc2c 100644
--- a/lily/lily-modules.cc
+++ b/lily/lily-modules.cc
@@ -18,6 +18,9 @@
 */
 
 #include "lily-modules.hh"
+#include "international.hh"
+#include "lily-imports.hh"
+#include "warn.hh"
 
 struct Scm_module::Variable_record
 {
@@ -45,37 +48,62 @@ Scm_module::boot_init (void *arg)
 {
   Scm_module *self = static_cast<Scm_module *> (arg);
 
-  // Establish variables first
-  for (Variable_record *p = self->variables_; p;)
-    {
-      Variable_record *next = p->next_;
-      p->var_->boot (p->name_);
-      delete p;
-      p = next;
-    }
-  self->variables_ = 0;
+  // Establish variables
+  for (Variable_record *p = self->variables_; p; p = p->next_)
+    p->var_->boot (p->name_);
+}
+
+static SCM
+call_trampoline (void *self)
+{
+  // One more indirection since void * can only be safely cast to
+  // pointers to data rather than pointers to function.
+  (*static_cast <void (**)()> (self)) ();
+  return SCM_UNDEFINED;
 }
 
 void
-Scm_module::boot ()
+Scm_module::boot (void (*init) ())
 {
   assert (SCM_UNBNDP (module_));
   module_ = scm_c_define_module (name_, boot_init, static_cast <void *> (this));
+  // Can't wrap the following in the scm_c_define_module call since
+  // the init code may need module_ operative.
+  if (init)
+    scm_c_call_with_current_module (module_, call_trampoline, static_cast <void *> (&init));
+  // Verify that every Variable has a definition, either because of
+  // getting initialized with a value at definition or because of the
+  // init call providing one.
+  for (Variable_record *p = variables_; p; )
+    {
+      Variable_record *next = p->next_;
+      if (SCM_UNBNDP (SCM (*p->var_)))
+        error (_f ("Uninitialized variable `%s' in module (%s)", p->name_, name_));
+      delete p;
+      p = next;
+    }
+  variables_ = 0;
 }
 
 void
 Scm_module::import ()
 {
   assert (SCM_UNBNDP (module_));
-  module_ = scm_c_resolve_module (name_);
+  SCM intrface = scm_c_resolve_module (name_);
+  // Using only the public interface is a voluntary form of access
+  // control in GUILE.  It would be cumbersome to do so until
+  // Guile_user itself is imported.
+  if (SCM_MODULEP (Guile_user::module.module_))
+    intrface = Guile_user::module_public_interface (intrface);
   for (Variable_record *p = variables_; p;)
     {
       Variable_record *next = p->next_;
-      p->var_->import (module_, p->name_);
+      p->var_->import (intrface, p->name_);
       delete p;
       p = next;
     }
   variables_ = 0;
+  module_ = intrface;
 }
 
 void