mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-20 11:40:18 +02:00
*** empty log message ***
This commit is contained in:
parent
5315b8620a
commit
be2d2946bc
2 changed files with 18 additions and 19 deletions
|
@ -264,9 +264,7 @@
|
|||
;; dump bytecode
|
||||
(push-code! `(load-program ,bytes)))))
|
||||
((vlink? x)
|
||||
;; (push-code! `(local-ref ,(object-index (vlink-module x))))
|
||||
;; FIXME: Temporary hack
|
||||
(push-code! (object->code #f))
|
||||
(dump! (vlink-module x))
|
||||
(dump! (vlink-name x))
|
||||
(push-code! `(link)))
|
||||
((vmod? x)
|
||||
|
|
|
@ -161,12 +161,14 @@ VM_DEFINE_LOADER (load_program, "load-program")
|
|||
|
||||
VM_DEFINE_INSTRUCTION (link, "link", 0, 2, 1)
|
||||
{
|
||||
#if 0
|
||||
sp--;
|
||||
*sp = scm_c_env_vcell (sp[0], sp[1], 1);
|
||||
#else
|
||||
if (!SCM_FALSEP (sp[-1]))
|
||||
{
|
||||
/* Temporary hack to support the current module system */
|
||||
sp[-1] = scm_c_env_vcell (sp[-1], sp[0], 1);
|
||||
sp--;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Temporary hack that supports the current module system */
|
||||
SCM mod = scm_current_module ();
|
||||
SCM var = scm_eval_closure_lookup (scm_standard_eval_closure (mod),
|
||||
*sp, SCM_BOOL_F);
|
||||
|
@ -176,7 +178,6 @@ VM_DEFINE_INSTRUCTION (link, "link", 0, 2, 1)
|
|||
*sp, SCM_BOOL_T);
|
||||
*--sp = SCM_VARVCELL (var);
|
||||
}
|
||||
#endif
|
||||
NEXT;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue