X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-lexer.cc;h=6db0e653e5480d224427df3488bd12ae5c1a3bb5;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=c58885a89542771b29cc503f8531d60033b52a29;hpb=5af7cd44435fd26fade6e700a3912630e1553a87;p=lilypond.git

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index c58885a895..6db0e653e5 100644
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -37,8 +37,6 @@ using namespace std;
 #include "lily-parser.hh"
 #include "ly-module.hh"
 
-using std::string;
-
 static Keyword_ent the_key_tab[]
 =
 {
@@ -287,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);
     }
@@ -369,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