release: 1.0.1

[lilypond.git] / flower / include / string-data.icc

diff --git a/flower/include/string-data.icc b/flower/include/string-data.icc
index 2a285db24f8fff7e762441836eb5a7cf066e8a57..0626601a35ba37832e48ddd130e7b9df17045aeb 100644 (file)
--- a/flower/include/string-data.icc
+++ b/flower/include/string-data.icc
@@ -3,7 +3,7 @@
 
   source file of Flower lib
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef STRINGDATA_INL
@@ -20,55 +20,56 @@ const int INITIALMAX=8;
 INLINE void 
 String_data::OKW() 
 {
-    assert (references == 1);
+  assert (references == 1);
 }
 
 INLINE void 
 String_data::OK() 
 {
-    assert (maxlen >= length_i_);
-    assert (bool (data_byte_p_));
-    assert (references >= 1);
+  assert (maxlen >= length_i_);
+  assert (bool (data_byte_p_));
+  assert (references >= 1);
 }
 
 
 INLINE
 String_data::String_data() 
 {
-    references=0;
-    maxlen = INITIALMAX;
-    data_byte_p_ = new Byte[maxlen + 1];
-    data_byte_p_[0] = 0;
-    length_i_ = 0;
+  references=0;
+  maxlen = INITIALMAX;
+  data_byte_p_ = new Byte[maxlen + 1];
+  data_byte_p_[0] = 0;
+  length_i_ = 0;
 }
 
 INLINE
 String_data::String_data (String_data const &src) 
 {
-    references=0;      
-    maxlen = length_i_ = src.length_i_;                
-    data_byte_p_ = new Byte[maxlen+1]; // should calc GNU 8byte overhead.      
-    memcpy (data_byte_p_, src.data_byte_p_, length_i_ + 1);    
+  references=0;        
+  maxlen = length_i_ = src.length_i_;          
+  data_byte_p_ = new Byte[maxlen+1]; // should calc GNU 8byte overhead.        
+  memcpy (data_byte_p_, src.data_byte_p_, length_i_ + 1);      
 }
 
 INLINE
 String_data::~String_data() 
 {
-    assert (references == 0);
-    delete[] data_byte_p_;
+  assert (references == 0);
+  delete[] data_byte_p_;
 }
 
 INLINE void 
 String_data::setmax (int j) 
 {      
-    OKW();
-    if (j > maxlen) {
-       delete data_byte_p_;
-       maxlen = j;
-       data_byte_p_ = new Byte[maxlen + 1];
-    
-       data_byte_p_[0] = 0;
-       length_i_ = 0;
+  OKW();
+  if (j > maxlen) 
+    {
+      delete data_byte_p_;
+      maxlen = j;
+      data_byte_p_ = new Byte[maxlen + 1];
+  
+      data_byte_p_[0] = 0;
+      length_i_ = 0;
     }
 }
 
@@ -84,44 +85,45 @@ String_data::setmax (int j)
 INLINE void 
 String_data::remax (int j) 
 {
-    OKW();
-    if (j > maxlen) {
-       Byte *p = new Byte[j + 1];      
-       memcpy (p, data_byte_p_, ( maxlen <? length_i_) + 1 );      
-       maxlen = j;
-       delete[] data_byte_p_;
-       data_byte_p_ = p;
+  OKW();
+  if (j > maxlen) 
+    {
+      Byte *p = new Byte[j + 1];       
+      memcpy (p, data_byte_p_, (maxlen <? length_i_) + 1 );        
+      maxlen = j;
+      delete[] data_byte_p_;
+      data_byte_p_ = p;
     }
 }
 
 INLINE void 
 String_data::tighten() 
 { // should be dec'd const
-    maxlen = length_i_;
-    Byte *p = new Byte[maxlen + 1];        
-    memcpy (p, data_byte_p_, length_i_ + 1);       
-    delete[] data_byte_p_;
-    data_byte_p_ = p;          
+  maxlen = length_i_;
+  Byte *p = new Byte[maxlen + 1];          
+  memcpy (p, data_byte_p_, length_i_ + 1);         
+  delete[] data_byte_p_;
+  data_byte_p_ = p;            
 }
 // assignment.
 INLINE void 
 String_data::set (Byte const* byte_C, int length_i) 
 {
-    OKW();
+  OKW();
 
-    assert (byte_C && byte_C != data_byte_p_);
+  assert (byte_C && byte_C != data_byte_p_);
 
-    length_i_ = length_i;
-    remax (length_i_);     // copies too
-    memcpy (data_byte_p_, byte_C, length_i_);
-    data_byte_p_[ length_i_ ] = 0;
+  length_i_ = length_i;
+  remax (length_i_);     // copies too
+  memcpy (data_byte_p_, byte_C, length_i_);
+  data_byte_p_[ length_i_ ] = 0;
 }
 
 INLINE
 void 
 String_data::set (char const* ch_C) 
 {
-    set ((Byte const*)ch_C, strlen (ch_C) );
+  set ((Byte const*)ch_C, strlen (ch_C) );
 }
 
 
@@ -129,21 +131,21 @@ String_data::set (char const* ch_C)
 INLINE void 
 String_data::append (Byte const* byte_C, int length_i) 
 {
-    OK();
-    OKW();
-    int old_i = length_i_;
-    
-    length_i_ += length_i;
-    remax (length_i_);
-    memcpy (data_byte_p_ + old_i, byte_C, length_i);   
-    data_byte_p_[ length_i_ ] = 0;
+  OK();
+  OKW();
+  int old_i = length_i_;
+  
+  length_i_ += length_i;
+  remax (length_i_);
+  memcpy (data_byte_p_ + old_i, byte_C, length_i);     
+  data_byte_p_[ length_i_ ] = 0;
 }
 
 INLINE
 void 
-String_data::operator += ( char const* ch_C) 
+String_data::operator += (char const* ch_C) 
 {
-    append ((Byte const*)ch_C, strlen (ch_C) );
+  append ((Byte const*)ch_C, strlen (ch_C) );
 }
 
 
@@ -152,56 +154,56 @@ INLINE
 char const*
 String_data::ch_C() const
 {
-    return (char const*)data_byte_p_; 
+  return (char const*)data_byte_p_; 
 }
 INLINE char* 
 String_data::ch_l() 
 { 
-    return (char*)data_byte_p_; 
+  return (char*)data_byte_p_; 
 }
 
 INLINE Byte const*
 String_data::byte_C() const 
 { 
-    return data_byte_p_; 
+  return data_byte_p_; 
 }
 
 INLINE Byte* 
 String_data::byte_l() 
 {
-    OKW();
-    return data_byte_p_;
+  OKW();
+  return data_byte_p_;
 }
 
 INLINE
 void 
 String_data::trunc (int j) 
 {
-    OKW(); 
-    assert (j >= 0 && j <= length_i_);
-    data_byte_p_[j] = 0;
-    length_i_ = j;
+  OKW(); 
+  assert (j >= 0 && j <= length_i_);
+  data_byte_p_[j] = 0;
+  length_i_ = j;
 }
 
 INLINE bool
-String_data::is_binary_bo()const
+String_data::is_binary_bo() const
 {
-//    return !memchr (data_byte_p_, length_i_, 0);
-    return ( (int)strlen ((char const*)data_byte_p_) != length_i_ );
+  //    return !memchr (data_byte_p_, length_i_, 0);
+  return ((int)strlen ((char const*)data_byte_p_) != length_i_ );
 }
 
 INLINE Byte&
 String_data::operator [](int j) 
 {
-    assert (j >= 0 && j <= length_i_);
-    return data_byte_p_[j] ; 
+  assert (j >= 0 && j <= length_i_);
+  return data_byte_p_[j] ; 
 }
 
 INLINE Byte 
 String_data::operator [](int j) const 
 {
-    assert (j >= 0 && j <= length_i_);
-    return data_byte_p_[j]; 
+  assert (j >= 0 && j <= length_i_);
+  return data_byte_p_[j]; 
 }