Merge branch 'lilypond/translation'

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

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 18da3c792ead4040baed66043458b73f1962f0da..969d0121470db512f58f342046fd5293c735ad29 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,13 +3,14 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
-#include "string.hh"
+#include "std-string.hh"
+#include <limits.h>
 
 /**
    Rational numbers.  Included is support for + and - infinity.
@@ -26,7 +27,7 @@ class Rational
   */
   int sign_;
   unsigned int num_, den_;
-  void normalise ();
+  void normalize ();
   void copy (Rational const &);
 
 public:
@@ -41,18 +42,21 @@ public:
   Rational trunc_rat () const;
   Rational div_rat (Rational) const;
   Rational mod_rat (Rational) const;
+  Rational abs () const;
   void negate ();
-  //   operator bool () const;
   int to_int () const;
-  operator double () const;
+
+  operator double () const { return to_double (); }
+  double to_double () const;
+
   Rational operator - () const;
   /**
      Initialize to 0.
   */
   Rational ();
   Rational (int);
-  Rational (int, int);
-  Rational (double);
+  explicit Rational (int, int);
+  explicit Rational (double);
   Rational (Rational const &r) { copy (r);}
   Rational &operator = (Rational const &r)
   {
@@ -66,9 +70,11 @@ public:
   Rational &operator %= (Rational);
   static int compare (Rational const &, Rational const &);
   int sign () const;
-  String to_string () const;
+  string to_string () const;
 };
 
+#include "arithmetic-operator.hh"
+
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, /);
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, +);
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, *);
@@ -93,6 +99,6 @@ ostream &
 operator << (ostream &, Rational);
 #endif
 
-const Rational infinity_rat = INT_MAX;
+const Rational infinity_rat (INT_MAX);
 
 #endif // RATIONAL_HH