X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=bfd2449e6b3e23ba2ec88b7a509791851fef2751;hb=c5847c9329abba798fb15bb336c7247ab149660b;hp=775cbdde0f831fc359ccde97e9b87ca2f713db40;hpb=e8d5061834a5a658c5ffd078237e9cd660069a7d;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 775cbdde0f..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);
@@ -826,7 +827,7 @@ Lily_lexer::pop_extra_token ()
 		return -1;
 
   /* produce requested token */
-	yylloc = *Input::unsmob (scm_caar (extra_tokens_));
+	yylloc = *unsmob<Input> (scm_caar (extra_tokens_));
 	int type = scm_to_int (scm_cadar (extra_tokens_));
 	yylval = scm_cddar (extra_tokens_);
 	extra_tokens_ = scm_cdr (extra_tokens_);
@@ -913,7 +914,7 @@ Lily_lexer::scan_escaped_word (const string &str)
 		return i;
 
 	SCM sid = lookup_identifier (str);
-	if (Music *m = Music::unsmob (sid))
+	if (Music *m = unsmob<Music> (sid))
 	{
 		m->set_spot (override_input (here_input ()));
 	}
@@ -933,7 +934,7 @@ int
 Lily_lexer::scan_shorthand (const string &str)
 {
 	SCM sid = lookup_identifier (str);
-	if (Music *m = Music::unsmob (sid))
+	if (Music *m = unsmob<Music> (sid))
 	{
 		m->set_spot (override_input (here_input ()));
 	}
@@ -952,7 +953,7 @@ Lily_lexer::scan_shorthand (const string &str)
 int
 Lily_lexer::scan_scm_id (SCM sid)
 {
-	if (Music_function *fun = Music_function::unsmob (sid))
+	if (Music_function *fun = unsmob<Music_function> (sid))
 	{
 		int funtype = SCM_FUNCTION;
 
@@ -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;
@@ -1013,7 +1014,7 @@ Lily_lexer::scan_bare_word (const string &str)
 
 		if (scm_is_pair (handle)) {
 			yylval = scm_cdr (handle);
-			if (Pitch::is_smob (yylval))
+			if (unsmob<Pitch> (yylval))
 	                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
 			else if (scm_is_symbol (yylval))
 			    return DRUM_PITCH;
@@ -1095,9 +1096,9 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token)
 			     p = scm_cdr (p))
 			{
 				SCM v = scm_car (p);
-				if (Music *m = Music::unsmob (v))
+				if (Music *m = unsmob<Music> (v))
 				{
-					if (!Input::is_smob (m->get_property ("origin")))
+					if (!unsmob<Input> (m->get_property ("origin")))
 						m->set_spot (override_input (here_input ()));
 				}
 
@@ -1120,9 +1121,9 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token)
 			sval = SCM_UNSPECIFIED;
 	}
 
-	if (Music *m = Music::unsmob (sval))
+	if (Music *m = unsmob<Music> (sval))
 	{
-		if (!Input::is_smob (m->get_property ("origin")))
+		if (!unsmob<Input> (m->get_property ("origin")))
 			m->set_spot (override_input (here_input ()));
 	}
 
@@ -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.  */