X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Frational.hh;h=253e09f4cc4214c44f03e16aa4e842d4056691be;hb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;hp=461b2522a285de9ee5f6488706dd51ce38d3f70e;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 461b2522a2..253e09f4cc 100644
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -1,17 +1,28 @@
 /*
-  rational.hh -- declare rational helpers
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
+#include "flower-proto.hh"
 #include "std-string.hh"
-
-#include "std-string.hh"
+#include <limits.h>
 
 /**
    Rational numbers.  Included is support for + and - infinity.
@@ -27,26 +38,28 @@ class Rational
      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 ();
   int to_int () const;
-  operator bool () const;
-  operator double () const;
+
+  operator double () const { return to_double (); }
+  double to_double () const;
 
   Rational operator - () const;
   /**
@@ -54,12 +67,15 @@ public:
   */
   Rational ();
   Rational (int);
-  Rational (int, int);
-  Rational (double);
+  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;
+    copy (r);
+    return *this;
   }
 
   Rational &operator *= (Rational);
@@ -69,15 +85,16 @@ public:
   Rational &operator %= (Rational);
   static int compare (Rational const &, Rational const &);
   int sign () const;
-  std::string to_string () 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, -);
-IMPLEMENT_ARITHMETIC_OPERATOR (Rational, %);
+IMPLEMENT_ARITHMETIC_OPERATOR (Rational, % );
 
 INSTANTIATE_COMPARE (Rational const &, Rational::compare);
 
@@ -97,6 +114,6 @@ ostream &
 operator << (ostream &, Rational);
 #endif
 
-const Rational infinity_rat = INT_MAX;
+const Rational infinity_rat (U64_MAX);
 
 #endif // RATIONAL_HH