Replace C++ (in)equality checks with proper SCM syntax

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 2c324f50000117b5d872af8751883371ec3037a8..9630ff4837910d052fd101692654cea2656c7cd7 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -451,11 +451,11 @@ toplevel_expression:
                } else if (Output_def * od = Output_def::unsmob ($1)) {
                        SCM id = SCM_EOL;
 
-                       if (od->c_variable ("is-paper") == SCM_BOOL_T)
+                       if (to_boolean (od->c_variable ("is-paper")))
                                id = ly_symbol2scm ("$defaultpaper");
-                       else if (od->c_variable ("is-midi") == SCM_BOOL_T)
+                       else if (to_boolean (od->c_variable ("is-midi")))
                                id = ly_symbol2scm ("$defaultmidi");
-                       else if (od->c_variable ("is-layout") == SCM_BOOL_T)
+                       else if (to_boolean (od->c_variable ("is-layout")))
                                id = ly_symbol2scm ("$defaultlayout");
 
                        parser->lexer_->set_identifier (id, $1);
@@ -466,11 +466,11 @@ toplevel_expression:
                SCM id = SCM_EOL;
                Output_def * od = Output_def::unsmob ($1);
 
-               if (od->c_variable ("is-paper") == SCM_BOOL_T)
+               if (to_boolean (od->c_variable ("is-paper")))
                        id = ly_symbol2scm ("$defaultpaper");
-               else if (od->c_variable ("is-midi") == SCM_BOOL_T)
+               else if (to_boolean (od->c_variable ("is-midi")))
                        id = ly_symbol2scm ("$defaultmidi");
-               else if (od->c_variable ("is-layout") == SCM_BOOL_T)
+               else if (to_boolean (od->c_variable ("is-layout")))
                        id = ly_symbol2scm ("$defaultlayout");
 
                parser->lexer_->set_identifier (id, $1);
@@ -835,11 +835,11 @@ book_body:
                } else if (Output_def *od = Output_def::unsmob ($2)) {
                        SCM id = SCM_EOL;
 
-                       if (od->c_variable ("is-paper") == SCM_BOOL_T)
+                       if (to_boolean (od->c_variable ("is-paper")))
                                id = ly_symbol2scm ("$defaultpaper");
-                       else if (od->c_variable ("is-midi") == SCM_BOOL_T)
+                       else if (to_boolean (od->c_variable ("is-midi")))
                                id = ly_symbol2scm ("$defaultmidi");
-                       else if (od->c_variable ("is-layout") == SCM_BOOL_T)
+                       else if (to_boolean (od->c_variable ("is-layout")))
                                id = ly_symbol2scm ("$defaultlayout");
 
                        parser->lexer_->set_identifier (id, $2);
@@ -916,11 +916,11 @@ bookpart_body:
                } else if (Output_def *od = Output_def::unsmob ($2)) {
                        SCM id = SCM_EOL;
 
-                       if (od->c_variable ("is-paper") == SCM_BOOL_T)
+                       if (to_boolean (od->c_variable ("is-paper")))
                                id = ly_symbol2scm ("$defaultpaper");
-                       else if (od->c_variable ("is-midi") == SCM_BOOL_T)
+                       else if (to_boolean (od->c_variable ("is-midi")))
                                id = ly_symbol2scm ("$defaultmidi");
-                       else if (od->c_variable ("is-layout") == SCM_BOOL_T)
+                       else if (to_boolean (od->c_variable ("is-layout")))
                                id = ly_symbol2scm ("$defaultlayout");
 
                        parser->lexer_->set_identifier (id, $2);
@@ -986,7 +986,7 @@ score_items:
        {
                Output_def *od = Output_def::unsmob ($2);
                if (od) {
-                       if (od->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
+                       if (to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper"))))
                        {
                                parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead"));
                                od = 0;
@@ -1052,7 +1052,7 @@ paper_block:
        output_def {
                 Output_def *od = Output_def::unsmob ($1);
 
-               if (od->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
+               if (!to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper"))))
                {
                        parser->parser_error (@1, _ ("need \\paper for paper block"));
                        $$ = get_paper (parser)->unprotect ();
@@ -2227,7 +2227,7 @@ lyric_mode_music:
 
 mode_changed_music:
        mode_changing_head grouped_music_list {
-               if ($1 == ly_symbol2scm ("chords"))
+               if (scm_is_eq ($1, ly_symbol2scm ("chords")))
                {
                  $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2);
                }
@@ -2243,7 +2243,7 @@ mode_changed_music:
                 if (ctxmod)
                         mods = ctxmod->get_mods ();
                $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3);
-               if ($1 == ly_symbol2scm ("ChordNames"))
+               if (scm_is_eq ($1, ly_symbol2scm ("ChordNames")))
                {
                  $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
                }