mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 22:31:12 +02:00
Code Activity

* modules.c (the_root_module): Moved before scm_current_module.

Browse source 
(scm_current_module): Return the root module if `the-module' fluid
gives #f.

* standalone/Makefile.am: Add stanza for test-with-guile-module.

* standalone/test-with-guile-module.c: New test.
This commit is contained in:
Neil Jerram 2008-02-01 22:51:34 +00:00
parent 300b1ae58a
commit 3ac8359afd
6 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -48,6 +48,7 @@ backtrace of a stack with a promise object (made by `delay') in it.
** Fixed a build problem on AIX (use of func_data identifier)
** Fixed a segmentation fault which occurred when hashx-ref or hashx-set! was
called with an associator proc that returns neither a pair nor #f.
** Secondary threads now always return a valid module for (current-module).
* New modules (see the manual for details)

6
libguile/ChangeLog
View file

@ -1,3 +1,9 @@
2008-02-01 Neil Jerram <neil@ossau.uklinux.net>
* modules.c (the_root_module): Moved before scm_current_module.
(scm_current_module): Return the root module if `the-module' fluid
gives #f.
2008-01-22 Neil Jerram <neil@ossau.uklinux.net>
* COPYING: Removed.

26
libguile/modules.c
View file

@ -40,12 +40,25 @@ scm_t_bits scm_module_tag;
static SCM the_module;
static SCM the_root_module_var;
static SCM
the_root_module ()
{
if (scm_module_system_booted_p)
return SCM_VARIABLE_REF (the_root_module_var);
else
return SCM_BOOL_F;
}
SCM_DEFINE (scm_current_module, "current-module", 0, 0, 0,
(),
"Return the current module.")
#define FUNC_NAME s_scm_current_module
{
return scm_fluid_ref (the_module);
SCM curr = scm_fluid_ref (the_module);
return scm_is_true (curr) ? curr : the_root_module ();
}
#undef FUNC_NAME
@ -230,17 +243,6 @@ scm_env_top_level (SCM env)
SCM_SYMBOL (sym_module, "module");
static SCM the_root_module_var;
static SCM
the_root_module ()
{
if (scm_module_system_booted_p)
return SCM_VARIABLE_REF (the_root_module_var);
else
return SCM_BOOL_F;
}
SCM
scm_lookup_closure_module (SCM proc)
{

6
test-suite/ChangeLog
View file

@ -1,3 +1,9 @@
2008-02-01 Neil Jerram <neil@ossau.uklinux.net>
* standalone/Makefile.am: Add stanza for test-with-guile-module.
* standalone/test-with-guile-module.c: New test.
2008-01-22 Neil Jerram <neil@ossau.uklinux.net>
* COPYING: Removed.

1
test-suite/standalone/.cvsignore
View file

@ -11,3 +11,4 @@ test-num2integral
test-round
test-unwind
test-list
test-with-guile-module

6
test-suite/standalone/Makefile.am
View file

@ -110,6 +110,12 @@ TESTS += test-conversion
check_SCRIPTS += test-use-srfi
TESTS += test-use-srfi
# test-with-guile-module
test_with_guile_module_CFLAGS = ${test_cflags}
test_with_guile_module_LDADD = ${top_builddir}/libguile/libguile.la
check_PROGRAMS += test-with-guile-module
TESTS += test-with-guile-module
all-local:
cd ${srcdir} && chmod u+x ${check_SCRIPTS}