Don't assign 'safe' values to self_scm_ outside of smobify_self

diff --git a/lily/dispatcher.cc b/lily/dispatcher.cc
index feee3f24a7eb3b535d72bf02252ceac2eb71342e..5f0e38007e41d8dd4989304b7906b7bc35a01a46 100644 (file)
--- a/lily/dispatcher.cc
+++ b/lily/dispatcher.cc
@@ -33,7 +33,6 @@ Dispatcher::~Dispatcher ()
 
 Dispatcher::Dispatcher ()
 {
-  self_scm_ = SCM_EOL;
   listeners_ = SCM_EOL;
   dispatchers_ = SCM_EOL;
   listen_classes_ = SCM_EOL;

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index af5cecb63ff6a6855a7c1daa7041600d0a27507c..f12fc4ed2c29bce41238324ebb376229edafb76e 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -60,7 +60,6 @@ Font_metric::find_by_name (string s) const
 Font_metric::Font_metric ()
 {
   description_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   smobify_self ();
 }
 

diff --git a/lily/grob.cc b/lily/grob.cc
index 90a7dbac20a9e5ec98793c5432603d8c82883a01..c45dd09b2765f27298bda75ad7d62c689f5748af 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -51,7 +51,6 @@ Grob::Grob (SCM basicprops)
 {
 
   /* FIXME: default should be no callback.  */
-  self_scm_ = SCM_EOL;
   layout_ = 0;
   original_ = 0;
   interfaces_ = SCM_EOL;
@@ -96,7 +95,6 @@ Grob::Grob (SCM basicprops)
 Grob::Grob (Grob const &s)
 {
   original_ = (Grob *) & s;
-  self_scm_ = SCM_EOL;
 
   immutable_property_alist_ = s.immutable_property_alist_;
   mutable_property_alist_ = SCM_EOL;

diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index 2fba5f55a480a005137ef85cfd76f7425559260a..3ff54cc49e45ca5f4a322d437b2b98d9ad21ac95 100644 (file)
--- a/lily/include/ly-smobs.icc
+++ b/lily/include/ly-smobs.icc
@@ -122,6 +122,7 @@
       goodly sure                                                       \
     */                                                                  \
     SCM s;                                                              \
+    self_scm_ = SCM_UNDEFINED;                                         \
     SCM_NEWSMOB (s, CL::smob_tag_, this);                               \
     self_scm_ = s;                                                      \
     scm_gc_register_collectable_memory (this, sizeof (CL), #CL " smob"); \

diff --git a/lily/prob.cc b/lily/prob.cc
index 8b14f73416a820ee325d2ea6ea80ae53db5b9ff6..b5619fae66435745924076421c7c8095930bf1f3 100644 (file)
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -80,7 +80,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 +94,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,

diff --git a/lily/scheme-listener.cc b/lily/scheme-listener.cc
index fe57c3a7194a1bef701ce94a504014c857c8efb1..2388d4a88a103be474f080042752c772be54bdbb 100644 (file)
--- a/lily/scheme-listener.cc
+++ b/lily/scheme-listener.cc
@@ -32,7 +32,6 @@ IMPLEMENT_DEFAULT_EQUAL_P (Scheme_listener);
 Scheme_listener::Scheme_listener (SCM c)
 {
   callback_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   smobify_self ();
   callback_ = c;
 }

diff --git a/lily/source-file.cc b/lily/source-file.cc
index e4679bda60060802d0746dd102cbb1ae986feb02..d80704ae76dce99939e6e4c0ddfdb08d05f24f04 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -102,7 +102,6 @@ Source_file::init ()
   istream_ = 0;
   line_offset_ = 0;
   str_port_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   smobify_self ();
 }
 

diff --git a/lily/translator.cc b/lily/translator.cc
index d505e656b71861c3cac310e70270c1395905e14a..5f4a39bb0ea835121527082d9717c7b849a68c13 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -36,7 +36,6 @@ Translator::~Translator ()
 void
 Translator::init ()
 {
-  self_scm_ = SCM_EOL;
   daddy_context_ = 0;
   smobify_self ();
 }