X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=402bd80b6e8baf329b52b07c16275751f8c0b95b;hb=d84b43d9cc76809a2d008419194c0c94486311a4;hp=3d9caa2734a1258508862ae487d4ca52d6960126;hpb=82e1242e3ad5d276b74e81488a3ffdac25701520;p=lilypond.git diff --git a/lily/context-def.cc b/lily/context-def.cc index 3d9caa2734..402bd80b6e 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2014 Han-Wen Nienhuys + Copyright (C) 2000--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,10 +50,11 @@ Context_def::Context_def () Input * Context_def::origin () const { - return Input::unsmob (input_location_); + return unsmob (input_location_); } Context_def::Context_def (Context_def const &s) + : Smob () { context_aliases_ = SCM_EOL; translator_group_type_ = SCM_EOL; @@ -81,46 +82,42 @@ Context_def::~Context_def () { } -const char Context_def::type_p_name_[] = "ly:context-def?"; +const char * const Context_def::type_p_name_ = "ly:context-def?"; int -Context_def::print_smob (SCM smob, SCM port, scm_print_state *) +Context_def::print_smob (SCM port, scm_print_state *) const { - Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob); - scm_puts ("#context_name_, port); + scm_display (context_name_, port); scm_puts (" ", port); - string loc = me->origin ()->location_string (); + string loc = origin ()->location_string (); scm_puts (loc.c_str (), port); scm_puts (">", port); return 1; } SCM -Context_def::mark_smob (SCM smob) +Context_def::mark_smob () const { - ASSERT_LIVE_IS_ALLOWED (smob); - - Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob); - - scm_gc_mark (me->description_); - scm_gc_mark (me->context_aliases_); - scm_gc_mark (me->accept_mods_); - scm_gc_mark (me->translator_mods_); - scm_gc_mark (me->property_ops_); - scm_gc_mark (me->translator_group_type_); - scm_gc_mark (me->default_child_); - scm_gc_mark (me->input_location_); - - return me->context_name_; + ASSERT_LIVE_IS_ALLOWED (self_scm ()); + + scm_gc_mark (description_); + scm_gc_mark (context_aliases_); + scm_gc_mark (accept_mods_); + scm_gc_mark (translator_mods_); + scm_gc_mark (property_ops_); + scm_gc_mark (translator_group_type_); + scm_gc_mark (default_child_); + scm_gc_mark (input_location_); + + return context_name_; } void Context_def::add_context_mod (SCM mod) { SCM tag = scm_car (mod); - if (ly_symbol2scm ("description") == tag) + if (scm_is_eq (tag, ly_symbol2scm ("description"))) { description_ = scm_cadr (mod); return; @@ -133,27 +130,27 @@ Context_def::add_context_mod (SCM mod) if (scm_is_string (sym)) sym = scm_string_to_symbol (sym); - if (ly_symbol2scm ("default-child") == tag) + if (scm_is_eq (tag, ly_symbol2scm ("default-child"))) default_child_ = sym; - else if (ly_symbol2scm ("consists") == tag - || ly_symbol2scm ("remove") == tag) + else if (scm_is_eq (tag, ly_symbol2scm ("consists")) + || scm_is_eq (tag, ly_symbol2scm ("remove"))) { translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_); } - else if (ly_symbol2scm ("accepts") == tag - || ly_symbol2scm ("denies") == tag) + else if (scm_is_eq (tag, ly_symbol2scm ("accepts")) + || scm_is_eq (tag, ly_symbol2scm ("denies"))) accept_mods_ = scm_cons (scm_list_2 (tag, sym), accept_mods_); - else if (ly_symbol2scm ("pop") == tag - || ly_symbol2scm ("push") == tag - || ly_symbol2scm ("assign") == tag - || ly_symbol2scm ("unset") == tag - || ly_symbol2scm ("apply") == tag) + else if (scm_is_eq (tag, ly_symbol2scm ("pop")) + || scm_is_eq (tag, ly_symbol2scm ("push")) + || scm_is_eq (tag, ly_symbol2scm ("assign")) + || scm_is_eq (tag, ly_symbol2scm ("unset")) + || scm_is_eq (tag, ly_symbol2scm ("apply"))) property_ops_ = scm_cons (mod, property_ops_); - else if (ly_symbol2scm ("alias") == tag) + else if (scm_is_eq (tag, ly_symbol2scm ("alias"))) context_aliases_ = scm_cons (sym, context_aliases_); - else if (ly_symbol2scm ("translator-type") == tag) + else if (scm_is_eq (tag, ly_symbol2scm ("translator-type"))) translator_group_type_ = sym; - else if (ly_symbol2scm ("context-name") == tag) + else if (scm_is_eq (tag, ly_symbol2scm ("context-name"))) context_name_ = sym; else programming_error ("unknown context mod tag"); @@ -168,9 +165,9 @@ Context_def::get_accepted (SCM user_mod) const { SCM tag = scm_caar (s); SCM sym = scm_cadar (s); - if (tag == ly_symbol2scm ("accepts")) + if (scm_is_eq (tag, ly_symbol2scm ("accepts"))) acc = scm_cons (sym, acc); - else if (tag == ly_symbol2scm ("denies")) + else if (scm_is_eq (tag, ly_symbol2scm ("denies"))) acc = scm_delete_x (sym, acc); } @@ -191,7 +188,7 @@ Context_def::get_default_child (SCM user_mod) const for (SCM s = user_mod; scm_is_pair (s); s = scm_cdr (s)) { SCM entry = scm_car (s); - if (scm_car (entry) == ly_symbol2scm ("default-child")) + if (scm_is_eq (scm_car (entry), ly_symbol2scm ("default-child"))) { name = scm_cadr (entry); break; @@ -238,7 +235,7 @@ Context_def::internal_path_to_acceptable_context (SCM type_sym, vector accepteds; for (SCM s = accepted; scm_is_pair (s); s = scm_cdr (s)) - if (Context_def *t = Context_def::unsmob (find_context_def (odef, + if (Context_def *t = unsmob (find_context_def (odef, scm_car (s)))) accepteds.push_back (t); @@ -292,9 +289,9 @@ Context_def::get_translator_names (SCM user_mod) const if (scm_is_string (arg)) arg = scm_string_to_symbol (arg); - if (ly_symbol2scm ("consists") == tag) + if (scm_is_eq (tag, ly_symbol2scm ("consists"))) l1 = scm_cons (arg, l1); - else if (ly_symbol2scm ("remove") == tag + else if (scm_is_eq (tag, ly_symbol2scm ("remove")) && (scm_is_pair (arg) || ly_is_procedure (arg) || get_translator (arg))) @@ -401,7 +398,7 @@ LY_DEFINE (ly_context_def_lookup, "ly:context-def-lookup", " @samp{property-ops}, @samp{context-name}, @samp{group-type}.") { LY_ASSERT_SMOB (Context_def, def, 1); - Context_def *cd = Context_def::unsmob (def); + Context_def *cd = unsmob (def); LY_ASSERT_TYPE (ly_is_symbol, sym, 2); SCM res = cd->lookup (sym); @@ -425,9 +422,9 @@ LY_DEFINE (ly_context_def_modify, "ly:context-def-modify", LY_ASSERT_SMOB (Context_def, def, 1); LY_ASSERT_SMOB (Context_mod, mod, 2); - Context_def *cd = Context_def::unsmob (def)->clone (); + Context_def *cd = unsmob (def)->clone (); - for (SCM s = Context_mod::unsmob (mod)->get_mods (); + for (SCM s = unsmob (mod)->get_mods (); scm_is_pair (s); s = scm_cdr (s)) cd->add_context_mod (scm_car (s));