release: 1.1.1

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 55655080a320dfe6ab0d95f6c9698751ea96d806..bc0680a3010ba5927cf7b260accd248bd1c67bcd 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -17,8 +17,6 @@
 #include "script-def.hh"
 #include "symtable.hh"
 #include "lookup.hh"
-#include "ps-lookup.hh"
-#include "tex-lookup.hh"
 #include "misc.hh"
 #include "my-lily-lexer.hh"
 #include "paper-def.hh"
@@ -97,7 +95,6 @@ Paper_def* current_paper = 0;
 #define yyerror THIS->parser_error
 #define ARRAY_SIZE(a,s)   if (a.size () != s) THIS->parser_error (_f("expecting %d arguments", s))
 
-
 %}
 
 
@@ -329,7 +326,9 @@ toplevel_expression:
 
 embedded_scm:
        SCHEME STRING ';' {
-               gh_eval_str ($2->ch_C ());
+       #ifdef HAVE_LIBGUILE
+               gh_eval_str ($2->ch_l ());
+       #endif
                delete $2;
        };
 
@@ -359,7 +358,7 @@ notenames_body:
                $$ = new Notename_table;
        }
        | NOTENAME_TABLE_IDENTIFIER     {
-               $$ = $1-> access_Notename_table(true);
+               $$ = $1-> access_content_Notename_table(true);
        }
        | notenames_body STRING '=' explicit_musical_pitch {
                (*$$)[*$2] = *$4;
@@ -462,12 +461,12 @@ translator_spec:
 
 translator_spec_body:
        TRANS_IDENTIFIER        {
-               $$ = $1->access_Translator (true);
+               $$ = $1->access_content_Translator (true);
                $$-> set_spot (THIS->here_input ());
        }
        | TYPE STRING ';'       {
                Translator* t = get_translator_l (*$2);
-               Translator_group * tg = t->access_Translator_group ();
+               Translator_group * tg = dynamic_cast<Translator_group*> (t);
 
                if (!tg)
                        THIS->parser_error (_("Need a translator group for a context"));
@@ -479,14 +478,14 @@ translator_spec_body:
        }
        | translator_spec_body STRING '=' simple_identifier_init ';'    { 
                Identifier* id = $4;
-               String_identifier *s = id->access_String_identifier ();
-               Real_identifier *r= id->access_Real_identifier ();
-               int_identifier *i = id->access_int_identifier ();
+               String_identifier *s = dynamic_cast<String_identifier*> (id);
+               Real_identifier *r= dynamic_cast<Real_identifier*>(id);
+               int_identifier *i = dynamic_cast<int_identifier*> (id);
        
                String str;
-               if (s) str = *s->access_String (false); 
-               if (i) str = to_str (*i->access_int (false));
-               if (r) str = to_str (*r->access_Real (false));
+               if (s) str = *s->access_content_String (false); 
+               if (i) str = to_str (*i->access_content_int (false));
+               if (r) str = to_str (*r->access_content_Real (false));
                if (!s && !i && !r)
                        THIS->parser_error (_("Wrong type for property value"));
 
@@ -498,15 +497,15 @@ translator_spec_body:
                delete $3;
        }
        | translator_spec_body CONSISTS STRING ';' {
-               $$->access_Translator_group ()-> set_element (*$3, true);
+               dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
                delete $3;
        }
        | translator_spec_body ACCEPTS STRING ';' {
-               $$->access_Translator_group ()-> set_acceptor (*$3, true);
+               dynamic_cast<Translator_group*> ($$)-> set_acceptor (*$3, true);
                delete $3;
        }
        | translator_spec_body REMOVE STRING ';' {
-               $$->access_Translator_group ()-> set_element (*$3, false);
+               dynamic_cast<Translator_group*> ($$)-> set_element (*$3, false);
                delete $3;
        }
        ;
@@ -534,7 +533,7 @@ score_body:         {
                $$ = new Score;
        }
        | SCORE_IDENTIFIER {
-               $$ = $1->access_Score (true);
+               $$ = $1->access_content_Score (true);
        }
        | score_body mudela_header      {
                $$->header_p_ = $2;
@@ -594,12 +593,12 @@ paper_def_body:
                $$ = p;
        }
        | PAPER_IDENTIFIER optional_semicolon   {
-               Paper_def *p = $1->access_Paper_def (true);
+               Paper_def *p = $1->access_content_Paper_def (true);
                THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
                $$ = p;
        }
        | paper_def_body int '=' symtables              { // ugh, what a syntax
-               Lookup * l = global_lookup_l->lookup_p (*$4);
+               Lookup * l = new Lookup (*$4);
                $$->set_lookup ($2, l);
        }
        | paper_def_body assignment ';' {
@@ -644,7 +643,7 @@ real_expression:
        }
        | dimension
        | REAL_IDENTIFIER               {
-               $$= *$1->access_Real (false);
+               $$= *$1->access_content_Real (false);
        }
        | '-'  real_expression %prec UNARY_MINUS {
                $$ = -$2;
@@ -688,7 +687,7 @@ midi_body: /* empty */              {
                $$ = THIS->default_midi_p ();
        }
        | MIDI_IDENTIFIER       {
-               $$ = $1-> access_Midi_def (true);
+               $$ = $1-> access_content_Midi_def (true);
        }
        | midi_body translator_spec     {
                $$-> assign_translator ($2);
@@ -739,7 +738,7 @@ Simultaneous_music: '<' Music_list '>'      {
 
 Simple_music:
        request_chord           { $$ = $1; }
-       | MUSIC_IDENTIFIER { $$ = $1->access_Music (true); }
+       | MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); }
        | property_def
        | translator_change
        ;
@@ -852,7 +851,7 @@ abbrev_command_req:
                $$ = new Barcheck_req;
        }
        | COMMAND_IDENTIFIER    {
-               $$ = $1->access_Request (true);
+               $$ = $1->access_content_Request (true);
        }
 /*
        | '['           {
@@ -959,7 +958,7 @@ structured_post_request:
 
 post_request:
        POST_REQUEST_IDENTIFIER {
-               $$ = (Request*)$1->access_Request (true);
+               $$ = (Request*)$1->access_content_Request (true);
        }
        | dynamic_req {
                $$ = $1;
@@ -1227,10 +1226,10 @@ script_abbreviation:
        ;
 
 mudela_script:
-       SCRIPT_IDENTIFIER               { $$ = $1->access_General_script_def (true); }
+       SCRIPT_IDENTIFIER               { $$ = $1->access_content_General_script_def (true); }
        | script_definition             { $$ = $1; }
        | script_abbreviation           {
-               $$ = THIS->lexer_p_->lookup_identifier (*$1)->access_General_script_def (true);
+               $$ = THIS->lexer_p_->lookup_identifier (*$1)->access_content_General_script_def (true);
                delete $1;
        }
        ;
@@ -1300,7 +1299,7 @@ steno_duration:
                     }
        }
        | DURATION_IDENTIFIER   {
-               $$ = $1->access_Duration (true);
+               $$ = $1->access_content_Duration (true);
        }
        | steno_duration '.'    {
                $$->dots_i_ ++;
@@ -1397,7 +1396,7 @@ int:
                $$ = -$2;
        }
        | INT_IDENTIFIER        {
-               $$ = *$1->access_int (false);
+               $$ = *$1->access_content_int (false);
        }
        ;
 
@@ -1407,7 +1406,7 @@ string:
                $$ = $1;
        }
        | STRING_IDENTIFIER     {
-               $$ = $1->access_String (true);
+               $$ = $1->access_content_String (true);
        }
        | string '+' string {
                *$$ += *$3;
@@ -1429,7 +1428,7 @@ symtables_body:
                $$ = new Symtables;
        }
        | IDENTIFIER            {
-               $$ = $1->access_Symtables (true);
+               $$ = $1->access_content_Symtables (true);
        }
        | symtables_body FONT STRING            {
                $$->font_ = *$3;
@@ -1452,7 +1451,7 @@ symtable:
 symtable_body:
                                { $$ = new Symtable; }
        | symtable_body STRING  symboldef {
-               $$->add (*$2, *$3);
+               $$->elem (*$2) = *$3;
                delete $2;
                delete $3;
        }
@@ -1460,13 +1459,15 @@ symtable_body:
 
 symboldef:
        STRING unsigned box             {
-               $$ = global_lookup_l->atom_p (*$1, $2, *$3);
+               // ignore #args
+               $$ = new Atom (*$1, *$3);
                delete $1;
                delete $3;
        }
        | STRING unsigned {
                Box b (Interval (0,0), Interval (0,0));
-               $$ = global_lookup_l->atom_p (*$1, $2, b);
+               // ignore #args
+               $$ = new Atom (*$1, b);
                delete $1;
        }
        ;