Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

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

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 1c5931dfe90fa04234ca196044f015e9ac9943f5..ba6429c3ea2798344702178363f200071c0f73cc 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 #include <sstream>
 using namespace std;
 
-#include "context.hh"  // for nested_property_alist
+#include "context.hh" // for nested_property_alist
 #include "international.hh"
 #include "interval.hh"
 #include "keyword.hh"
@@ -37,7 +37,8 @@ using namespace std;
 #include "lily-parser.hh"
 
 static Keyword_ent the_key_tab[]
-= {
+=
+{
   {"accepts", ACCEPTS},
   {"addlyrics", ADDLYRICS},
   {"alias", ALIAS},
@@ -71,7 +72,6 @@ static Keyword_ent the_key_tab[]
   {"name", NAME},
   {"new", NEWCONTEXT},
   {"notemode", NOTEMODE},
-  {"objectid", OBJECTID},
   {"once", ONCE},
   {"override", OVERRIDE},
   {"paper", PAPER},
@@ -110,7 +110,7 @@ Lily_lexer::Lily_lexer (Sources *sources, Lily_parser *parser)
   chord_repetition_ = Chord_repetition ();
   smobify_self ();
 
-  add_scope (ly_make_anonymous_module (false));
+  add_scope (ly_make_module (false));
   push_note_state (scm_c_make_hash_table (0));
   chordmodifier_tab_ = scm_make_vector (scm_from_int (1), SCM_EOL);
 }
@@ -118,7 +118,7 @@ Lily_lexer::Lily_lexer (Sources *sources, Lily_parser *parser)
 Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser)
   : Includable_lexer ()
 {
-  parser_ = parser; 
+  parser_ = parser;
   keytable_ = (src.keytable_) ? new Keyword_table (*src.keytable_) : 0;
   chordmodifier_tab_ = src.chordmodifier_tab_;
   pitchname_tab_stack_ = src.pitchname_tab_stack_;
@@ -137,7 +137,7 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser)
   SCM *tail = &scopes;
   for (SCM s = src.scopes_; scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM newmod = ly_make_anonymous_module (false);
+      SCM newmod = ly_make_module (false);
       ly_module_copy (newmod, scm_car (s));
       *tail = scm_cons (newmod, SCM_EOL);
       tail = SCM_CDRLOC (*tail);
@@ -204,14 +204,14 @@ Lily_lexer::keyword_list () const
 {
   if (!keytable_)
     return SCM_EOL;
-  
+
   SCM l = SCM_EOL;
   SCM *tail = &l;
   for (vsize i = 0; i < keytable_->table_.size (); i++)
     {
       *tail = scm_acons (scm_from_locale_string (keytable_->table_[i].name_),
-                        scm_from_int (keytable_->table_[i].tokcode_),
-                        SCM_EOL);
+                         scm_from_int (keytable_->table_[i].tokcode_),
+                         SCM_EOL);
 
       tail = SCM_CDRLOC (*tail);
     }
@@ -226,7 +226,7 @@ Lily_lexer::lookup_identifier_symbol (SCM sym)
     {
       SCM var = ly_module_lookup (scm_car (s), sym);
       if (var != SCM_BOOL_F)
-       return scm_variable_ref (var);
+        return scm_variable_ref (var);
     }
 
   return SCM_UNDEFINED;
@@ -244,12 +244,11 @@ Lily_lexer::start_main_input ()
   yy_flex_debug = get_program_option ("debug-lexer");
   parser_->set_yydebug (get_program_option ("debug-parser"));
 
-  
   new_input (main_input_name_, sources_);
 
   scm_module_define (scm_car (scopes_),
-                    ly_symbol2scm ("input-file-name"),
-                    ly_string2scm (main_input_name_));
+                     ly_symbol2scm ("input-file-name"),
+                     ly_string2scm (main_input_name_));
 }
 
 void
@@ -288,19 +287,19 @@ Lily_lexer::set_identifier (SCM path, SCM val)
   if (scm_is_symbol (sym))
     {
       if (lookup_keyword (ly_symbol2string (sym)) >= 0)
-       {
-         string symstr = ly_symbol2string (sym);
-         warning (_f ("identifier name is a keyword: `%s'", symstr.c_str ()));
-       }
+        {
+          string symstr = ly_symbol2string (sym);
+          warning (_f ("identifier name is a keyword: `%s'", symstr.c_str ()));
+        }
 
       SCM mod = scm_car (scopes_);
 
       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);
     }
   else
@@ -311,7 +310,7 @@ void
 Lily_lexer::LexerError (char const *s)
 {
   if (include_stack_.empty ())
-    message (_f ("error at EOF: %s", s) + "\n");
+    non_fatal_error (s, _f ("%s:EOF", s));
   else
     {
       error_level_ |= 1;
@@ -320,6 +319,18 @@ Lily_lexer::LexerError (char const *s)
     }
 }
 
+void
+Lily_lexer::LexerWarning (char const *s)
+{
+  if (include_stack_.empty ())
+    warning (s, _f ("%s:EOF", s));
+  else
+    {
+      Input spot (*lexloc_);
+      spot.warning (s);
+    }
+}
+
 char
 Lily_lexer::escaped_char (char c) const
 {
@@ -358,7 +369,7 @@ Lily_lexer::add_lexed_char (int count)
 {
   char const *start = here_str0 ();
   lexloc_->set (get_source_file (),
-               start, start + count);
+                start, start + count);
   char_count_stack_.back () += count;
 }
 
@@ -372,7 +383,7 @@ SCM
 Lily_lexer::mark_smob (SCM s)
 {
   ASSERT_LIVE_IS_ALLOWED ();
-  
+
   Lily_lexer *lexer = (Lily_lexer *) SCM_CELL_WORD_1 (s);
 
   scm_gc_mark (lexer->chordmodifier_tab_);
@@ -384,7 +395,7 @@ Lily_lexer::mark_smob (SCM s)
 }
 
 int
-Lily_lexer::print_smob (SCM s, SCM port, scm_print_state*)
+Lily_lexer::print_smob (SCM s, SCM port, scm_print_state *)
 {
   Lily_lexer *lexer = Lily_lexer::unsmob (s);
 
@@ -393,3 +404,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 ();
+}