patch::: 0.1.48: Re: lily 0.1.59

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 4160af814d87b8eac8c34d64fbe4ff552b907d88..587a7f63f1612be4c912e90d57dacb5a4fb31b85 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -34,6 +34,8 @@ public:
   Rational truncated () const;
   void negate ();
   operator bool () const;
+  operator int () const;
+  operator double () const;
   operator String () const;
   Rational operator - () const;
   Rational ();

diff --git a/flower/rational.cc b/flower/rational.cc
index 202dd9f0e717912a76e49bf48786bef6bfe4ee0e..df18b4cbcd57cf5b0ecd2d8368d36d667e576698 100644 (file)
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -11,12 +11,21 @@
 #include "string-convert.hh"  
 #include "libc-extension.hh"
 
-
 Rational::operator bool () const
 {
   return sign_;
 }
 
+Rational::operator int () const
+{
+  return sign_ * num_ / den_;
+}
+
+Rational::operator double () const
+{
+  return (double)sign_ * num_ / den_;
+}
+
 ostream &
 operator << (ostream &o, Rational r)
 {