X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsmobs.hh;h=f0cea0230191deb01516d24c035c1ac3daf0bb3b;hb=f875ef39c544bd3499dae5360e9e24f69933575f;hp=a2dcdb613d31dd442cb3ce15464aeb4b91c688a0;hpb=1aa6d40d595d25202bd7b5ce82edf320845dc7a4;p=lilypond.git

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index a2dcdb613d..f0cea02301 100644
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -1,16 +1,26 @@
 /*
-  smobs.hh -- declare smob related stuff.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SMOBS_HH
 #define SMOBS_HH
 
 #include "lily-guile.hh"
-#include "virtual-methods.hh"
 #include "warn.hh"
 
 /*
@@ -89,51 +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:							\
-  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)					\
-  {								\
-    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 ();					\
+#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 ();                                    \
   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
@@ -143,12 +154,20 @@ void unprotect_smob (SCM smob, SCM *prot_cons);
 
 extern bool parsed_objects_should_be_dead;
 
+#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;\
-  }    
+  do { \
+    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;\
+    } \
+  } \
+  while (0)
+#else
+#define ASSERT_LIVE_IS_ALLOWED() do { } \
+  while (0)
+#endif
 
 #endif /* SMOBS_HH */