Release: bump version.

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 41e5080f9854651069dcf7c9ef0c798d0b318716..ac0d357f9a307831ddf95970f94ae9cc9dc74817 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -199,7 +199,6 @@ void set_music_properties (Music *p, SCM a);
 %token MIDI "\\midi"
 %token NAME "\\name"
 %token NOTEMODE "\\notemode"
-%token OBJECTID "\\objectid"
 %token OCTAVE "\\octave"
 %token ONCE "\\once"
 %token OVERRIDE "\\override"
@@ -429,7 +428,6 @@ If we give names, Bison complains.
 %type <scm> number_expression
 %type <scm> number_factor
 %type <scm> number_term
-%type <scm> object_id_setting
 %type <scm> octave_check
 %type <scm> optional_context_mod
 %type <scm> optional_id
@@ -478,10 +476,6 @@ lilypond:  /* empty */
        ;
 
 
-object_id_setting:
-       OBJECTID STRING { $$ = $2; }
-       ;
-
 toplevel_expression:
        lilypond_header {
                PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
@@ -748,9 +742,6 @@ book_body:
                $$->scores_ = SCM_EOL;
                $$->bookparts_ = SCM_EOL;
        }
-       | book_body object_id_setting {
-               $$->user_key_ = ly_scm2string ($2);
-       }
        ;
 
 bookpart_block:
@@ -802,9 +793,6 @@ bookpart_body:
                $$->paper_ = 0;
                $$->scores_ = SCM_EOL;
        }
-       | bookpart_body object_id_setting {
-               $$->user_key_ = ly_scm2string ($2);
-       }
        ;
 
 score_block:
@@ -829,9 +817,6 @@ score_body:
                $$->protect ();
                $$->origin ()->set_spot (@$);
        }
-       | score_body object_id_setting {
-               $$->user_key_ = ly_scm2string ($2);
-       }
        | score_body lilypond_header    {
                $$->set_header ($2);
        }
@@ -1092,7 +1077,7 @@ function_scm_argument:
        ;
 
 /* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence:
- MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM
+ MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS
 and this rule returns the reversed list of arguments. */
 
 function_arglist_music_last: