2003 -> 2004

[lilypond.git] / lily / lilypond-version.cc

diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc
index e252710185780974efb8ff5674519082041053ce..f46289e2f118b27ceb1baee4a7490bee241d35af 100644 (file)
--- a/lily/lilypond-version.cc
+++ b/lily/lilypond-version.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 
@@ -13,30 +13,35 @@
 
 Lilypond_version::Lilypond_version (int major, int minor, int patch)
 {
-  major_i_ = major;
-  minor_i_ = minor;
-  patch_i_ = patch;
+  major_ = major;
+  minor_ = minor;
+  patch_ = patch;
 }
 
 Lilypond_version::Lilypond_version (String str)
 {
   Array<String> version;
-  version = String_convert::split_arr (str, '.');
-  assert (version.size () == 3);
-  major_i_ = version[0].value_i ();
-  minor_i_ = version[1].value_i ();
-  patch_i_ = version[2].value_i ();
+  version = String_convert::split (str, '.');
+  
+  major_ = version[0].to_int ();
+  minor_ = version[1].to_int ();
+  patch_ = 0;
+  if (version.size () >= 3)
+    patch_ = version[2].to_int ();
+
+  if (version.size () >= 4)
+    extra_patch_string_ = version[3];
 }
 
 String
-Lilypond_version::str () const
+Lilypond_version::to_string () const
 {
-  return to_str (major_i_) + "." + to_str (minor_i_) + "." + to_str (patch_i_);
+  return ::to_string (major_) + "." + ::to_string (minor_) + "." + ::to_string (patch_);
 }
 
 Lilypond_version::operator int () const
 {
     // ugh
-  return 100000 * major_i_ + 1000 * minor_i_ + patch_i_;
+  return 100000 * major_ + 1000 * minor_ + patch_;
 }