From: David Kastrup <dak@gnu.org>
Date: Tue, 7 Jun 2016 14:14:43 +0000 (+0200)
Subject: Consistently use semicolons after some macro calls
X-Git-Tag: release/2.19.43-1~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ada469521f669f570b50b73a0037402a71cae1e9;p=lilypond.git

Consistently use semicolons after some macro calls

That's nicer for reading and code indentation.
---

diff --git a/lily/include/coherent-ligature-engraver.hh b/lily/include/coherent-ligature-engraver.hh
index b7f77f8402..78bfef8897 100644
--- a/lily/include/coherent-ligature-engraver.hh
+++ b/lily/include/coherent-ligature-engraver.hh
@@ -26,7 +26,7 @@ class Coherent_ligature_engraver : public Ligature_engraver
 public:
   // no TRANSLATOR_DECLARATIONS (Coherent_ligature_engraver) needed
   // since this class is abstract
-  TRANSLATOR_INHERIT (Ligature_engraver)
+  TRANSLATOR_INHERIT (Ligature_engraver);
   DECLARE_TRANSLATOR_CALLBACKS (Coherent_ligature_engraver);
 
 protected:
diff --git a/lily/include/gregorian-ligature-engraver.hh b/lily/include/gregorian-ligature-engraver.hh
index 3fea29c26c..d7011bda99 100644
--- a/lily/include/gregorian-ligature-engraver.hh
+++ b/lily/include/gregorian-ligature-engraver.hh
@@ -30,7 +30,7 @@ public:
   // no TRANSLATOR_DECLARATIONS (Gregorian_ligature_engraver) needed
   // since this class is abstract
 
-  TRANSLATOR_INHERIT(Coherent_ligature_engraver)
+  TRANSLATOR_INHERIT(Coherent_ligature_engraver);
   DECLARE_TRANSLATOR_CALLBACKS (Gregorian_ligature_engraver);
 protected:
   Gregorian_ligature_engraver ();
diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 96309693aa..fd93a3e42f 100644
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -34,11 +34,11 @@
   VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME);                          \
   virtual void fetch_precomputable_methods (SCM methods[]);             \
   DECLARE_TRANSLATOR_CALLBACKS (NAME);                                  \
-  TRANSLATOR_INHERIT (Translator)                                       \
+  TRANSLATOR_INHERIT (Translator);                                      \
   /* end #define */
 
 #define TRANSLATOR_INHERIT(BASE)                                        \
-  using BASE::method_finder;
+  using BASE::method_finder
 
 #define DECLARE_TRANSLATOR_CALLBACKS(NAME)                              \
   template <void (NAME::*mf)()>                                         \
diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index d43543cd8b..b649a1a197 100644
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -49,8 +49,7 @@
   /* end define */
 
 #define DEFINE_TRANSLATOR_LISTENER_LIST(T) \
-  Protected_scm T::listener_list_ (SCM_EOL);    \
-  /* end define */
+  Protected_scm T::listener_list_ (SCM_EOL)
 
 #define DEFINE_ACKNOWLEDGERS(classname) \
   Drul_array<Protected_scm> classname::acknowledge_static_array_drul_;  \
@@ -73,8 +72,8 @@
   IMPLEMENT_FETCH_PRECOMPUTABLE_METHODS (classname);                    \
   DEFINE_ACKNOWLEDGERS(classname);                                      \
   ADD_THIS_TRANSLATOR (classname);                                      \
-  DEFINE_TRANSLATOR_DOC(classname, desc, grobs, read, write)            \
-  DEFINE_TRANSLATOR_LISTENER_LIST(classname)                            \
+  DEFINE_TRANSLATOR_DOC(classname, desc, grobs, read, write);           \
+  DEFINE_TRANSLATOR_LISTENER_LIST(classname);
 
 #define IMPLEMENT_FETCH_PRECOMPUTABLE_METHODS(T)                        \
   void                                                                  \
@@ -100,12 +99,12 @@ void add_acknowledger (SCM ptr,
 #define ADD_ACKNOWLEDGER(CLASS, NAME)                                   \
   add_acknowledger (Callback2_wrapper::make_smob                        \
                     <ack_trampoline<CLASS, &CLASS::acknowledge_ ## NAME> > (), \
-                    #NAME, acknowledge_static_array_drul_[START]);
+                    #NAME, acknowledge_static_array_drul_[START])
 
 #define ADD_END_ACKNOWLEDGER(CLASS, NAME)                               \
   add_acknowledger (Callback2_wrapper::make_smob                        \
                     <ack_trampoline<CLASS, &CLASS::acknowledge_end_ ## NAME> > (), \
-                    #NAME, acknowledge_static_array_drul_[STOP]);
+                    #NAME, acknowledge_static_array_drul_[STOP])
 
 /*
   Implement the method cl::listen_##m, and make it listen to stream
@@ -115,6 +114,6 @@ void add_acknowledger (SCM ptr,
   listener_list_ = scm_acons                                            \
     (event_class_symbol (#m),                                           \
      Callback_wrapper::make_smob                                        \
-     <trampoline <cl, &cl::listen_ ## m> > (), listener_list_);
+     <trampoline <cl, &cl::listen_ ## m> > (), listener_list_)
 
 #endif /* TRANSLATOR_ICC */
diff --git a/lily/kievan-ligature-engraver.cc b/lily/kievan-ligature-engraver.cc
index fd96d0f99a..cdb51de3ad 100644
--- a/lily/kievan-ligature-engraver.cc
+++ b/lily/kievan-ligature-engraver.cc
@@ -39,7 +39,7 @@ protected:
 
 public:
   TRANSLATOR_DECLARATIONS (Kievan_ligature_engraver);
-  TRANSLATOR_INHERIT (Coherent_ligature_engraver)
+  TRANSLATOR_INHERIT (Coherent_ligature_engraver);
 
 private:
   void fold_up_primitives (vector<Grob_info> const &primitives, Real padding, Real &min_length);
diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 2753707f29..ee7a96a2d7 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -74,7 +74,7 @@ Phrasing_slur_engraver::boot ()
   ADD_LISTENER (Phrasing_slur_engraver, phrasing_slur);
   ADD_LISTENER (Slur_proto_engraver, note);
   ADD_ACKNOWLEDGER (Slur_proto_engraver, inline_accidental);
-  ADD_ACKNOWLEDGER (Slur_proto_engraver, fingering)
+  ADD_ACKNOWLEDGER (Slur_proto_engraver, fingering);
   ADD_ACKNOWLEDGER (Slur_proto_engraver, note_column);
   ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
   ADD_ACKNOWLEDGER (Slur_proto_engraver, script);
diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 0cf4d6f2a6..ddd1386872 100644
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -77,7 +77,7 @@ private:
 
 public:
   TRANSLATOR_DECLARATIONS (Vaticana_ligature_engraver);
-  TRANSLATOR_INHERIT (Gregorian_ligature_engraver)
+  TRANSLATOR_INHERIT (Gregorian_ligature_engraver);
 protected:
   virtual Spanner *create_ligature_spanner ();
   virtual void transform_heads (Spanner *ligature,