X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-property.cc;h=6e22b2f808211b28aaa7acedad6afba52f9829f6;hb=98b662a091d78893004ee5f7cf4f7e9a6d811f57;hp=87bfbc5b9d842d9fe0771da958b0054c85e4a4d4;hpb=f60196bc3f9f565ad484edec211101ad491af8b5;p=lilypond.git diff --git a/lily/context-property.cc b/lily/context-property.cc index 87bfbc5b9d..6e22b2f808 100644 --- a/lily/context-property.cc +++ b/lily/context-property.cc @@ -24,7 +24,6 @@ #include "international.hh" #include "item.hh" #include "main.hh" -#include "simple-closure.hh" #include "smobs.hh" #include "spanner.hh" #include "unpure-pure-container.hh" @@ -40,10 +39,11 @@ general_pushpop_property (Context *context, SCM grob_property_path, SCM new_value) { + // Numbers may appear, but not in first place if (!scm_is_symbol (context_property) || !scm_is_symbol (scm_car (grob_property_path))) { - warning (_ ("need symbol arguments for \\override and \\revert")); + warning (_ ("need symbol argument for \\override and \\revert")); if (do_internal_type_checking_global) assert (false); } @@ -59,7 +59,6 @@ typecheck_grob (SCM symbol, SCM value) return typecheck_grob (symbol, upc->unpure_part ()) && typecheck_grob (symbol, upc->pure_part ()); return ly_is_procedure (value) - || unsmob (value) || type_check_assignment (symbol, value, ly_symbol2scm ("backend-type?")); } @@ -67,7 +66,7 @@ class Grob_properties : public Simple_smob { public: SCM mark_smob () const; - static const char type_p_name_[]; + static const char * const type_p_name_; private: friend class Grob_property_info; friend SCM ly_make_grob_properties (SCM); @@ -98,7 +97,7 @@ private: cooked_ (alist), cooked_from_ (alist), nested_ (0) { } }; -const char Grob_properties::type_p_name_[] = "ly:grob-properties?"; +const char * const Grob_properties::type_p_name_ = "ly:grob-properties?"; SCM Grob_properties::mark_smob () const