Issue 4464/1: Move ly_is_module from ly-module.hh to lily-guile.hh

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index b7cfabd675d9e9f435146b91ad35cc1671d33de7..76919a5d9d9f5ff96d43d5d367ec5cd5516f04d1 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -100,6 +100,7 @@ SCM ly_assoc_prepend_x (SCM alist, SCM key, SCM val);
 
 inline bool ly_is_list (SCM x) { return scm_is_true (scm_list_p (x)); }
 inline bool ly_cheap_is_list (SCM x) { return scm_is_pair (x) || scm_is_null (x); }
 
 inline bool ly_is_list (SCM x) { return scm_is_true (scm_list_p (x)); }
 inline bool ly_cheap_is_list (SCM x) { return scm_is_pair (x) || scm_is_null (x); }

+inline bool ly_is_module (SCM x) { return SCM_MODULEP (x); }

 inline bool ly_is_procedure (SCM x) { return scm_is_true (scm_procedure_p (x)); }
 inline bool ly_is_port (SCM x) { return scm_is_true (scm_port_p (x)); }
 
 inline bool ly_is_procedure (SCM x) { return scm_is_true (scm_procedure_p (x)); }
 inline bool ly_is_port (SCM x) { return scm_is_true (scm_port_p (x)); }
 

diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh
index e763138ef800bf8c0bebb203c66b9707934cdb03..82a147a4b4fa90e92587c512f62fa8d64a9b77b6 100644 (file)
--- a/lily/include/ly-module.hh
+++ b/lily/include/ly-module.hh
@@ -29,8 +29,6 @@ SCM ly_module_lookup (SCM module, SCM sym);
 SCM ly_modules_lookup (SCM modules, SCM sym, SCM);
 SCM ly_module_symbols (SCM mod);
 void ly_reexport_module (SCM mod);
 SCM ly_modules_lookup (SCM modules, SCM sym, SCM);
 SCM ly_module_symbols (SCM mod);
 void ly_reexport_module (SCM mod);

-inline bool ly_is_module (SCM x) { return SCM_MODULEP (x); }
-

 SCM ly_use_module (SCM mod, SCM used);
 
 /* For backward compatability with Guile 1.8 */
 SCM ly_use_module (SCM mod, SCM used);
 
 /* For backward compatability with Guile 1.8 */