release: 1.0.1

[lilypond.git] / flower / text-db.cc

diff --git a/flower/text-db.cc b/flower/text-db.cc
index fef860eb31cb77de92c87d64b973130d60d0fab9..e59748f665629698ff945a7ee210ed980650e5d2 100644 (file)
--- a/flower/text-db.cc
+++ b/flower/text-db.cc
@@ -1,9 +1,9 @@
 #include "text-db.hh"
 bool
-Text_db::eof()
+Text_db::eof_b ()
 {
   Data_file::gobble_leading_white();
-  return  Data_file::eof();
+  return  Data_file::eof_b();
 }
 
 void
@@ -11,41 +11,41 @@ Text_db::gobble_leading_white()
 {
   while (1) 
     {
-       Data_file::gobble_leading_white();
-       if (eof())
-           return ;
-       char c;
-       if  ((c = data_get()) !='\n')
-         {
-           data_unget (c);
-           return ;
+      Data_file::gobble_leading_white();
+      if (eof_b ())
+       return ;
+      char c;
+      if  ((c = data_get()) !='\n')
+       {
+         data_unget (c);
+         return ;
        }       
-  }    
+    }  
 }
 
 
 Text_record
 Text_db::get_record() 
 {
-   while (1) 
-   {
-       String s;
-       Array<String> fields;
-       assert (!eof());
+  while (1) 
+    {
+      String s;
+      Array<String> fields;
+      assert (!eof_b ());
        
-       while ((s = get_word()) != "")
-           {
-           fields.push (s);    
-           gobble_white();
-             }
+      while ((s = get_word()) != "")
+       {
+         fields.push (s);      
+         gobble_white();
+       }
             
 
-       if (get_line() != "")
-           assert (false);
+      if (get_line() != "")
+       assert (false);
     
-       assert (fields.size());
-       return Text_record (fields, get_name(), line ());
-   }
+      assert (fields.size());
+      return Text_record (fields, get_name(), line ());
+    }
 }