[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Issue 4545: Use Grob::programming_error in Semi_tie:: and Tie::less (iss
From: |
nine . fierce . ballads |
Subject: |
Issue 4545: Use Grob::programming_error in Semi_tie:: and Tie::less (issue 259210043 by address@hidden) |
Date: |
Sat, 08 Aug 2015 16:28:54 +0000 |
Reviewers: ,
Please review this at https://codereview.appspot.com/259210043/
Affected files (+24, -10 lines):
M lily/semi-tie.cc
M lily/tie.cc
Index: lily/semi-tie.cc
diff --git a/lily/semi-tie.cc b/lily/semi-tie.cc
index
049cd029d6c40d56eb9348e81b0639bf9f70cf12..0523e1edef980b7611328edd4f7436698a84f9cf
100644
--- a/lily/semi-tie.cc
+++ b/lily/semi-tie.cc
@@ -89,13 +89,20 @@ bool
Semi_tie::less (Grob *g1, Grob *g2)
{
Item *i1 = dynamic_cast<Item *> (g1);
+ if (!i1)
+ {
+ g1->programming_error ("grob is not a semi-tie");
+ return false;
+ }
+
Item *i2 = dynamic_cast<Item *> (g2);
- if (i1 && i2) {
- return get_position (i1) < get_position (i2);
- }
+ if (!i2)
+ {
+ g2->programming_error ("grob is not a semi-tie");
+ return false;
+ }
- programming_error ("grob is not a semi-tie");
- return false;
+ return get_position (i1) < get_position (i2);
}
Item *
Index: lily/tie.cc
diff --git a/lily/tie.cc b/lily/tie.cc
index
ae81317e392665ac08cca89a1926e7853c342f04..a78bc9bbd5390c70d96fcdc3c9f4109a10a0feb4
100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -45,13 +45,20 @@ bool
Tie::less (Grob *g1, Grob *g2)
{
Spanner *s1 = dynamic_cast<Spanner *> (g1);
+ if (!s1)
+ {
+ g1->programming_error ("grob is not a tie");
+ return false;
+ }
+
Spanner *s2 = dynamic_cast<Spanner *> (g2);
- if (s1 && s2) {
- return get_position (s1) < get_position (s2);
- }
+ if (!s2)
+ {
+ g2->programming_error ("grob is not a tie");
+ return false;
+ }
- programming_error ("grob is not a tie");
- return false;
+ return get_position (s1) < get_position (s2);
}
void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Issue 4545: Use Grob::programming_error in Semi_tie:: and Tie::less (issue 259210043 by address@hidden),
nine . fierce . ballads <=