X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Frational.hh;h=0129cea773dd22da6a64fdfc357549d44cf5f46e;hb=0387f04497978e37b335a8b99eec905499d6ad0f;hp=51426dd063588be8cb74f33f15813f345928f3b3;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 51426dd063..0129cea773 100644
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -1,17 +1,107 @@
 /*
-  rational.hh -- declare 
+  rational.hh -- declare rational helpers
 
   source file of the Flower Library
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
-#include <Rational.h>
 
-/// print a Rational. To be called from the  debugger
-void print_rat (Rational const&);
+#include "flower-proto.hh"
+#include "std-string.hh"
+#include <limits.h>
+
+/**
+   Rational numbers.  Included is support for + and - infinity.
+*/
+class Rational
+{
+  /**
+     Sign of rational.
+     -2, .. 2
+
+     -2,2 is - and + infinity.
+     -1,1 is negative and positive.
+     0 if *this is zero.
+  */
+  int sign_;
+  U64 num_, den_;
+  void normalize ();
+  void copy (Rational const &);
+
+public:
+  void set_infinite (int sign);
+  bool is_infinity () const;
+  void invert ();
+  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 ();
+  int to_int () const;
+
+  operator double () const { return to_double (); }
+  double to_double () const;
+
+  Rational operator - () const;
+  /**
+     Initialize to 0.
+  */
+  Rational ();
+  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);
+  Rational &operator /= (Rational);
+  Rational &operator += (Rational);
+  Rational &operator -= (Rational);
+  Rational &operator %= (Rational);
+  static int compare (Rational const &, Rational const &);
+  int sign () const;
+  string to_string () const;
+};
+
+#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);
+
+int compare (Rational const &, Rational const &);
+int sign (Rational r);
+
+inline void
+Rational::copy (Rational const &r)
+{
+  sign_ = r.sign_;
+  num_ = r.num_;
+  den_ = r.den_;
+}
+
+#if 0
+ostream &
+operator << (ostream &, Rational);
+#endif
+
+const Rational infinity_rat (U64_MAX);
 
 #endif // RATIONAL_HH