release: 1.3.0

[lilypond.git] / flower / scalar.cc

diff --git a/flower/scalar.cc b/flower/scalar.cc
index 9d7ef229570c1076470645444e05224af8cdc226..48d4889a4eaed7f1a49fd917ebf604c121b10bb8 100644 (file)
--- a/flower/scalar.cc
+++ b/flower/scalar.cc
@@ -1,52 +1,84 @@
+#if 0
 /*
-  scalar.cc -- implement 
+  scalar.cc -- implement Scalar
 
   source file of the Flower Library
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <assert.h>
 #include <stdio.h>
-#include "scalar.hh"
+
+#include "rational.hh"
 
 Scalar::Scalar (Rational r)
-  :String (r)
 {
-
+  (*this) = r.str ();
 }
 
 Scalar::operator Rational ()
+{
+  return to_rat ();
+}
+
+Rational
+Scalar::to_rat () const
 {
   int p = index_i ('/');
   if (p == -1)
-    return int (*this);
+    return this->to_i ();
   
-  String s2 = right_str (len()-p-1);
+  String s2 = right_str (length_i ()-p-1);
   String s1 = left_str (p);
 
   return Rational (s1.value_i (), s2.value_i ());
 }
 
+bool
+Scalar::isdir_b () const
+{
+  int conv = length_i ();
+  if (conv)
+    {
+      long l =0;
+      conv = sscanf (strh_.ch_C (), "%ld", &l);
+      conv = conv && (l >= -1 && l <= 1);
+    }
+  return conv;
+}
+
 bool
 Scalar::isnum_b () const
 {
   int conv = false;
-  if (len ())
+  if (length_i ())
     {
       long l =0;
-      conv = sscanf (strh_.ch_C (), "%ld", &l);
+      conv = sscanf (strh_.ch_C (), "%lf", &l);
     }
-  return len() && conv;
+  return length_i () && conv;
 }
 
 Scalar::operator Real()
+{
+  return to_f ();
+}
+
+Real
+Scalar::to_f () const
 {
   assert (isnum_b ());
   return value_f ();
 }
 
-Scalar::operator int()
+Scalar::operator int ()
+{
+  return to_i ();
+}
+
+int
+Scalar::to_i () const
 {
   if (!length_i ())
     return 0;                  // ugh
@@ -55,10 +87,15 @@ Scalar::operator int()
   return value_i ();
 }
 
-
 Scalar::operator bool () const
 {
-  if (!len ())
+  return to_bool ();
+}
+
+bool
+Scalar::to_bool () const
+{
+  if (!length_i ())
     return false;
   if (*this == "0")
     return false;
@@ -67,3 +104,6 @@ Scalar::operator bool () const
     return false;
   return true;
 }
+
+
+#endif