Issue 5609: prefer the instance method Paper_column::get_rank

lily/system.cc

Index: lily/system.cc
diff --git a/lily/system.cc b/lily/system.cc
index 1fc226a78d2b188af4985296c7917d15c3e06ab1..93aa299f84c56832782db512e750d15c352fdee9 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -671,27 +671,24 @@ System::get_paper_system ()
 }
 
 vector<Item *>
-System::broken_col_range (Item const *left, Item const *right) const
+System::broken_col_range (Item const *left_item, Item const *right_item) const
 {
   vector<Item *> ret;
 
-  left = left->get_column ();
-  right = right->get_column ();
+  Paper_column *left_col = left_item->get_column ();
+  Paper_column *right_col = right_item->get_column ();
 
   extract_grob_set (this, "columns", cols);
 
-  vsize i = Paper_column::get_rank (left);
-  int end_rank = Paper_column::get_rank (right);
-  if (i < cols.size ())
-    i++;
-
-  while (i < cols.size ()
-         && Paper_column::get_rank (cols[i]) < end_rank)
+  vsize end_rank = std::min(static_cast<vsize> (right_col->get_rank ()),
+                            cols.size ());
+  for (vsize i = left_col->get_rank () + 1; i < end_rank; ++i)
     {
-      Paper_column *c = dynamic_cast<Paper_column *> (cols[i]);
-      if (Paper_column::is_breakable (c) && !c->get_system ())
-        ret.push_back (c);
-      i++;
+      if (Paper_column *c = dynamic_cast<Paper_column *> (cols[i]))
+        {
+          if (Paper_column::is_breakable (c) && !c->get_system ())
+            ret.push_back (c);
+        }
     }
 
   return ret;