vert. spacing: Rename properties (lily, scm).

[lilypond.git] / lily / lily-lexer.cc

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 5a34d60bbe5146bcd6a14c4d4b32057bbda2c7af..424259beea59b17d6e5e6d7e1d96664548cdf14d 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -295,9 +295,9 @@ Lily_lexer::set_identifier (SCM path, SCM val)
 
       if (scm_is_pair (path))
        {
-         SCM prev = scm_module_lookup (mod, sym);
-         if (prev != SCM_UNDEFINED)
-           val = nested_property_alist (prev, path, val);
+         SCM prev = ly_module_lookup (mod, sym);
+         if (prev != SCM_BOOL_F)
+           val = nested_property_alist (scm_variable_ref (prev), path, val);
        }
       scm_module_define (mod, sym, val);
     }
@@ -391,3 +391,9 @@ Lily_lexer::print_smob (SCM s, SCM port, scm_print_state*)
   scm_puts (" >", port);
   return 1;
 }
+
+bool
+Lily_lexer::is_clean () const
+{
+  return include_stack_.empty ();
+}