From 3d333f46096e20f6f38ab128d31c001a72c14ae3 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sat, 20 Jun 2015 18:13:10 +0200 Subject: [PATCH] Issue 4459/2: Mark print_smob (...) member functions as const --- lily/context-def.cc | 2 +- lily/context-mod.cc | 2 +- lily/context.cc | 2 +- lily/dispatcher.cc | 2 +- lily/duration.cc | 2 +- lily/font-metric.cc | 2 +- lily/grob-array.cc | 2 +- lily/grob-smob.cc | 2 +- lily/include/context-def.hh | 2 +- lily/include/context-mod.hh | 2 +- lily/include/context.hh | 2 +- lily/include/dispatcher.hh | 2 +- lily/include/duration.hh | 2 +- lily/include/font-metric.hh | 2 +- lily/include/grob-array.hh | 4 ++-- lily/include/grob.hh | 2 +- lily/include/input.hh | 2 +- lily/include/lily-lexer.hh | 2 +- lily/include/lily-parser.hh | 2 +- lily/include/moment.hh | 2 +- lily/include/music-function.hh | 6 +++--- lily/include/music-iterator.hh | 2 +- lily/include/music-output.hh | 2 +- lily/include/output-def.hh | 2 +- lily/include/pitch.hh | 2 +- lily/include/prob.hh | 2 +- lily/include/scm-hash.hh | 2 +- lily/include/simple-closure.hh | 2 +- lily/include/smobs.hh | 2 +- lily/include/smobs.tcc | 2 +- lily/include/source-file.hh | 2 +- lily/include/translator-group.hh | 2 +- lily/include/translator.hh | 2 +- lily/include/unpure-pure-container.hh | 2 +- lily/input-smob.cc | 2 +- lily/lily-lexer.cc | 2 +- lily/lily-parser.cc | 2 +- lily/moment.cc | 2 +- lily/music-function.cc | 2 +- lily/music-iterator.cc | 2 +- lily/music-output.cc | 2 +- lily/output-def.cc | 2 +- lily/pitch.cc | 2 +- lily/prob.cc | 2 +- lily/scm-hash.cc | 2 +- lily/simple-closure.cc | 2 +- lily/source-file.cc | 2 +- lily/translator-group.cc | 2 +- lily/translator.cc | 2 +- lily/undead.cc | 4 ++-- lily/unpure-pure-container.cc | 2 +- 51 files changed, 55 insertions(+), 55 deletions(-) diff --git a/lily/context-def.cc b/lily/context-def.cc index 6289596603..3258297b49 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -85,7 +85,7 @@ Context_def::~Context_def () const char Context_def::type_p_name_[] = "ly:context-def?"; int -Context_def::print_smob (SCM port, scm_print_state *) +Context_def::print_smob (SCM port, scm_print_state *) const { scm_puts ("#alist"), diff --git a/lily/duration.cc b/lily/duration.cc index 4768f015b5..0b10019540 100644 --- a/lily/duration.cc +++ b/lily/duration.cc @@ -140,7 +140,7 @@ const char Duration::type_p_name_[] = "ly:duration?"; int -Duration::print_smob (SCM port, scm_print_state *) +Duration::print_smob (SCM port, scm_print_state *) const { scm_puts ("# { SCM mark_smob () const; - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; static const char type_p_name_[]; virtual ~Context_def (); private: diff --git a/lily/include/context-mod.hh b/lily/include/context-mod.hh index cef084c87e..c9f0caa8fb 100644 --- a/lily/include/context-mod.hh +++ b/lily/include/context-mod.hh @@ -37,7 +37,7 @@ struct Context_mod : public Simple_smob { SCM mark_smob () const; - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; static const char type_p_name_[]; private: SCM mods_; diff --git a/lily/include/context.hh b/lily/include/context.hh index 85e2d1f44c..28e80fd2db 100644 --- a/lily/include/context.hh +++ b/lily/include/context.hh @@ -32,7 +32,7 @@ class Context : public Smob { public: SCM mark_smob () const; - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; static const char type_p_name_[]; virtual ~Context (); private: diff --git a/lily/include/dispatcher.hh b/lily/include/dispatcher.hh index a7c96f9201..f0eb30ba6d 100644 --- a/lily/include/dispatcher.hh +++ b/lily/include/dispatcher.hh @@ -27,7 +27,7 @@ class Dispatcher : public Smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Dispatcher (); diff --git a/lily/include/duration.hh b/lily/include/duration.hh index b752e329b8..7a57cf53af 100644 --- a/lily/include/duration.hh +++ b/lily/include/duration.hh @@ -28,7 +28,7 @@ struct Duration : public Simple_smob { static SCM equal_p (SCM, SCM); - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; static const char type_p_name_[]; Duration (); Duration (int, int); diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh index f1917b0c4a..d74c8157ca 100644 --- a/lily/include/font-metric.hh +++ b/lily/include/font-metric.hh @@ -33,7 +33,7 @@ typedef std::map Index_to_charcode_map; class Font_metric : public Smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Font_metric (); diff --git a/lily/include/grob-array.hh b/lily/include/grob-array.hh index e3631c8ea9..e3963f019d 100644 --- a/lily/include/grob-array.hh +++ b/lily/include/grob-array.hh @@ -27,7 +27,7 @@ class Grob_array : public Simple_smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; private: @@ -41,7 +41,7 @@ public: void set_ordered (bool b) { ordered_ = b; } Item *item (vsize i); Spanner *spanner (vsize i); - Grob *grob (vsize i) { return grobs_.at (i); } + Grob *grob (vsize i) const { return grobs_.at (i); } vsize size () const { return grobs_.size (); } bool empty () const; void remove_duplicates (); diff --git a/lily/include/grob.hh b/lily/include/grob.hh index 5dea5a948c..819c86c287 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -30,7 +30,7 @@ class Grob : public Smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Grob (); diff --git a/lily/include/input.hh b/lily/include/input.hh index cde9b87893..7177baad0a 100644 --- a/lily/include/input.hh +++ b/lily/include/input.hh @@ -33,7 +33,7 @@ class Input : public Simple_smob Source_file *source_file_; public: static const char type_p_name_[]; - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; static SCM equal_p (SCM, SCM); SCM mark_smob () const; Source_file *get_source_file () const; diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh index 7a4bc15de5..0e001ec187 100644 --- a/lily/include/lily-lexer.hh +++ b/lily/include/lily-lexer.hh @@ -34,7 +34,7 @@ void set_lexer (); class Lily_lexer : public Smob, public Includable_lexer { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Lily_lexer (); diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh index cb36382b3b..b08df7c7a4 100644 --- a/lily/include/lily-parser.hh +++ b/lily/include/lily-parser.hh @@ -34,7 +34,7 @@ class Lily_parser : public Smob SCM do_yyparse (); static SCM do_yyparse_trampoline (void *parser); public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Lily_parser (); diff --git a/lily/include/moment.hh b/lily/include/moment.hh index 80a78fbf59..d84a992b40 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -31,7 +31,7 @@ class Moment : public Simple_smob { public: static SCM equal_p (SCM, SCM); - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; static const char type_p_name_[]; Moment (); Moment (int m); diff --git a/lily/include/music-function.hh b/lily/include/music-function.hh index b0ed99732a..f2c349a3e1 100644 --- a/lily/include/music-function.hh +++ b/lily/include/music-function.hh @@ -28,9 +28,9 @@ class Music_function : public Smob2 { public: static const char type_p_name_[]; - int print_smob (SCM, scm_print_state *); - SCM get_signature () { return scm1 (); } - SCM get_function () { return scm2 (); } + int print_smob (SCM, scm_print_state *) const; + SCM get_signature () const { return scm1 (); } + SCM get_function () const { return scm2 (); } SCM call (SCM args); LY_DECLARE_SMOB_PROC (&Music_function::call, 0, 0, 1); }; diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh index 30f27ba894..de53608ed5 100644 --- a/lily/include/music-iterator.hh +++ b/lily/include/music-iterator.hh @@ -61,7 +61,7 @@ class Music_iterator : public Smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Music_iterator (); diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh index 3d1d25728a..dc1111b78a 100644 --- a/lily/include/music-output.hh +++ b/lily/include/music-output.hh @@ -29,7 +29,7 @@ class Music_output : public Smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Music_output (); diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh index 5712639cb0..5de672e67a 100644 --- a/lily/include/output-def.hh +++ b/lily/include/output-def.hh @@ -49,7 +49,7 @@ class Output_def : public Smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Output_def (); diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh index 3e78b79952..daade82e81 100644 --- a/lily/include/pitch.hh +++ b/lily/include/pitch.hh @@ -36,7 +36,7 @@ class Pitch : public Simple_smob { public: static SCM equal_p (SCM, SCM); - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; private: diff --git a/lily/include/prob.hh b/lily/include/prob.hh index 1f437ac5ef..7a06e47737 100644 --- a/lily/include/prob.hh +++ b/lily/include/prob.hh @@ -34,7 +34,7 @@ class Prob : public Smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static SCM equal_p (SCM, SCM); static const char type_p_name_[]; diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh index 8a1922d3c3..f77ba50635 100644 --- a/lily/include/scm-hash.hh +++ b/lily/include/scm-hash.hh @@ -46,7 +46,7 @@ class Scheme_hash_table : public Smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; virtual ~Scheme_hash_table (); bool try_retrieve (SCM key, SCM *val); diff --git a/lily/include/simple-closure.hh b/lily/include/simple-closure.hh index 8903bba1fa..49e501c80a 100644 --- a/lily/include/simple-closure.hh +++ b/lily/include/simple-closure.hh @@ -27,7 +27,7 @@ class Simple_closure : public Smob1 { public: SCM expression() const { return scm1 (); } - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; static const char type_p_name_[]; }; diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh index c5edc4b01f..9ccaa61345 100644 --- a/lily/include/smobs.hh +++ b/lily/include/smobs.hh @@ -181,7 +181,7 @@ private: static SCM mark_trampoline (SCM); // Used for calling mark_smob static size_t free_smob (SCM obj); static SCM equal_p (SCM, SCM); - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; static int print_trampoline (SCM, SCM, scm_print_state *); static void smob_proc_init (scm_t_bits) { }; diff --git a/lily/include/smobs.tcc b/lily/include/smobs.tcc index c063da2f93..714289f47f 100644 --- a/lily/include/smobs.tcc +++ b/lily/include/smobs.tcc @@ -88,7 +88,7 @@ Smob_base::equal_p (SCM, SCM) template int -Smob_base::print_smob (SCM p, scm_print_state *) +Smob_base::print_smob (SCM p, scm_print_state *) const { scm_puts ("#<", p); scm_puts (smob_name_.c_str (), p); diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh index 8c67cd9be5..6686389289 100644 --- a/lily/include/source-file.hh +++ b/lily/include/source-file.hh @@ -38,7 +38,7 @@ using namespace std; class Source_file : public Smob { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Source_file (); diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index a7d3a4da1b..d90c2929de 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -51,7 +51,7 @@ class Translator_group : public Smob { public: SCM mark_smob () const; - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; static const char type_p_name_[]; virtual ~Translator_group (); private: diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 74f9ecb146..8154409efc 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -96,7 +96,7 @@ public: // as the timing of Engraver is exercised from within Translator typedef void (Translator::*Grob_info_callback) (Grob_info); typedef void (Translator::*Callback) (void); - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; virtual ~Translator (); diff --git a/lily/include/unpure-pure-container.hh b/lily/include/unpure-pure-container.hh index 5166f590a4..92974fe8f0 100644 --- a/lily/include/unpure-pure-container.hh +++ b/lily/include/unpure-pure-container.hh @@ -39,7 +39,7 @@ public: return Smob2::make_smob (a, a); return Smob2::make_smob (a, b); } - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; }; #endif /* UNPURE_PURE_CONTAINER_HH */ diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 830f946612..f9de264277 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -37,7 +37,7 @@ Input::mark_smob () const } int -Input::print_smob (SCM port, scm_print_state *) +Input::print_smob (SCM port, scm_print_state *) const { string str = "#"; scm_puts (str.c_str (), port); diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc index 6d4de7f7fe..467876f036 100644 --- a/lily/lily-lexer.cc +++ b/lily/lily-lexer.cc @@ -382,7 +382,7 @@ Lily_lexer::mark_smob () const } int -Lily_lexer::print_smob (SCM port, scm_print_state *) +Lily_lexer::print_smob (SCM port, scm_print_state *) const { scm_puts ("# { public: - int print_smob (SCM, scm_print_state *); + int print_smob (SCM, scm_print_state *) const; SCM mark_smob () const; static const char type_p_name_[]; private: @@ -43,7 +43,7 @@ Undead::mark_smob () const } int -Undead::print_smob (SCM port, scm_print_state *) +Undead::print_smob (SCM port, scm_print_state *) const { scm_puts ("#