#include "main.hh"
#include "file-path.hh"
#include "lily-guile.hh"
-#include "ly-modules.hh"
+#include "ly-module.hh"
#include "ly-smobs.icc"
smobify_self ();
scm_gc_unprotect_object (translator_tab_->self_scm ());
- scope_ = ly_make_anonymous_module();
+ scope_ = ly_make_anonymous_module ();
}
Music_output_def::~Music_output_def ()
scope_= ly_make_anonymous_module ();
if (ly_module_p (s.scope_))
- ly_copy_module_variables (scope_, s.scope_);
+ ly_import_module (scope_, s.scope_);
}
}
void
-Music_output_def::assign_translator (SCM transdef)
+Music_output_def::assign_context_def (SCM transdef)
{
Context_def *tp = unsmob_context_def (transdef);
assert (tp);
String nm = ly_symbol2string (tp->get_context_name ()) + "Context";
- scm_module_define (scope_, ly_symbol2scm (nm.to_str0()), transdef);
+ scm_module_define (scope_, ly_symbol2scm (nm.to_str0 ()), transdef);
}
/*
find the translator for NAME. NAME must be a symbol.
- */
+*/
SCM
Music_output_def::find_context_def (SCM name) const
{
return val;
}
-
int
Music_output_def::print_smob (SCM s, SCM p, scm_print_state *)
{
return 1;
}
-
SCM
Music_output_def::get_scmvar (String s) const
{
return lookup_variable (ly_symbol2scm (s.to_str0 ()));
}
-
void
Music_output_def::set_variable (SCM sym, SCM val)
{
return scm_variable_ref (var);
}
-LY_DEFINE(ly_paper_lookup,
- "ly:paper-lookup",
- 2, 0,0,
- (SCM pap, SCM sym),
- "Lookup @var{sym} in @var{pap}. Return the value "
- " or '() if undefined. "
- )
+LY_DEFINE (ly_paper_lookup, "ly:paper-lookup",
+ 2, 0,0, (SCM pap, SCM sym),
+ "Lookup @var{sym} in @var{pap}. "
+ "Return the value or @code{'()} if undefined.")
{
Music_output_def *op = unsmob_music_output_def (pap);
SCM_ASSERT_TYPE (op, pap, SCM_ARG1, __FUNCTION__, "Paper");
SCM_ASSERT_TYPE (gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
- SCM v = op->lookup_variable (sym);
-
- if (SCM_VARIABLEP(v))
- return SCM_VARIABLE_REF(v);
+ SCM var = ly_module_lookup (op->scope_, sym);
+ if (SCM_VARIABLEP (var))
+ return SCM_VARIABLE_REF (var);
else
return SCM_EOL;
}
-LY_DEFINE(ly_output_def_scope,
- "ly:output-def-scope",
- 1, 0,0,
- (SCM def),
- "Get the scope inside @var{def}."
- )
+LY_DEFINE (ly_output_def_scope, "ly:output-def-scope",
+ 1, 0,0, (SCM def),
+ "Get the variable scope inside @var{def}.")
{
Music_output_def *op = unsmob_music_output_def (def);
SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition");
-
return op->scope_;
}
-
-LY_DEFINE(ly_output_def_clone,
- "ly:output-def-clone",
- 1, 0,0,
- (SCM def),
- "Clone @var{def}."
- )
+LY_DEFINE (ly_output_def_clone, "ly:output-def-clone",
+ 1, 0, 0, (SCM def),
+ "Clone @var{def}.")
{
Music_output_def *op = unsmob_music_output_def (def);
SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition");
-
SCM s = op->clone ()->self_scm ();
scm_gc_unprotect_object (s);
return s;