X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Frational.hh;h=fdc3b68fabd2a8847c23f0aa436d067019d7d4b6;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=1058d784c4da0b001d8ad2a9414064ecd0a1ee97;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 1058d784c4..fdc3b68fab 100644
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,23 +3,21 @@
 
   source file of the Flower Library
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
-
-#include "compare.hh"
-#include "arithmetic-operator.hh"
 #include "flower-proto.hh"
-#include "string.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
@@ -27,70 +25,83 @@ 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 infty_b () const;
+  bool is_infinity () const;
   void invert ();
-  int num  () const { return sign_ * num_; }
-  int den  () const { return den_; }
-  int num_i  () const { return sign_ * num_; }
-  int den_i  () const { return den_; }
+  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;
-  operator int () const;
-  operator double () const;
+  int to_int () const;
+
+  operator double () const { return to_double (); }
+  double to_double () const;
+
   Rational operator - () const;
   /**
-     Initialize to 0. 
-   */
+     Initialize to 0.
+  */
   Rational ();
-  Rational (int, int =1);
-  Rational (double);
-  Rational (Rational const&r) {   copy (r);}
+  Rational (int);
+  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 const &);
   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 str () 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_;
   den_ = r.den_;
 }
 
-class ostream;
+#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