X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Frational.hh;h=49b2322ed717e464bf992afedda255f050b5f493;hb=2b695bcbe3d6a5fddd58eb03189d3272112421d9;hp=e095f5871092a82e234b7cf5cc06bf5da90aaf8d;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index e095f58710..49b2322ed7 100644
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,23 +3,19 @@
 
   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"
-class String;
+#include "std-string.hh"
 
 /**
    Rational numbers.  Included is support for + and - infinity.
- */
-class Rational {
+*/
+class Rational
+{
   /**
      Sign of rational.
      -2, .. 2
@@ -27,70 +23,81 @@ 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 ();
+  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_; }
+  int numerator () const { return sign_ * num_; }
+  int denominator () const { return den_; }
+  int num () const { return numerator (); }
+  int 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);
+  explicit Rational (int, int);
+  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 (INT_MAX);
 
 #endif // RATIONAL_HH