X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=bfd2449e6b3e23ba2ec88b7a509791851fef2751;hb=93f3d637efbc038b837cf64fae0872e873e4f039;hp=3c09299b4b857983fbeabfc5248efd38ff24c925;hpb=0c14539bc83d6bb405141b6f21430b33d1e8fcf0;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 3c09299b4b..bfd2449e6b 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -71,6 +71,7 @@ using namespace std;
 #include "std-string.hh"
 #include "version.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
 /*
 RH 7 fix (?)
@@ -187,7 +188,7 @@ BOM_UTF8	\357\273\277
    /* Use the trailing context feature. Otherwise, the BOM will not be
       found if the file starts with an identifier definition. */
 <INITIAL,chords,lyrics,figures,notes>{BOM_UTF8}/.* {
-  if (this->lexloc_->line_number () != 1 || this->lexloc_->column_number () != 0)
+  if (lexloc_->line_number () != 1 || lexloc_->column_number () != 0)
     {
       LexerWarning (_ ("stray UTF-8 BOM encountered").c_str ());
       // exit (1);
@@ -243,7 +244,7 @@ BOM_UTF8	\357\273\277
 	s = s.substr (0, s.rfind ('\"'));
 
 	yy_pop_state ();
-	this->here_input().get_source_file ()->name_ = s;
+	here_input().get_source_file ()->name_ = s;
 	message (_f ("Renaming input to: `%s'", s.c_str ()));
 	progress_indication ("\n");
 	scm_module_define (scm_car (scopes_),
@@ -257,7 +258,7 @@ BOM_UTF8	\357\273\277
 	sscanf (YYText (), "%d", &i);
 
 	yy_pop_state ();
-	this->here_input ().get_source_file ()->set_line (here_input ().start (), i);
+	here_input ().get_source_file ()->set_line (here_input ().start (), i);
 }
 
 <version>{ANY_CHAR} 	{
@@ -688,9 +689,9 @@ BOM_UTF8	\357\273\277
 		for (; scm_is_pair(s); s = scm_cdr(s)) {
 		  SCM predicate = scm_car(s);
 
-		  if (predicate == ly_lily_module_constant ("markup-list?"))
+		  if (predicate == Lily::markup_list_p)
 		    push_extra_token (here_input (), EXPECT_MARKUP_LIST);
-		  else if (predicate == ly_lily_module_constant ("markup?"))
+		  else if (predicate == Lily::markup_p)
 		    push_extra_token (here_input (), EXPECT_MARKUP);
 		  else
 		    push_extra_token (here_input (), EXPECT_SCM, predicate);
@@ -966,9 +967,9 @@ Lily_lexer::scan_scm_id (SCM sid)
 			cs = SCM_CAR (cs);
 		}
 
-		if (scm_is_eq (cs, ly_lily_module_constant ("ly:music?")))
+		if (scm_is_eq (cs, Lily::ly_music_p))
 			funtype = MUSIC_FUNCTION;
-		else if (scm_is_eq (cs, ly_lily_module_constant ("ly:event?")))
+		else if (scm_is_eq (cs, Lily::ly_event_p))
 			funtype = EVENT_FUNCTION;
 		else if (ly_is_procedure (cs))
 			funtype = SCM_FUNCTION;
@@ -1327,15 +1328,13 @@ scan_fraction (string frac)
 SCM
 lookup_markup_command (string s)
 {
-	SCM proc = ly_lily_module_constant ("lookup-markup-command");
-	return scm_call_1 (proc, ly_string2scm (s));
+	return Lily::lookup_markup_command (ly_string2scm (s));
 }
 
 SCM
 lookup_markup_list_command (string s)
 {
-	SCM proc = ly_lily_module_constant ("lookup-markup-list-command");
-	return scm_call_1 (proc, ly_string2scm (s));
+	return Lily::lookup_markup_list_command (ly_string2scm (s));
 }
 
 /* Shut up lexer warnings.  */