Issue 2787: Sanitize usage of -DDEBUG, -DNDEBUG and assert

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index db1303d63ce3b918f95e5d9f254c589a84bf89ea..76e1ef6f58b8214419cd9b422369480a8ace2fa4 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -20,6 +20,7 @@
 #include "engraver.hh"
 
 #include "context.hh"
+#include "grob-properties.hh"
 #include "international.hh"
 #include "music.hh"
 #include "paper-column.hh"
@@ -51,12 +52,12 @@ Grob_info
 Engraver::make_grob_info (Grob *e, SCM cause)
 {
   /* TODO: Remove Music code when it's no longer needed */
-  if (Music *m = unsmob_music (cause))
+  if (Music *m = Music::unsmob (cause))
     {
-      cause = m->to_event (context ())->unprotect ();
+      cause = m->to_event ()->unprotect ();
     }
-  if (e->get_property ("cause") == SCM_EOL
-      && (unsmob_stream_event (cause) || unsmob_grob (cause)))
+  if (scm_is_null (e->get_property ("cause"))
+      && (Stream_event::is_smob (cause) || Grob::is_smob (cause)))
     e->set_property ("cause", cause);
 
   return Grob_info (this, e);
@@ -85,7 +86,7 @@ Engraver::Engraver ()
 {
 }
 
-#ifndef NDEBUG
+#ifdef DEBUG
 static SCM creation_callback = SCM_EOL;
 LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback",
            1, 0, 0, (SCM cb),
@@ -111,34 +112,34 @@ Engraver::internal_make_grob (SCM symbol,
                               int line,
                               char const *fun)
 {
-#ifdef NDEBUG
+#ifndef DEBUG
   (void)file;
   (void)line;
   (void)fun;
 #endif
 
-  SCM props = updated_grob_properties (context (), symbol);
+  SCM props = Grob_property_info (context (), symbol).updated ();
 
   Grob *grob = 0;
 
   SCM handle = scm_sloppy_assq (ly_symbol2scm ("meta"), props);
   SCM klass = scm_cdr (scm_sloppy_assq (ly_symbol2scm ("class"), scm_cdr (handle)));
 
-  if (klass == ly_symbol2scm ("Item"))
+  if (scm_is_eq (klass, ly_symbol2scm ("Item")))
     grob = new Item (props);
-  else if (klass == ly_symbol2scm ("Spanner"))
+  else if (scm_is_eq (klass, ly_symbol2scm ("Spanner")))
     grob = new Spanner (props);
-  else if (klass == ly_symbol2scm ("Paper_column"))
+  else if (scm_is_eq (klass, ly_symbol2scm ("Paper_column")))
     grob = new Paper_column (props);
 
   assert (grob);
   announce_grob (grob, cause);
 
-#ifndef NDEBUG
+#ifdef DEBUG
   if (ly_is_procedure (creation_callback))
     scm_apply_0 (creation_callback,
-                 scm_list_n (grob->self_scm (), scm_from_locale_string (file),
-                             scm_from_int (line), scm_from_locale_string (fun), SCM_UNDEFINED));
+                 scm_list_n (grob->self_scm (), scm_from_utf8_string (file),
+                             scm_from_int (line), scm_from_ascii_string (fun), SCM_UNDEFINED));
 #endif
 
   return grob;
@@ -170,16 +171,10 @@ Engraver::internal_make_spanner (SCM x, SCM cause, char const *name,
   return sp;
 }
 
-Engraver *
-unsmob_engraver (SCM eng)
-{
-  return dynamic_cast<Engraver *> (unsmob_translator (eng));
-}
-
 bool
 ly_is_grob_cause (SCM obj)
 {
-  return unsmob_grob (obj) || unsmob_stream_event (obj) || (obj == SCM_EOL);
+  return Grob::is_smob (obj) || Stream_event::is_smob (obj) || scm_is_null (obj);
 }
 
 #include "translator.icc"