X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=ee03ac44d8db2e53a782e0732acb766e23b6914a;hb=b5de1ca579bc679f69b5df30803fda31a74075d5;hp=dd82af2f63453bb5f9a65632d5bb0c176bf3fd0c;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index dd82af2f63..ee03ac44d8 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2012 Han-Wen Nienhuys + Copyright (C) 1998--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,7 +24,6 @@ #include "string-convert.hh" #include "warn.hh" -#include "ly-smobs.icc" #include Pitch::Pitch (int o, int n, Rational a) @@ -57,7 +56,7 @@ Pitch::compare (Pitch const &m1, Pitch const &m2) if (n) return n; if (a) - return a > (Rational)0; + return a > (Rational)0 ? 1 : -1; return 0; } @@ -219,21 +218,19 @@ Pitch::down_to (int notename) notename_ = notename; } -IMPLEMENT_TYPE_P (Pitch, "ly:pitch?"); +const char * const Pitch::type_p_name_ = "ly:pitch?"; + SCM -Pitch::mark_smob (SCM x) +Pitch::mark_smob () const { - Pitch *p = (Pitch *) SCM_CELL_WORD_1 (x); - return p->scale_->self_scm (); + return scale_->self_scm (); } -IMPLEMENT_SIMPLE_SMOBS (Pitch); int -Pitch::print_smob (SCM s, SCM port, scm_print_state *) +Pitch::print_smob (SCM port, scm_print_state *) const { - Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s); scm_puts ("#to_string ()), port); + scm_display (ly_string2scm (to_string ()), port); scm_puts (" >", port); return 1; } @@ -241,8 +238,8 @@ Pitch::print_smob (SCM s, SCM port, scm_print_state *) SCM Pitch::equal_p (SCM a, SCM b) { - Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a); - Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b); + Pitch *p = unsmob (a); + Pitch *q = unsmob (b); bool eq = p->notename_ == q->notename_ && p->octave_ == q->octave_ @@ -255,8 +252,8 @@ MAKE_SCHEME_CALLBACK (Pitch, less_p, 2); SCM Pitch::less_p (SCM p1, SCM p2) { - Pitch *a = unsmob_pitch (p1); - Pitch *b = unsmob_pitch (p2); + Pitch *a = unsmob (p1); + Pitch *b = unsmob (p2); if (compare (*a, *b) < 0) return SCM_BOOL_T;