*** empty log message ***

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

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index f65ffeeb0c15e5d300108a8b1d8f728274ea7f6d..559d5340a3af0ef9117fcc00e242d863018c71d1 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -6,23 +6,19 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <ctype.h>
+#include "lily-lexer.hh"
+
+#include <cctype>
 #include <sstream>
 
-#include "lily-proto.hh"
 #include "scm-hash.hh"
 #include "interval.hh"
-#include "lily-guile.hh"
 #include "parser.hh"
 #include "keyword.hh"
-#include "lily-lexer.hh"
 #include "warn.hh"
 #include "source-file.hh"
 #include "main.hh"
-#include "input.hh"
 #include "moment.hh"
-#include "ly-module.hh"
-
 
 static Keyword_ent the_key_tab[] = {
   {"accepts", ACCEPTS},
@@ -32,7 +28,6 @@ static Keyword_ent the_key_tab[] = {
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"book", BOOK},
-  {"bookpaper", BOOKPAPER},
   {"change", CHANGE},
   {"chords", CHORDS},
   {"chordmode", CHORDMODE},
@@ -49,6 +44,7 @@ static Keyword_ent the_key_tab[] = {
   {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
   {"key", KEY},
+  {"layout", LAYOUT},
   {"lyricmode", LYRICMODE},
   {"lyricsto", LYRICSTO},
   {"lyrics", LYRICS},
@@ -57,13 +53,13 @@ static Keyword_ent the_key_tab[] = {
   {"midi", MIDI},
   {"name", NAME},
   {"new", NEWCONTEXT},
+  {"objectid", OBJECTID},
   {"notemode", NOTEMODE},
   {"octave", OCTAVE},
   {"once", ONCE},
   {"override", OVERRIDE},
   {"paper", PAPER},
   {"partial", PARTIAL},
-  {"quote", QUOTE},
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
@@ -90,13 +86,12 @@ static Keyword_ent the_key_tab[] = {
 Lily_lexer::Lily_lexer (Sources *sources)
 {
   keytable_ = new Keyword_table (the_key_tab);
-  encoding_ = SCM_EOL;
   chordmodifier_tab_ = SCM_EOL;
   pitchname_tab_stack_ = SCM_EOL; 
   sources_ = sources;
   scopes_ = SCM_EOL;
   error_level_ = 0; 
-  main_input_b_ = false;
+  is_main_input_ = false;
 
   smobify_self ();
   
@@ -109,13 +104,12 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src)
   : Includable_lexer ()
 {
   keytable_ = (src.keytable_) ? new Keyword_table (*src.keytable_) : 0;
-  encoding_ = src.encoding_;
   chordmodifier_tab_ = src.chordmodifier_tab_;
   pitchname_tab_stack_ = src.pitchname_tab_stack_;
   sources_ = src.sources_;
   
   error_level_ = src.error_level_; 
-  main_input_b_ = src.main_input_b_;
+  is_main_input_ = src.is_main_input_;
 
   scopes_ = SCM_EOL;
   
@@ -123,10 +117,10 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src)
   
   SCM scopes = SCM_EOL;
   SCM *tail = &scopes;
-  for (SCM s = src.scopes_; ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s = src.scopes_; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM newmod = ly_make_anonymous_module (false);
-      ly_import_module (newmod, ly_car (s));
+      ly_module_copy (newmod, scm_car (s));
       *tail = scm_cons (newmod, SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }
@@ -140,21 +134,14 @@ Lily_lexer::~Lily_lexer ()
   delete keytable_;
 }
 
-SCM
-Lily_lexer::encoding () const
-{
-  return encoding_ ;
-}
-
-
 void
 Lily_lexer::add_scope (SCM module)
 {
   ly_reexport_module (scm_current_module ());
   scm_set_current_module (module);
-  for (SCM s = scopes_; ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s = scopes_; scm_is_pair (s); s = scm_cdr (s))
     {
-      ly_use_module (module, ly_car (s));
+      ly_use_module (module, scm_car (s));
     }
   scopes_ = scm_cons (module, scopes_);
 }
@@ -162,9 +149,9 @@ Lily_lexer::add_scope (SCM module)
 SCM
 Lily_lexer::remove_scope ()
 {
-  SCM sc = ly_car (scopes_);
-  scopes_ = ly_cdr (scopes_);
-  scm_set_current_module (ly_car (scopes_));
+  SCM sc = scm_car (scopes_);
+  scopes_ = scm_cdr (scopes_);
+  scm_set_current_module (scm_car (scopes_));
 
   return sc;
 }
@@ -179,9 +166,9 @@ Lily_lexer::lookup_keyword (String s)
 SCM
 Lily_lexer::lookup_identifier_symbol (SCM sym)
 {
-  for (SCM s = scopes_; ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s = scopes_; scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM var = ly_module_lookup (ly_car (s), sym);
+      SCM var = ly_module_lookup (scm_car (s), sym);
       if (var != SCM_BOOL_F)
        return scm_variable_ref (var);
     }
@@ -202,9 +189,9 @@ Lily_lexer::start_main_input ()
   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_ && !be_safe_global;
 
-  scm_module_define (ly_car (scopes_),
+  scm_module_define (scm_car (scopes_),
                     ly_symbol2scm ("input-file-name"),
                     scm_makfrom0str (main_input_name_.to_str0 ()));
 }
@@ -224,7 +211,7 @@ Lily_lexer::set_identifier (SCM name, SCM s)
          warning (_f ("Identifier name is a keyword: `%s'", symstr.to_str0()));
        }
 
-      SCM mod = ly_car (scopes_);
+      SCM mod = scm_car (scopes_);
 
       scm_module_define (mod, sym, s);
     }
@@ -242,7 +229,7 @@ Lily_lexer::LexerError (char const *s)
   else
     {
       error_level_ |= 1;
-      Input spot (get_source_file (), here_str0 ());
+      Input spot (*lexloc);
       spot.error (s);
     }
 }
@@ -267,8 +254,7 @@ Lily_lexer::escaped_char (char c) const
 Input
 Lily_lexer::here_input () const
 {
-  Source_file * f= get_source_file ();
-  return Input (f, (char*)here_str0 ());
+  return Input(*lexloc);
 }
 
 void
@@ -277,15 +263,20 @@ Lily_lexer::prepare_for_next_token ()
   last_input_ = here_input ();
 }
 
+/**
+  Since we don't create the buffer state from the bytes directly, we
+  don't know about the location of the lexer. Add this as a
+  YY_USER_ACTION */
 void
-Lily_lexer::set_encoding (String s)
+Lily_lexer::add_lexed_char (int count)
 {
-  if (s.length ())
-    encoding_ = ly_symbol2scm (s.to_str0 ());
-  else
-    encoding_ = SCM_EOL;
+  lexloc->source_file_ = get_source_file ();
+  lexloc->start_ = here_str0 ();
+  lexloc->end_ = lexloc->start_ + count;
+  char_count_stack_.top () += count;
 }
 
+
 #include "ly-smobs.icc"
 
 IMPLEMENT_SMOBS (Lily_lexer);
@@ -295,12 +286,11 @@ IMPLEMENT_DEFAULT_EQUAL_P (Lily_lexer);
 SCM
 Lily_lexer::mark_smob (SCM s)
 {
-  Lily_lexer *lexer = (Lily_lexer*) ly_cdr (s);
+  Lily_lexer *lexer = (Lily_lexer*) SCM_CELL_WORD_1 (s);
 
   scm_gc_mark (lexer->chordmodifier_tab_);
   scm_gc_mark (lexer->pitchname_tab_stack_);
-  scm_gc_mark (lexer->scopes_);
-  return lexer->encoding_;
+  return lexer->scopes_;
 }
 
 int