X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-lexer.cc;h=71533da70097be00cee89644726d26e5d2e21d7e;hb=53da8b7d3773da804e79fd455d168efd9475d2f9;hp=d3673f2cdfbbea141d3edf80b56727be4285953f;hpb=3512d06cb313bff12be668f53f179aba450d5a0a;p=lilypond.git

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index d3673f2cdf..71533da700 100644
--- 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--2012 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
@@ -37,7 +37,8 @@ using namespace std;
 #include "lily-parser.hh"
 
 static Keyword_ent the_key_tab[]
-= {
+=
+{
   {"accepts", ACCEPTS},
   {"addlyrics", ADDLYRICS},
   {"alias", ALIAS},
@@ -57,25 +58,19 @@ static Keyword_ent the_key_tab[]
   {"drums", DRUMS},
   {"figuremode", FIGUREMODE},
   {"figures", FIGURES},
-  {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
-  {"key", KEY},
   {"layout", LAYOUT},
   {"lyricmode", LYRICMODE},
   {"lyrics", LYRICS},
   {"lyricsto", LYRICSTO},
-  {"mark", MARK},
   {"markup", MARKUP},
-  {"markuplines", MARKUPLINES},
+  {"markuplist", MARKUPLIST},
   {"midi", MIDI},
   {"name", NAME},
   {"new", NEWCONTEXT},
   {"notemode", NOTEMODE},
-  {"once", ONCE},
   {"override", OVERRIDE},
   {"paper", PAPER},
-  {"partial", PARTIAL},
-  {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
   {"rest", REST},
@@ -84,11 +79,7 @@ static Keyword_ent the_key_tab[]
   {"sequential", SEQUENTIAL},
   {"set", SET},
   {"simultaneous", SIMULTANEOUS},
-  {"skip", SKIP},
   {"tempo", TEMPO},
-  {"time", TIME_T},
-  {"times", TIMES},
-  {"transpose", TRANSPOSE},
   {"type", TYPE},
   {"unset", UNSET},
   {"with", WITH},
@@ -106,11 +97,11 @@ Lily_lexer::Lily_lexer (Sources *sources, Lily_parser *parser)
   error_level_ = 0;
   is_main_input_ = false;
   start_module_ = SCM_EOL;
-  chord_repetition_ = Chord_repetition ();
+  extra_tokens_ = SCM_EOL;
   smobify_self ();
 
-  add_scope (ly_make_anonymous_module (false));
-  push_note_state (scm_c_make_hash_table (0));
+  add_scope (ly_make_module (false));
+  push_note_state (SCM_EOL);
   chordmodifier_tab_ = scm_make_vector (scm_from_int (1), SCM_EOL);
 }
 
@@ -123,12 +114,12 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser)
   pitchname_tab_stack_ = src.pitchname_tab_stack_;
   sources_ = src.sources_;
   start_module_ = SCM_EOL;
-  chord_repetition_ = src.chord_repetition_;
 
-  error_level_ = src.error_level_;
+  error_level_ = 0;
   is_main_input_ = src.is_main_input_;
 
   scopes_ = SCM_EOL;
+  extra_tokens_ = SCM_EOL;
 
   smobify_self ();
 
@@ -136,14 +127,14 @@ 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);
     }
 
   scopes_ = scopes;
-  push_note_state (scm_c_make_hash_table (0));
+  push_note_state (SCM_EOL);
 }
 
 Lily_lexer::~Lily_lexer ()
@@ -209,8 +200,8 @@ Lily_lexer::keyword_list () const
   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);
     }
@@ -225,7 +216,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;
@@ -246,8 +237,8 @@ Lily_lexer::start_main_input ()
   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
@@ -286,19 +277,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
@@ -309,7 +300,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;
@@ -318,6 +309,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
 {
@@ -356,7 +359,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;
 }
 
@@ -369,7 +372,7 @@ IMPLEMENT_DEFAULT_EQUAL_P (Lily_lexer);
 SCM
 Lily_lexer::mark_smob (SCM s)
 {
-  ASSERT_LIVE_IS_ALLOWED ();
+  ASSERT_LIVE_IS_ALLOWED (s);
 
   Lily_lexer *lexer = (Lily_lexer *) SCM_CELL_WORD_1 (s);
 
@@ -378,11 +381,12 @@ Lily_lexer::mark_smob (SCM s)
     scm_gc_mark (lexer->parser_->self_scm ());
   scm_gc_mark (lexer->pitchname_tab_stack_);
   scm_gc_mark (lexer->start_module_);
+  scm_gc_mark (lexer->extra_tokens_);
   return lexer->scopes_;
 }
 
 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);
 
@@ -391,3 +395,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 ();
+}