diff options
author | Andy Wingo <wingo@pobox.com> | 2009-06-05 11:47:19 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-06-05 11:47:19 +0200 |
commit | b7393ea123eb0f27d99ba1c38bd944f78b90eb42 (patch) | |
tree | 46f0eb6a1ff4fad21709dc020734641d319212f2 /libguile/vm.c | |
parent | 42193dac5800fe6a63d392c8b9ebb7f9257725e2 (diff) | |
download | guile-b7393ea123eb0f27d99ba1c38bd944f78b90eb42.tar.gz |
refactoring for toplevel-ref, toplevel-set, link-now
* libguile/vm-i-system.c (toplevel-ref, toplevel-set)
* libguile/vm-i-loader.c (link-now):
* libguile/vm.c (resolve_variable): Factor out common code to a static
method. The compiler can still inline it, so it shouldn't have a
significant performance effect.
* libguile/vm-engine.c (vm_error_no_such_module): Remove now-unused
label.
Diffstat (limited to 'libguile/vm.c')
-rw-r--r-- | libguile/vm.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/libguile/vm.c b/libguile/vm.c index 081a691ff..f708b2108 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -267,6 +267,43 @@ vm_make_boot_program (long nargs) * VM */ +static SCM +resolve_variable (SCM what, SCM program_module) +{ + if (SCM_LIKELY (SCM_SYMBOLP (what))) + { + if (SCM_LIKELY (scm_module_system_booted_p + && scm_is_true (program_module))) + /* might longjmp */ + return scm_module_lookup (program_module, what); + else + { + SCM v = scm_sym2var (what, SCM_BOOL_F, SCM_BOOL_F); + if (scm_is_false (v)) + scm_misc_error (NULL, "unbound variable: ~S", scm_list_1 (what)); + else + return v; + } + } + else + { + SCM mod; + /* compilation of @ or @@ + `what' is a three-element list: (MODNAME SYM INTERFACE?) + INTERFACE? is #t if we compiled @ or #f if we compiled @@ + */ + mod = scm_resolve_module (SCM_CAR (what)); + if (scm_is_true (SCM_CADDR (what))) + mod = scm_module_public_interface (mod); + if (SCM_FALSEP (mod)) + scm_misc_error (NULL, "no such module: ~S", + scm_list_1 (SCM_CAR (what))); + /* might longjmp */ + return scm_module_lookup (mod, SCM_CADR (what)); + } +} + + #define VM_DEFAULT_STACK_SIZE (16 * 1024) #define VM_NAME vm_regular_engine |