X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=8b0859630ec04dcd0ea9c0a5fd1b3a1d0ad61843;hb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;hp=66da12433604f8a484564883fc057ae0bda8ffb8;hpb=97b1468ebd1611364731b53a1bd81a2a69402d60;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 66da124336..8b0859630e 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -827,7 +827,7 @@ Lily_lexer::pop_extra_token ()
 		return -1;
 
   /* produce requested token */
-	yylloc = *unsmob_input (scm_caar (extra_tokens_));
+	yylloc = *Input::unsmob (scm_caar (extra_tokens_));
 	int type = scm_to_int (scm_cadar (extra_tokens_));
 	yylval = scm_cddar (extra_tokens_);
 	extra_tokens_ = scm_cdr (extra_tokens_);
@@ -914,7 +914,7 @@ Lily_lexer::scan_escaped_word (const string &str)
 		return i;
 
 	SCM sid = lookup_identifier (str);
-	if (Music *m = unsmob_music (sid))
+	if (Music *m = Music::unsmob (sid))
 	{
 		m->set_spot (override_input (here_input ()));
 	}
@@ -934,7 +934,7 @@ int
 Lily_lexer::scan_shorthand (const string &str)
 {
 	SCM sid = lookup_identifier (str);
-	if (Music *m = unsmob_music (sid))
+	if (Music *m = Music::unsmob (sid))
 	{
 		m->set_spot (override_input (here_input ()));
 	}
@@ -1014,7 +1014,7 @@ Lily_lexer::scan_bare_word (const string &str)
 		
 		if (scm_is_pair (handle)) {
 			yylval = scm_cdr (handle);
-			if (unsmob_pitch (yylval))
+			if (Pitch::unsmob (yylval))
 	                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
 			else if (scm_is_symbol (yylval))
 			    return DRUM_PITCH;
@@ -1096,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 = unsmob_music (v))
+				if (Music *m = Music::unsmob (v))
 				{
-					if (!unsmob_input (m->get_property ("origin")))
+					if (!Input::unsmob (m->get_property ("origin")))
 						m->set_spot (override_input (here_input ()));
 				}
 					
@@ -1121,9 +1121,9 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token)
 			sval = SCM_UNSPECIFIED;
 	}
 
-	if (Music *m = unsmob_music (sval))
+	if (Music *m = Music::unsmob (sval))
 	{
-		if (!unsmob_input (m->get_property ("origin")))
+		if (!Input::unsmob (m->get_property ("origin")))
 			m->set_spot (override_input (here_input ()));
 	}