patch::: 1.3.119.jcn3

[lilypond.git] / flower / scalar.cc

diff --git a/flower/scalar.cc b/flower/scalar.cc
index 044b4d0b0fe7a1bae4193cfe9aadd0429255d17c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/flower/scalar.cc
+++ b/flower/scalar.cc
@@ -1,59 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include "scalar.hh"
-
-Scalar::Scalar(Rational r)
-    :String(r)
-{
-
-}
-
-Scalar::operator Rational()
-{
-    int p = pos('/');
-    if (!p)
-       return int(*this);
-    
-    String s2 = right(len()-p);
-    p--;
-    String s1 = left(p);
-
-    return Rational(s1.value(), s2.value());
-}
-
-bool
-Scalar::isnum()
-{
-    int conv = false;
-    if (len()) {
-       long l =0;
-       conv = sscanf(strh_.ch_c_l(), "%ld", &l);
-    }
-    return len() && conv;
-}
-
-Scalar::operator Real()
-{
-    assert (isnum());
-    return fvalue();
-}
-
-Scalar::operator int()
-{
-    assert (isnum());
-    return value();
-}
-
-
-Scalar::operator bool() const
-{
-    if (!len())
-       return false;
-    if (*this == "0")
-       return false;
-    String u (*this);
-    u.upper();
-    if (u== "FALSE")
-       return false;
-    return true;
-}