2003 -> 2004

[lilypond.git] / flower / include / cons.hh

diff --git a/flower/include/cons.hh b/flower/include/cons.hh
index a2ebc352d7b423db6ae89fb476b614639036d0f0..dec3e29d64d179d57c8538e81668f7b5af9ead28 100644 (file)
--- a/flower/include/cons.hh
+++ b/flower/include/cons.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -40,7 +40,7 @@ class Killing_cons : public Cons<T>
 {
 public:
   Killing_cons (T *t, Cons<T> *p)
-    : Cons<T>( t,p)
+    : Cons<T> ( t,p)
     {
     }
   virtual ~Killing_cons ();
@@ -57,10 +57,10 @@ Cons<T> *remove_cons (Cons<T> **pp)
   return knip;
 }
 
-template<class T> int cons_list_size_i (Cons<T> *l)
+template<class T> int cons_list_size (Cons<T> *l)
 {
   int i=0;
-  while  (l)
+  while (l)
     {
       l = l->next_;
        i++;
@@ -86,7 +86,7 @@ Cons<T> * last_cons (Cons<T> * head)
 
    Invariants:
 
-   (*tail_) is either the head_ pointer, or a next_ pointer from the list.
+ (*tail_) is either the head_ pointer, or a next_ pointer from the list.
    
    **tail_ == NULL
  */
@@ -115,7 +115,7 @@ public:
       assert (!c->next_);
       *nil_pointer_address_ = c;
       while (*nil_pointer_address_)
-       nil_pointer_address_ = &(*nil_pointer_address_)->next_;
+       nil_pointer_address_ = & (*nil_pointer_address_)->next_;
     }
   /**
      PRE: *pp should either be the head_ pointer, or the next_ pointer
@@ -123,7 +123,7 @@ public:
   */
   Cons<T> *remove_cons (Cons<T> **pp)
     {
-      if (&(*pp)->next_ == nil_pointer_address_)
+      if (& (*pp)->next_ == nil_pointer_address_)
        nil_pointer_address_ = pp;
 
       return ::remove_cons (pp);
@@ -133,7 +133,7 @@ public:
   void truncate (int i)
     {
       Cons<T> **p  = &head_;
-      for (; *p && i;  p = &((*p)->next_))
+      for (; *p && i;  p = & ((*p)->next_))
        {
          i--;
        }
@@ -155,9 +155,9 @@ public:
     {
       junk ();
     }
-  int size_i ()
+  int size ()
     {
-      return cons_list_size_i (head_);
+      return cons_list_size (head_);
     }
 };