Issue 4119: Avoid using `markup' as local binding

[lilypond.git] / lily / lily-lexer.cc

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index d2d57fdbd7e43b7fcb5fea803b833e17e9b90076..921dd2ad7a488f4a8ab50b4d2592ca86b68d68ba 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -123,8 +123,8 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser,
   main_input_level_ = 0;
 
   extra_tokens_ = SCM_EOL;
-  if (unsmob_input (override_input))
-    override_input_ = *unsmob_input (override_input);
+  if (Input::unsmob (override_input))
+    override_input_ = *Input::unsmob (override_input);
 
   smobify_self ();
 
@@ -364,11 +364,8 @@ Lily_lexer::add_lexed_char (int count)
   char_count_stack_.back () += count;
 }
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SMOBS (Lily_lexer);
-IMPLEMENT_TYPE_P (Lily_lexer, "ly:lily-lexer?");
-IMPLEMENT_DEFAULT_EQUAL_P (Lily_lexer);
+const char Lily_lexer::type_p_name_[] = "ly:lily-lexer?";
 
 SCM
 Lily_lexer::mark_smob (SCM s)