release: 1.0.17

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 1c254c822725d2114e465f6bd0b01afad8faa150..bf82af8ec43a9a488f7f09be4dcb6fa5064444d3 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -10,7 +10,6 @@
 */
 
 #include <iostream.h>
-#include "lily-guile.hh"
 #include "notename-table.hh"
 #include "scalar.hh"
 #include "translation-property.hh"
@@ -196,7 +195,6 @@ yylex (YYSTYPE *s,  void * v_l)
 %token PT_T
 %token RELATIVE
 %token REMOVE
-%token SCHEME /* token vs typedef;  can't be named SCM */
 %token SCORE
 %token SCRIPT
 %token SHAPE
@@ -323,18 +321,8 @@ toplevel_expression:
                        Midi_def_identifier ($1, MIDI_IDENTIFIER);
                THIS->lexer_p_->set_identifier ("$defaultmidi", id)
        }
-       | embedded_scm { 
-       }
        ;
 
-embedded_scm:
-       SCHEME STRING ';' {
-       #ifdef HAVE_LIBGUILE
-               gh_eval_str ($2->ch_C ());
-       #endif
-               delete $2;
-       };
-
 check_version:
        VERSION STRING ';'              {
                Mudela_version ver (*$2);
@@ -1031,10 +1019,6 @@ steno_notepitch:
        | steno_notepitch  '!'          {
                $$->forceacc_b_ = ! $$->forceacc_b_;
        }
-       | steno_notepitch  '?'          {
-               $$->forceacc_b_ = ! $$->forceacc_b_;
-               $$->cautionary_b_ = ! $$->cautionary_b_;
-       }
        ;
 
 
@@ -1458,7 +1442,7 @@ symtable:
 symtable_body:
                                { $$ = new Symtable; }
        | symtable_body STRING  symboldef {
-               $$->add (*$2, *$3);
+               $$->elem (*$2) = *$3;
                delete $2;
                delete $3;
        }