X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fly-module.cc;h=2076168fda75ac9ad9c73004d611bb24ebc881af;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=42ff2f8b063c85d514f2c27d5dc8e97135aa4f23;hpb=4065bcebbff7bde77a2e821db2c0c76a25c187c6;p=lilypond.git

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 42ff2f8b06..2076168fda 100644
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 */
 
 #include "lily-guile.hh"
+#include "ly-module.hh"
 #include "warn.hh"
 #include "main.hh"
-#include "std-string.hh"
 #include "protected-scm.hh"
-
+#include "lily-imports.hh"
 
 SCM
 ly_make_module (bool safe)
@@ -30,43 +30,56 @@ ly_make_module (bool safe)
   SCM mod = SCM_EOL;
   if (!safe)
     {
-      SCM maker = ly_lily_module_constant ("make-module");
-
-      SCM scm_module = ly_lily_module_constant ("the-scm-module");
-
-      mod = scm_call_0 (maker);
-      scm_module_define (mod, ly_symbol2scm ("%module-public-interface"),
-			 mod);
-
-      ly_use_module (mod, scm_module);
-      ly_use_module (mod, global_lily_module);
+      /* Look up (evaluate) Scheme make-module function and call it */
+
+      mod = Guile_user::make_module ();
+      /*
+        Look up and call Guile module-export-all! or, when using
+        Guile V1.8, the compatible shim defined in lily.scm.
+      */
+#if GUILEV2
+      Guile_user::module_export_all_x (mod);
+#else
+      Lily::module_export_all_x (mod);
+#endif
+
+      /*
+        Evaluate Guile module "the-root-module",
+        and ensure we inherit definitions from it and the "lily" module
+        N.B. this used to be "the-scm-module" and is deprecated in
+        Guile V1.9/2.0
+      */
+
+      ly_use_module (mod, Guile_user::the_root_module);
+      ly_use_module (mod, Lily::module);
     }
   else
     {
-      SCM proc = ly_lily_module_constant ("make-safe-lilypond-module");
-      mod = scm_call_0 (proc);
+      /* Evaluate and call make-safe-lilypond-module */
+      mod = Lily::make_safe_lilypond_module ();
     }
 
-
   return mod;
 }
 
 SCM
 ly_use_module (SCM mod, SCM used)
 {
-  SCM expr
-    = scm_list_3 (ly_symbol2scm ("module-use!"),
-		  mod,
-		  scm_list_2 (ly_symbol2scm ("module-public-interface"),
-			      used));
-
-  return scm_eval (expr, global_lily_module);
+  /*
+    Pick up the module's interface definition.
+    TODO - Replace inline evaluations (interpreted)
+    with guile API calls if these become available.
+  */
+  /*
+    Set up to interpret
+    '(module_use! <mod> (module-public-interface <used>))'
+  */
+  return Guile_user::module_use_x (mod,
+                                   Guile_user::module_public_interface (used));
 }
 
 #define FUNC_NAME __FUNCTION__
 
-
-
 SCM
 ly_module_symbols (SCM mod)
 {
@@ -78,35 +91,31 @@ ly_module_symbols (SCM mod)
 
 static SCM
 entry_to_alist (void * /* closure */,
-		SCM key,
-		SCM val,
-		SCM result)
+                SCM key,
+                SCM val,
+                SCM result)
 {
-  if (scm_variable_bound_p (val) == SCM_BOOL_T)
+  if (to_boolean (scm_variable_bound_p (val)))
     return scm_cons (scm_cons (key, scm_variable_ref (val)), result);
   programming_error ("unbound variable in module");
   return result;
 }
 
 LY_DEFINE (ly_module_2_alist, "ly:module->alist",
-	   1, 0, 0, (SCM mod),
-	   "Dump the contents of module @var{mod} as an alist.")
+           1, 0, 0, (SCM mod),
+           "Dump the contents of module @var{mod} as an alist.")
 {
   SCM_VALIDATE_MODULE (1, mod);
   SCM obarr = SCM_MODULE_OBARRAY (mod);
 
   return scm_internal_hash_fold ((scm_t_hash_fold_fn) &entry_to_alist,
-				 NULL, SCM_EOL, obarr);
+                                 NULL, SCM_EOL, obarr);
 }
 
 void
 ly_export (SCM module, SCM namelist)
 {
-  static SCM export_function;
-  if (!export_function)
-    export_function = scm_permanent_object (scm_c_lookup ("module-export!"));
-
-  scm_call_2 (SCM_VARIABLE_REF (export_function), module, namelist);
+  Guile_user::module_export_x (module, namelist);
 }
 
 void