Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 7cfec596c8dff63ca7bdb5a63c3319b5020fb100..6db0e653e5480d224427df3488bd12ae5c1a3bb5 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -21,6 +21,7 @@
 
 #include <cctype>
 #include <sstream>
+using namespace std;
 
 #include "context.hh" // for nested_property_alist
 #include "international.hh"
@@ -36,8 +37,6 @@
 #include "lily-parser.hh"
 #include "ly-module.hh"
 
-using std::string;
-
 static Keyword_ent the_key_tab[]
 =
 {
@@ -286,6 +285,8 @@ Lily_lexer::set_identifier (SCM path, SCM val)
           SCM prev = ly_module_lookup (mod, sym);
           if (scm_is_true (prev))
             val = nested_property_alist (scm_variable_ref (prev), path, val);
+          else
+            val = nested_create_alist (path, val);
         }
       scm_module_define (mod, sym, val);
     }
@@ -368,7 +369,7 @@ Lily_lexer::add_lexed_char (int count)
 }
 
 
-const char Lily_lexer::type_p_name_[] = "ly:lily-lexer?";
+const char * const Lily_lexer::type_p_name_ = "ly:lily-lexer?";
 
 SCM
 Lily_lexer::mark_smob () const