X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsmobs.hh;h=cd28a29c3f0af531de7cb954f65e538fb1c80b02;hb=2da5c55cf0a968982223682227a0cf3b019d03a8;hp=dc06472890407fb5063293ce86741f9b88b1e25e;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index dc06472890..cd28a29c3f 100644
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -99,52 +99,52 @@
   from file "ly-smobs.icc"
 */
 
-#define DECLARE_SIMPLE_SMOBS(CL)		\
-  public:					\
-  SCM smobbed_copy () const;			\
+#define DECLARE_SIMPLE_SMOBS(CL)                \
+  public:                                       \
+  SCM smobbed_copy () const;                    \
   DECLARE_BASE_SMOBS (CL)
 
-#define DECLARE_BASE_SMOBS(CL)					\
-  friend class Non_existent_class;				\
-  private:							\
+#define DECLARE_BASE_SMOBS(CL)                                  \
+  friend class Non_existent_class;                              \
+  private:                                                      \
   static const char* smob_name_; \
-  static scm_t_bits smob_tag_;					\
-  static SCM mark_smob (SCM);					\
-  static size_t free_smob (SCM s);				\
-  static int print_smob (SCM s, SCM p, scm_print_state*);	\
-  public:							\
-  static SCM equal_p (SCM a, SCM b);				\
-  static CL *unsmob (SCM s) __attribute__((pure))		\
-  {								\
-    if (SCM_NIMP (s) && SCM_CELL_TYPE (s) == smob_tag_)		\
-      return (CL *) SCM_CELL_WORD_1 (s);			\
-    else							\
-      return 0;							\
-  }								\
-  static SCM smob_p (SCM);					\
-  static void init_smobs ();					\
+  static scm_t_bits smob_tag_;                                  \
+  static SCM mark_smob (SCM);                                   \
+  static size_t free_smob (SCM s);                              \
+  static int print_smob (SCM s, SCM p, scm_print_state*);       \
+  public:                                                       \
+  static SCM equal_p (SCM a, SCM b);                            \
+  static CL *unsmob (SCM s) __attribute__((pure))               \
+  {                                                             \
+    if (SCM_NIMP (s) && SCM_CELL_TYPE (s) == smob_tag_)         \
+      return (CL *) SCM_CELL_WORD_1 (s);                        \
+    else                                                        \
+      return 0;                                                 \
+  }                                                             \
+  static SCM smob_p (SCM);                                      \
+  static void init_smobs ();                                    \
   private:
 
-#define DECLARE_SMOBS(CL)			\
-  DECLARE_BASE_SMOBS (CL)			\
-    protected:					\
-  virtual ~CL ();				\
-  SCM unprotected_smobify_self ();		\
-  private:					\
-  void smobify_self ();				\
-  SCM self_scm_;				\
-  SCM protection_cons_;				\
-  public:					\
-  SCM unprotect ();				\
-  void protect ();				\
-  SCM self_scm () const { return self_scm_; }	\
+#define DECLARE_SMOBS(CL)                       \
+  DECLARE_BASE_SMOBS (CL)                       \
+    protected:                                  \
+  virtual ~CL ();                               \
+  SCM unprotected_smobify_self ();              \
+  private:                                      \
+  void smobify_self ();                         \
+  SCM self_scm_;                                \
+  SCM protection_cons_;                         \
+  public:                                       \
+  SCM unprotect ();                             \
+  void protect ();                              \
+  SCM self_scm () const { return self_scm_; }   \
   private:
 
-#define DECLARE_UNSMOB(CL, name)		\
-  inline CL *					\
-  unsmob_ ## name (SCM s)			\
-  {						\
-    return CL::unsmob (s);			\
+#define DECLARE_UNSMOB(CL, name)                \
+  inline CL *                                   \
+  unsmob_ ## name (SCM s)                       \
+  {                                             \
+    return CL::unsmob (s);                      \
   }
 
 #define DECLARE_TYPE_P(CL) extern SCM CL ## _type_p_proc
@@ -153,16 +153,35 @@ void protect_smob (SCM smob, SCM *prot_cons);
 void unprotect_smob (SCM smob, SCM *prot_cons);
 
 extern bool parsed_objects_should_be_dead;
+class parsed_dead
+{
+  static vector<parsed_dead *> elements;
+  SCM data;
+  SCM readout_one ()
+  {
+    SCM res = data;
+    data = SCM_UNDEFINED;
+    return res;
+  }
+public:
+  parsed_dead () : data (SCM_UNDEFINED)
+  {
+    elements.push_back (this);
+  }
+  void checkin (SCM arg) { data = arg; }
+  static SCM readout ();
+};
 
 #ifndef NDEBUG
-#define ASSERT_LIVE_IS_ALLOWED()     \
-  static bool passed_here_once;\
-  if (parsed_objects_should_be_dead && !passed_here_once) { \
-    ::programming_error (string ("Parsed object should be dead: ")  + __PRETTY_FUNCTION__ ); \
-    passed_here_once = true;\
-  }    
+#define ASSERT_LIVE_IS_ALLOWED(arg)                                     \
+  do {                                                                  \
+    static parsed_dead pass_here;                                       \
+    if (parsed_objects_should_be_dead)                                  \
+      pass_here.checkin (arg);                                          \
+  } while (0)
 #else
-#define ASSERT_LIVE_IS_ALLOWED()
+#define ASSERT_LIVE_IS_ALLOWED(arg) do { } \
+  while (0)
 #endif
 
 #endif /* SMOBS_HH */