X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Frational.hh;h=0129cea773dd22da6a64fdfc357549d44cf5f46e;hb=412c64d1afc9576b83783b995062083971475db3;hp=8ac80fb1246a0b507f6d842a1d3d230e2f8b24fc;hpb=91e7cbaa6e54e004365d28e0f10c9362a7f13320;p=lilypond.git

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 8ac80fb124..0129cea773 100644
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,19 +3,21 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
-#include "string.hh"
+#include "flower-proto.hh"
+#include "std-string.hh"
+#include <limits.h>
 
 /**
    Rational numbers.  Included is support for + and - infinity.
- */
-class Rational {
+*/
+class Rational
+{
   /**
      Sign of rational.
      -2, .. 2
@@ -23,64 +25,72 @@ class Rational {
      -2,2 is - and + infinity.
      -1,1 is negative and positive.
      0 if *this is zero.
-   */
+  */
   int sign_;
-  unsigned int num_, den_;
-  void normalise ();
+  U64 num_, den_;
+  void normalize ();
   void copy (Rational const &);
 
 public:
   void set_infinite (int sign);
   bool is_infinity () const;
   void invert ();
-  int numerator () const { return sign_ * num_; }
-  int denominator () const { return den_; }
-  int num () const { return numerator(); }
-  int den () const { return denominator(); }
+  I64 numerator () const { return sign_ * num_; }
+  I64 denominator () const { return den_; }
+  I64 num () const { return numerator (); }
+  I64 den () const { return denominator (); }
 
   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. 
-   */
+     Initialize to 0.
+  */
   Rational ();
   Rational (int);
-  Rational (int, int);
-  Rational (double);
-  Rational (Rational const&r) {   copy (r);}
-  Rational &operator = (Rational const &r) {
+  Rational (I64);
+  Rational (U64);
+  explicit Rational (I64, I64);
+  explicit Rational (double);
+  Rational (Rational const &r) { copy (r);}
+  Rational &operator = (Rational const &r)
+  {
     copy (r); return *this;
   }
 
   Rational &operator *= (Rational);
-  Rational &operator /= (Rational);  
+  Rational &operator /= (Rational);
   Rational &operator += (Rational);
   Rational &operator -= (Rational);
   Rational &operator %= (Rational);
-  static int compare (Rational const&, Rational const&);
+  static int compare (Rational const &, Rational const &);
   int sign () const;
-  String to_string () const;
+  string to_string () const;
 };
 
-IMPLEMENT_ARITHMETIC_OPERATOR (Rational, / );
-IMPLEMENT_ARITHMETIC_OPERATOR (Rational, + );
-IMPLEMENT_ARITHMETIC_OPERATOR (Rational, * );
-IMPLEMENT_ARITHMETIC_OPERATOR (Rational, - );
-IMPLEMENT_ARITHMETIC_OPERATOR (Rational, % );
+#include "arithmetic-operator.hh"
+
+IMPLEMENT_ARITHMETIC_OPERATOR (Rational, /);
+IMPLEMENT_ARITHMETIC_OPERATOR (Rational, +);
+IMPLEMENT_ARITHMETIC_OPERATOR (Rational, *);
+IMPLEMENT_ARITHMETIC_OPERATOR (Rational, -);
+IMPLEMENT_ARITHMETIC_OPERATOR (Rational, %);
 
-INSTANTIATE_COMPARE (Rational const&, Rational::compare);
+INSTANTIATE_COMPARE (Rational const &, Rational::compare);
 
-int compare (Rational const&,Rational const&);
+int compare (Rational const &, Rational const &);
 int sign (Rational r);
 
 inline void
-Rational::copy (Rational const&r)
+Rational::copy (Rational const &r)
 {
   sign_ = r.sign_;
   num_ = r.num_;
@@ -89,9 +99,9 @@ Rational::copy (Rational const&r)
 
 #if 0
 ostream &
-operator << (ostream &,  Rational);
+operator << (ostream &, Rational);
 #endif
 
-const Rational infinity_rat = INT_MAX;
+const Rational infinity_rat (U64_MAX);
 
 #endif // RATIONAL_HH