*** empty log message ***

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 5acae67b8bf6c6b0110d821c7c0d52b72c1115d1..6accfaa91d9019604ac3716c1568ae6d18324c1e 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -31,6 +31,7 @@ static Keyword_ent the_key_tab[] = {
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"book", BOOK},
+  {"bookpaper", BOOKPAPER},
   {"change", CHANGE},
   {"chords", CHORDS},
   {"clef", CLEF},
@@ -84,7 +85,6 @@ static Keyword_ent the_key_tab[] = {
 
 
 My_lily_lexer::My_lily_lexer (Sources *sources)
-  
 {
   keytable_ = new Keyword_table (the_key_tab);
   encoding_ = SCM_EOL;
@@ -101,7 +101,7 @@ My_lily_lexer::My_lily_lexer (Sources *sources)
 My_lily_lexer::My_lily_lexer (My_lily_lexer const &src)
   : Includable_lexer ()
 {
-  keytable_ = src.keytable_;
+  keytable_ = new Keyword_table (*src.keytable_);
   encoding_ = src.encoding_;
   chordmodifier_tab_ = src.chordmodifier_tab_;
   pitchname_tab_stack_ = src.pitchname_tab_stack_;
@@ -111,6 +111,11 @@ My_lily_lexer::My_lily_lexer (My_lily_lexer const &src)
   main_input_b_ = src.main_input_b_;
 }
 
+My_lily_lexer::~My_lily_lexer ()
+{
+  delete keytable_;
+}
+
 SCM
 My_lily_lexer::encoding () const
 {
@@ -148,9 +153,8 @@ My_lily_lexer::lookup_keyword (String s)
 }
 
 SCM
-My_lily_lexer::lookup_identifier (String name)
+My_lily_lexer::lookup_identifier_symbol (SCM sym)
 {
-  SCM sym = ly_symbol2scm (name.to_str0 ());
   for (SCM s = scopes_; ly_c_pair_p (s); s = ly_cdr (s))
     {
       SCM var = ly_module_lookup (ly_car (s), sym);
@@ -161,13 +165,19 @@ My_lily_lexer::lookup_identifier (String name)
   return SCM_UNDEFINED;
 }
 
+SCM
+My_lily_lexer::lookup_identifier (String name)
+{
+  return lookup_identifier_symbol (ly_symbol2scm (name.to_str0 ()));
+}
+
 void
 My_lily_lexer::start_main_input ()
 {
   // yy_flex_debug = 1;
   new_input (main_input_name_, sources_);
   /* Do not allow \include in --safe-mode */
-  allow_includes_b_ = allow_includes_b_ && ! safe_global_b;
+  allow_includes_b_ = allow_includes_b_ && !safe_global_b;
 
   scm_module_define (ly_car (scopes_),
                     ly_symbol2scm ("input-file-name"),
@@ -177,22 +187,26 @@ My_lily_lexer::start_main_input ()
 void
 My_lily_lexer::set_identifier (SCM name, SCM s)
 {
-  assert (ly_c_string_p (name));
+  SCM sym = name;
+  if (ly_c_string_p (name))
+    sym =  scm_string_to_symbol (name);
   
-  if (lookup_keyword (ly_scm2string (name)) >= 0)
+  if (ly_c_symbol_p (sym))
     {
-      warning (_f ("Identifier name is a keyword: `%s'", SCM_STRING_CHARS (name)));
-    }
-
-  SCM sym = scm_string_to_symbol (name);
-  SCM mod = ly_car (scopes_);
+      if (lookup_keyword (ly_symbol2string (sym)) >= 0)
+       {
+         warning (_f ("Identifier name is a keyword: `%s'", SCM_SYMBOL_CHARS (sym)));
+       }
 
-  scm_module_define (mod, sym, s);
-}
+      SCM mod = ly_car (scopes_);
 
-My_lily_lexer::~My_lily_lexer ()
-{
-  delete keytable_;
+      scm_module_define (mod, sym, s);
+    }
+  
+  else
+    {
+      programming_error ("Identifier is not a symbol.");
+    }
 }