* lily/lexer.ll: change is_string -> ly_c_string_p

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 787b324204e90d36503adcea1967c8537c8dc2f0..2a2b403e42065e90a7361d2e8c8246d8acee71e0 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -250,7 +250,7 @@ HYPHEN              --
          s = s.left_string (s.length () - 1);
 
        SCM sid = lookup_identifier (s);
-       if (is_string (sid)) {
+       if (ly_c_string_p (sid)) {
                new_input (ly_scm2string (sid), sources_);
                yy_pop_state ();
        } else { 
@@ -468,7 +468,7 @@ HYPHEN              --
                String str (YYText () + 1);
                SCM s = lookup_markup_command (str);
 
-               if (is_pair (s) && is_symbol (ly_cdr (s)) ) {
+               if (ly_c_pair_p (s) && is_symbol (ly_cdr (s)) ) {
                        yylval.scm = ly_car(s);
                        SCM tag = ly_cdr(s);
                        if (tag == ly_symbol2scm("markup0"))
@@ -676,10 +676,10 @@ My_lily_lexer::scan_bare_word (String str)
        SCM sym = ly_symbol2scm (str.to_str0 ());
        if ((YYSTATE == notes) || (YYSTATE == chords)) {
                SCM handle = SCM_BOOL_F;
-               if (is_pair (pitchname_tab_stack_))
+               if (ly_c_pair_p (pitchname_tab_stack_))
                        handle = scm_hashq_get_handle (ly_car (pitchname_tab_stack_), sym);
                
-               if (is_pair (handle)) {
+               if (ly_c_pair_p (handle)) {
                        yylval.scm = ly_cdr (handle);
                        if (unsmob_pitch (yylval.scm)) 
                            return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;