Fixes bog in Lookup::bezier_sandwich, tethering sandwiches at their extremal ends...

[lilypond.git] / lily / prob.cc

diff --git a/lily/prob.cc b/lily/prob.cc
index 7050c1294991145f447b1c022e0c18c953695631..bb679512d36c4879fa7ab7f52f023e98f76b3ec2 100644 (file)
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2004--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,10 +23,8 @@
 #include "input.hh"
 #include "profile.hh"
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SMOBS (Prob);
-IMPLEMENT_TYPE_P (Prob, "ly:prob?");
+const char Prob::type_p_name_[] = "ly:prob?";
 
 SCM
 Prob::equal_p (SCM sa, SCM sb)
@@ -38,7 +36,7 @@ Prob::equal_p (SCM sa, SCM sb)
      equality; e.g., that two probs are equal iff they can be
      distinguished by calls to ly:prob-property.
   */
-  Prob *probs[2] = {unsmob_prob (sa), unsmob_prob (sb)};
+  Prob *probs[2] = {Prob::unsmob (sa), Prob::unsmob (sb)};
   SCM props[2][2];
   int i;
 
@@ -64,7 +62,7 @@ Prob::equal_p (SCM sa, SCM sb)
           SCM aval = scm_cdar (aprop);
           SCM bval = scm_cdar (bprop);
           if (scm_caar (aprop) != scm_caar (bprop)
-              || (!(unsmob_input (aval) && unsmob_input (bval))
+              || (!(Input::unsmob (aval) && Input::unsmob (bval))
                   &&
                   !to_boolean (scm_equal_p (aval, bval))))
             return SCM_BOOL_F;
@@ -80,7 +78,6 @@ Prob::equal_p (SCM sa, SCM sb)
 
 Prob::Prob (SCM type, SCM immutable_init)
 {
-  self_scm_ = SCM_EOL;
   mutable_property_alist_ = SCM_EOL;
   immutable_property_alist_ = immutable_init;
   type_ = type;
@@ -95,7 +92,6 @@ Prob::Prob (Prob const &src)
 {
   immutable_property_alist_ = src.immutable_property_alist_;
   mutable_property_alist_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   type_ = src.type_;
 
   /* First we smobify_self, then we copy over the stuff.  If we don't,
@@ -119,7 +115,7 @@ Prob::derived_mark () const
 SCM
 Prob::mark_smob (SCM smob)
 {
-  ASSERT_LIVE_IS_ALLOWED ();
+  ASSERT_LIVE_IS_ALLOWED (smob);
 
   Prob *system = (Prob *) SCM_CELL_WORD_1 (smob);
   scm_gc_mark (system->mutable_property_alist_);
@@ -200,4 +196,3 @@ Prob::name () const
   else
     return this->class_name ();
 }
-