X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=89c8695987af4ef8b71e2a18d74dc964e70738b0;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f242158df78a0ad137efa96ea1da64d97d65908e;hpb=3a92b9350ec40cb050934f9632c92d2c0d1d1fc3;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index f242158df7..89c8695987 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -2,7 +2,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -1013,7 +1013,7 @@ Lily_lexer::scan_bare_word (const string &str)
 		
 		if (scm_is_pair (handle)) {
 			yylval = scm_cdr (handle);
-			if (Pitch::unsmob (yylval))
+			if (Pitch::is_smob (yylval))
 	                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
 			else if (scm_is_symbol (yylval))
 			    return DRUM_PITCH;
@@ -1097,7 +1097,7 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token)
 				SCM v = scm_car (p);
 				if (Music *m = Music::unsmob (v))
 				{
-					if (!Input::unsmob (m->get_property ("origin")))
+					if (!Input::is_smob (m->get_property ("origin")))
 						m->set_spot (override_input (here_input ()));
 				}
 					
@@ -1122,7 +1122,7 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token)
 
 	if (Music *m = Music::unsmob (sval))
 	{
-		if (!Input::unsmob (m->get_property ("origin")))
+		if (!Input::is_smob (m->get_property ("origin")))
 			m->set_spot (override_input (here_input ()));
 	}