Run `make grand-replace'.

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

diff --git a/lily/lily-lexer-scheme.cc b/lily/lily-lexer-scheme.cc
index 424b4fa816adb3227493709edcaf12c8146b7673..80c7086e7a5b916ab34d080daa103eeaa795eb2b 100644 (file)
--- a/lily/lily-lexer-scheme.cc
+++ b/lily/lily-lexer-scheme.cc
@@ -3,31 +3,19 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2008 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
 #include "lily-lexer.hh"
 
-LY_DEFINE(ly_lexer_keywords, "ly:lexer-keywords",
+LY_DEFINE (ly_lexer_keywords, "ly:lexer-keywords",
          1, 0, 0, (SCM lexer),
-         "Return a list of (KEY . CODE) pairs, signifying the lilypond reserved words list.")
+         "Return a list of @code{(KEY . CODE)} pairs, signifying the"
+         " LilyPond reserved words list.")
 {
-  Lily_lexer * lex = Lily_lexer::unsmob (lexer);
-  SCM_ASSERT_TYPE(lex, lexer, SCM_ARG1, __FUNCTION__, "lily lexer");
-  return lex->keyword_list ();
-}
-         
+  LY_ASSERT_SMOB (Lily_lexer, lexer, 1);
 
-LY_DEFINE(ly_lexer_set_safe, "ly:lexer-set-safe!",
-         1, 0, 0, (SCM lexer),
-         "Switch on safe mode for the rest of the file.")
-{
   Lily_lexer * lex = Lily_lexer::unsmob (lexer);
-  SCM_ASSERT_TYPE(lex, lexer, SCM_ARG1, __FUNCTION__, "lily lexer");
-
-  lex->be_safe_ = true;
-  lex->allow_includes_ = false;
-  
-  return SCM_UNSPECIFIED;
+  return lex->keyword_list ();
 }