Issue 4545: Use Grob::programming_error in Semi_tie:: and Tie::less

diff --git a/lily/semi-tie.cc b/lily/semi-tie.cc
index 0669c277f7ecad65b16fed5c60796626b6a9485d..0d31a2e07388b82e1ad0627b57f10d124e8bd5d9 100644 (file)
--- 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 true;
+    }
 
-  programming_error ("grob is not a semi-tie");
-  return false;
+  return get_position (i1) < get_position (i2);
 }
 
 Item *

diff --git a/lily/tie.cc b/lily/tie.cc
index 849e859eb59e1d38689b6e42daa621f75288451a..dcc53ad44e61c7af5ee5522ce3d8b18a19b56eb4 100644 (file)
--- 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 true;
+    }
 
-  programming_error ("grob is not a tie");
-  return false;
+  return get_position (s1) < get_position (s2);
 }
 
 void