Reviewers: ,
Message:
lilydev 2.0 currently contains astyle 2.02.1 Unfortunately, 2.02.1
produces slightly different formatting than 2.02.
I would be fine with the 2.02.1 output, but I'm not certain it will meet
with approval. Anybody object to this, and/or patch fixcc.py to produce
the old output?
Description:
Now use astyle 2.02.1
Run astyle
(two separate commits, merged together in rietveld)
Please review this at http://codereview.appspot.com/5478072/
Affected files:
M Documentation/contributor/introduction.itexi
M flower/include/yaffut.hh
M lily/include/beam-scoring-problem.hh
M lily/include/skyline.hh
M lily/include/slur.hh
M lily/note-collision.cc
M lily/page-breaking.cc
M lily/staff-performer.cc
M scripts/auxiliar/fixcc.py
Index: Documentation/contributor/introduction.itexi
diff --git a/Documentation/contributor/introduction.itexi
b/Documentation/contributor/introduction.itexi
index
914e7ef72b09ab8884a70284fdf6d1ad044031f3..750ed524caae337cb63af02867c95111a31ce022
100644
--- a/Documentation/contributor/introduction.itexi
+++ b/Documentation/contributor/introduction.itexi
@@ -194,8 +194,8 @@ we have found.}
@item @strong{code style}:
C++ code should be formatted with
@file{scripts/auxiliar/fixcc.py}, which requires
-@url{http://astyle.sourceforge.net/, astyle 2.02}. However, we
-are not very strict about this requirement.
+@url{http://astyle.sourceforge.net/, astyle 2.02.1}. However, we
+are not very strict about C++ formatting.
At the moment, scheme code should be formatted @qq{like emacs does
it}. We are working on an automated tool to simplify this step.
Index: flower/include/yaffut.hh
diff --git a/flower/include/yaffut.hh b/flower/include/yaffut.hh
index
0da01807d48a263cba2cb3736f51d14f21ba0873..37aee533f45d924855ec98b85d935b43693b7e0e
100644
--- a/flower/include/yaffut.hh
+++ b/flower/include/yaffut.hh
@@ -277,7 +277,7 @@ struct Test: public ITest, public virtual Suite
static Registrator<Suite, Case> s_Registrator;
Test (): Suite ()
{
- Registrator<Suite, Case>* r = &s_Registrator;
+ Registrator<Suite, Case> *r = &s_Registrator;
(void)r;
}
template <typename E, typename T>
@@ -301,7 +301,7 @@ struct Test<Case, void>: public ITest
static Registrator<Case, void> s_Registrator;
Test ()
{
- Registrator<Case, void>* r = &s_Registrator;
+ Registrator<Case, void> *r = &s_Registrator;
(void)r;
}
template <typename E, typename T>
Index: lily/include/beam-scoring-problem.hh
diff --git a/lily/include/beam-scoring-problem.hh
b/lily/include/beam-scoring-problem.hh
index
0dc3adc511d97604d6667f6478296d5fbc428234..a04fc4632496bce9374c8019876357253f6b2626
100644
--- a/lily/include/beam-scoring-problem.hh
+++ b/lily/include/beam-scoring-problem.hh
@@ -190,7 +190,7 @@ private:
void score_slope_direction (Beam_configuration *config) const;
void score_slope_musical (Beam_configuration *config) const;
void score_stem_lengths (Beam_configuration *config) const;
- void generate_quants (vector<Beam_configuration *>* scores) const;
+ void generate_quants (vector<Beam_configuration *> *scores) const;
void score_collisions (Beam_configuration *config) const;
};
Index: lily/include/skyline.hh
diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index
638fd6d3f3b4c688634491a7d9ceee60e8c4b0a6..83ecd78aa076bbf454cfae1b3b0af3bcc073add4
100644
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -54,9 +54,9 @@ private:
list<Building> buildings_;
Direction sky_;
- void internal_merge_skyline (list<Building>*, list<Building>*,
+ void internal_merge_skyline (list<Building> *, list<Building> *,
list<Building> *const result);
- list<Building> internal_build_skyline (list<Box>*, Real, Axis,
Direction);
+ list<Building> internal_build_skyline (list<Box> *, Real, Axis,
Direction);
DECLARE_SIMPLE_SMOBS (Skyline);
Index: lily/include/slur.hh
diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index
78659c93171a84162cebc92e9ad0231b244f4891..f36d968a5d10c1ef24797cae9d40a125167d0726
100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -30,7 +30,7 @@ public:
static void add_column (Grob *me, Grob *col);
static void add_extra_encompass (Grob *me, Grob *col);
static void replace_breakable_encompass_objects (Grob *me);
- static void auxiliary_acknowledge_extra_object (Grob_info const &,
vector<Grob *>&, vector<Grob *>&);
+ static void auxiliary_acknowledge_extra_object (Grob_info const &,
vector<Grob *> &, vector<Grob *> &);
DECLARE_SCHEME_CALLBACK (print, (SCM));
DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
Index: lily/note-collision.cc
diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index
a9b8cbe4410a466efad38433aeafa3c2c107098c..c66e8a5207a8e96e0e5636112c50374f2967d69d
100644
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -294,7 +294,7 @@ check_meshing_chords (Grob *me,
/*
*/
if (full_collide
- && down_ball_type *up_ball_type == 0)
+ && down_ball_type * up_ball_type == 0)
{
if (up_ball_type == 0 && down_ball_type == 1)
shift_amount *= 1.25;
Index: lily/page-breaking.cc
diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index
01d7469f52ed80ff45a1f9e5c102e1b262076ca3..36fa2dce8e1f02b38c5cf7af90d3243d9464cb3e
100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -504,7 +504,7 @@ Page_breaking::page_height (int page_num, bool last)
const
// This means that we won't cache properly if page_num is negative or
// if calc_height returns a negative number. But that's likely to
// be rare, so it shouldn't affect performance.
- vector<Real>& cache = last ? last_page_height_cache_ :
page_height_cache_;
+ vector<Real> &cache = last ? last_page_height_cache_ :
page_height_cache_;
if (page_num >= 0 && (int) cache.size () > page_num && cache[page_num]
= 0)
return cache[page_num];
else
Index: lily/staff-performer.cc
diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index
6d0595f54b43f959caa1b90688aaf2df8293a90b..16f1c04817feaa2cbb2eea006780be997f752f3e
100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -227,7 +227,7 @@ int
Staff_performer::get_channel (string instrument)
{
SCM channel_mapping = get_property ("midiChannelMapping");
- map<string, int>& channel_map
+ map<string, int> &channel_map
= (channel_mapping != ly_symbol2scm ("instrument"))
? channel_map_
: static_channel_map_;
Index: scripts/auxiliar/fixcc.py
diff --git a/scripts/auxiliar/fixcc.py b/scripts/auxiliar/fixcc.py
index
3fb76d44581700753bdb86bc6165f3df596f0c29..d04d1bd43236c93699c34b3649cc870d6e967fc9
100755
--- a/scripts/auxiliar/fixcc.py
+++ b/scripts/auxiliar/fixcc.py
@@ -39,7 +39,7 @@ GLOBAL_CXX = 'GC++'
CXX = 'C++'
verbose_p = 0
indent_p = 1
-REQUIRED_ASTYLE_VERSION = "Artistic Style Version 2.02"
+REQUIRED_ASTYLE_VERSION = "Artistic Style Version 2.02.1"
rules = {
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
