release: 0.1.9

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 1160b86af148ea0625f1ca443f478e5f9713f2da..857d364ede06983728cef17f530f3e72070876db 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -21,120 +21,128 @@
 #include "parseconstruct.hh"
 
 static Keyword_ent the_key_tab[]={
-    {"accepts", ACCEPTS},
-    {"alias", ALIAS},
-    {"bar", BAR},
-    {"cadenza", CADENZA},
-    {"clear", CLEAR},
-    {"clef", CLEF},
-    {"cm", CM_T},
-    {"consists", CONSISTS},
-    {"contains", CONTAINS},
-    {"duration", DURATIONCOMMAND},
-    {"absdynamic", ABSDYNAMIC},
-    {"group", GROUP},
-    {"hshift", HSHIFT},
-    {"id", ID},
-    {"in", IN_T},
-    {"requesttranslator", REQUESTTRANSLATOR},
-    {"lyric", LYRIC},
-    {"key", KEY},
-    {"melodic" , MELODIC},
-    {"melodic_request", MELODIC_REQUEST},
-    {"meter", METER},
-    {"midi", MIDI},
-    {"mm", MM_T},
-    {"multi", MULTI},
-    {"notenames", NOTENAMES},
-    {"octave", OCTAVECOMMAND},
-    {"output", OUTPUT},
-    {"partial", PARTIAL},
-    {"paper", PAPER},
-    {"plet", PLET},
-    {"pt", PT_T},
-    {"score", SCORE},
-    {"script", SCRIPT},
-    {"skip", SKIP},
-    {"staff", STAFF},
-    {"stem", STEM},
-    {"table", TABLE},
-    {"spandynamic", SPANDYNAMIC}, 
-    {"symboltables", SYMBOLTABLES},
-    {"tempo", TEMPO},
-    {"texid", TEXID},
-    {"textstyle", TEXTSTYLE},
-    {"transpose", TRANSPOSE},
-    {"version", VERSION},
-    {"grouping", GROUPING},
-    {0,0}
+  {"accepts", ACCEPTS},
+  {"alias", ALIAS},
+  {"bar", BAR},
+  {"cadenza", CADENZA},
+  {"clear", CLEAR},
+  {"clef", CLEF},
+  {"cm", CM_T},
+  {"consists", CONSISTS},
+  {"contains", CONTAINS},
+  {"duration", DURATION},
+  {"absdynamic", ABSDYNAMIC},
+  {"group", GROUP},
+  {"hshift", HSHIFT},
+  {"id", ID},
+  {"in", IN_T},
+  {"requesttranslator", REQUESTTRANSLATOR},
+  {"lyric", LYRIC},
+  {"key", KEY},
+  {"melodic" , MELODIC},
+  {"melodic_request", MELODIC_REQUEST},
+  {"meter", METER},
+  {"midi", MIDI},
+  {"mm", MM_T},
+  {"multi", MULTI},
+  {"header", HEADER},
+  {"notenames", NOTENAMES},
+  {"octave", OCTAVE},
+  {"output", OUTPUT},
+  {"partial", PARTIAL},
+  {"paper", PAPER},
+  {"plet", PLET},
+  {"pt", PT_T},
+  {"score", SCORE},
+  {"script", SCRIPT},
+  {"skip", SKIP},
+  {"staff", STAFF},
+  {"stem", STEM},
+  {"table", TABLE},
+  {"spandynamic", SPANDYNAMIC}, 
+  {"symboltables", SYMBOLTABLES},
+  {"tempo", TEMPO},
+  {"texid", TEXID},
+  {"textstyle", TEXTSTYLE},
+  {"transpose", TRANSPOSE},
+  {"version", VERSION},
+  {"grouping", GROUPING},
+  {0,0}
 };
 
 My_lily_lexer::My_lily_lexer()
 {
-    keytable_p_ = new Keyword_table (the_key_tab);
-    identifier_assoc_p_ = new Assoc<String, Identifier*>;
-    errorlevel_i_ = 0;
-    post_quotes_b_ = false;
-    note_tab_p_ = new Notename_table;
+  keytable_p_ = new Keyword_table (the_key_tab);
+  identifier_assoc_p_ = new Assoc<String, Identifier*>;
+  errorlevel_i_ = 0;
+  post_quotes_b_ = false;
+  note_tab_p_ = new Notename_table;
 }
 
 int
 My_lily_lexer::lookup_keyword (String s)
 {
-    return keytable_p_->lookup (s);
+  return keytable_p_->lookup (s);
 }
 
 Identifier*
 My_lily_lexer::lookup_identifier (String s)
 {
-    if (!identifier_assoc_p_->elt_b (s))
+  if (!identifier_assoc_p_->elt_b (s))
        return 0;
-    
-    return (*identifier_assoc_p_)[s];
+  
+  return (*identifier_assoc_p_)[s];
 }
 
 
 void
 My_lily_lexer::set_identifier (String name_str, Identifier*i)
 {
-    Identifier *old = lookup_identifier (name_str);
-    if  (old) {
+  Identifier *old = lookup_identifier (name_str);
+  if  (old) 
+    {
        old->warning( "redeclaration of \\" + name_str);
        delete old;
     }
-    (*identifier_assoc_p_)[name_str] = i;
+  (*identifier_assoc_p_)[name_str] = i;
 }
 
 My_lily_lexer::~My_lily_lexer()
 {
-    delete keytable_p_;
+  delete keytable_p_;
 
-    for (Assoc_iter<String,Identifier*>
-            ai (*identifier_assoc_p_); ai.ok(); ai++) {
+  for (Assoc_iter<String,Identifier*>
+            ai (*identifier_assoc_p_); ai.ok(); ai++) 
+              {
        DOUT << "deleting: " << ai.key()<<'\n';
        delete ai.val();
     }
-    delete note_tab_p_;
-    delete identifier_assoc_p_;
+  delete note_tab_p_;
+  delete identifier_assoc_p_;
 }
 void
 My_lily_lexer::print_declarations (bool init_b)const
 {
-    for (Assoc_iter<String,Identifier*> ai (*identifier_assoc_p_); ai.ok(); 
-        ai++) {
-       if (ai.val()->init_b_ == init_b) {
+  for (Assoc_iter<String,Identifier*> ai (*identifier_assoc_p_); ai.ok(); 
+        ai++) 
+          {
+       if (ai.val()->init_b_ == init_b) 
+         {
            DOUT << ai.key() << '=';
            ai.val()->print ();
-       }
+         }
     }
 }
 
 void
 My_lily_lexer::LexerError (char const *s)
 {
-    if (include_stack_.empty()) {
+  if (include_stack_.empty()) 
+    {
        *mlog << "error at EOF" << s << '\n';
-    } else {
+    }
+  else 
+    {
        errorlevel_i_ |= 1;
  
        Input spot (source_file_l(),here_ch_C());
@@ -146,18 +154,18 @@ My_lily_lexer::LexerError (char const *s)
 Melodic_req*
 My_lily_lexer::lookup_melodic_req_l (String s)
 {
-    return note_tab_p_->get_l (s);
+  return note_tab_p_->get_l (s);
 }
 
 void
 My_lily_lexer::add_notename (String s, Melodic_req *p)
 {
-    note_tab_p_->add (s,p);
+  note_tab_p_->add (s,p);
 }
 
 void
 My_lily_lexer::clear_notenames()
 {
-    delete note_tab_p_;
-    note_tab_p_ = new Notename_table;
+  delete note_tab_p_;
+  note_tab_p_ = new Notename_table;
 }