X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=4b063960d66e6d16b486c03a1098d1641da05414;hb=b6ed8ebe95052d3d6cc819b6568cbaa4f0ad5804;hp=27dab5852ec78873f84637b9353f36928a12fb5c;hpb=70cc6f11795ab109dbe39c608be9bbe6ea95ced0;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 27dab5852e..4b063960d6 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -332,7 +332,6 @@ If we give names, Bison complains.
 %token BOOK_IDENTIFIER
 %token CHORD_MODIFIER
 %token CHORD_REPETITION
-%token CONTEXT_DEF_IDENTIFIER
 %token CONTEXT_MOD_IDENTIFIER
 %token DRUM_PITCH
 %token PITCH_IDENTIFIER
@@ -349,7 +348,6 @@ If we give names, Bison complains.
 %token MUSIC_IDENTIFIER
 %token NOTENAME_PITCH
 %token NUMBER_IDENTIFIER
-%token OUTPUT_DEF_IDENTIFIER
 %token REAL
 %token RESTNAME
 %token SCM_ARG
@@ -676,9 +674,14 @@ identifier_init_nonumber:
 
 context_def_spec_block:
 	CONTEXT '{' context_def_spec_body '}'
-		{
+	{
 		$$ = $3;
-		unsmob_context_def ($$)->origin ()->set_spot (@$);
+		Context_def *td = unsmob_context_def ($$);
+		if (!td) {
+			$$ = Context_def::make_scm ();
+			td = unsmob_context_def ($$);
+		}
+		td->origin ()->set_spot (@$);
 	}
 	;
 
@@ -696,47 +699,54 @@ context_mod_arg:
 	}
 	;
 
-context_mod_embedded:
-	context_mod_arg
-	{
-		if (unsmob_music ($1)) {
-			SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
-			$1 = scm_call_2 (proc, parser->self_scm (), $1);
-		}
-		if (unsmob_context_mod ($1))
-			$$ = $1;
-		else {
-			parser->parser_error (@1, _ ("not a context mod"));
-			$$ = Context_mod ().smobbed_copy ();
-		}
-	}
-	;
-
 
 context_def_spec_body:
 	/**/ {
-		$$ = Context_def::make_scm ();
-	}
-	| CONTEXT_DEF_IDENTIFIER {
-		$$ = $1;
+		$$ = SCM_UNSPECIFIED;
 	}
 	| context_def_spec_body context_mod {
-		if (!SCM_UNBNDP ($2))
+		if (!SCM_UNBNDP ($2)) {
+			Context_def *td = unsmob_context_def ($$);
+			if (!td) {
+				$$ = Context_def::make_scm ();
+				td = unsmob_context_def ($$);
+			}
 			unsmob_context_def ($$)->add_context_mod ($2);
+		}
 	}
 	| context_def_spec_body context_modification {
                 Context_def *td = unsmob_context_def ($$);
+		if (!td) {
+			$$ = Context_def::make_scm ();
+			td = unsmob_context_def ($$);
+		}
                 SCM new_mods = unsmob_context_mod ($2)->get_mods ();
                 for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) {
                     td->add_context_mod (scm_car (m));
                 }
 	}
-	| context_def_spec_body context_mod_embedded {
-                Context_def *td = unsmob_context_def ($$);
-                SCM new_mods = unsmob_context_mod ($2)->get_mods ();
-                for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) {
-                    td->add_context_mod (scm_car (m));
-                }
+	| context_def_spec_body context_mod_arg {
+		Context_def *td = unsmob_context_def ($1);
+		if (scm_is_eq ($2, SCM_UNSPECIFIED))
+			;
+		else if (!td && unsmob_context_def ($2))
+			$$ = $2;
+		else {
+			if (!td) {
+				$$ = Context_def::make_scm ();
+				td = unsmob_context_def ($$);
+			}
+			if (unsmob_music ($2)) {
+				SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
+				$2 = scm_call_2 (proc, parser->self_scm (), $2);
+			}
+			if (Context_mod *cm = unsmob_context_mod ($2)) {
+				for (SCM m = cm->get_mods (); scm_is_pair (m); m = scm_cdr (m)) {
+					td->add_context_mod (scm_car (m));
+				}
+			} else
+				parser->parser_error (@2, _ ("not a context mod"));
+		}
 	}
 	;
 
@@ -1008,7 +1018,8 @@ paper_block:
 
 output_def:
 	output_def_body '}' {
-		$$ = $1;
+		if (scm_is_pair ($1))
+			$$ = scm_car ($1);
 
 		parser->lexer_->remove_scope ();
 		parser->lexer_->pop_state ();
@@ -1054,24 +1065,56 @@ music_or_context_def:
 
 output_def_body:
 	output_def_head_with_mode_switch '{' {
-		$$ = $1;
-		unsmob_output_def ($$)->input_origin_.set_spot (@$);
-	}
-	| output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER 	{
-		Output_def *o = unsmob_output_def ($3);
-		o->input_origin_.set_spot (@$);
-		$$ = o->self_scm ();
-		parser->lexer_->remove_scope ();
-		parser->lexer_->add_scope (o->scope_);
+		unsmob_output_def ($1)->input_origin_.set_spot (@$);
+		// This is a stupid trick to mark the beginning of the
+		// body for deciding whether to allow
+		// embedded_scm_active to have an output definition
+		$$ = scm_list_1 ($1);
 	}
 	| output_def_body assignment  {
-
+		if (scm_is_pair ($1))
+			$$ = scm_car ($1);
 	}
-	| output_def_body embedded_scm  {
-
+	| output_def_body embedded_scm_active
+	{
+		// We don't switch into note mode for Scheme functions
+		// here.  Does not seem warranted/required in output
+		// definitions.
+		if (scm_is_pair ($1))
+		{
+			Output_def *o = unsmob_output_def ($2);
+			if (o) {
+				o->input_origin_.set_spot (@$);
+				$1 = o->self_scm ();
+				parser->lexer_->remove_scope ();
+				parser->lexer_->add_scope (o->scope_);
+				$2 = SCM_UNSPECIFIED;
+			} else
+				$1 = scm_car ($1);
+		}
+		if (unsmob_context_def ($2))
+			assign_context_def (unsmob_output_def ($1), $2);
+		// Seems unlikely, but let's be complete:
+		else if (unsmob_music ($2))
+		{
+			SCM proc = parser->lexer_->lookup_identifier
+				("output-def-music-handler");
+			scm_call_3 (proc, parser->self_scm (),
+				    $1, $2);
+		} else if (!scm_is_eq ($2, SCM_UNSPECIFIED))
+			parser->parser_error (@2, _("bad expression type"));
+		$$ = $1;
+	}
+	| output_def_body SCM_TOKEN {
+		if (scm_is_pair ($1))
+			$$ = scm_car ($1);
+		// Evaluate and ignore #xxx, as opposed to \xxx
+		parser->lexer_->eval_scm_token ($2, @2);
 	}
 	| output_def_body
 	{
+		if (scm_is_pair ($1))
+			$1 = scm_car ($1);
 		SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
 		parser->lexer_->push_note_state (nn);
 	} music_or_context_def
@@ -1086,6 +1129,7 @@ output_def_body:
 			scm_call_3 (proc, parser->self_scm (),
 				    $1, $3);
 		}
+		$$ = $1;
 	}
 	| output_def_body error {
 
@@ -1299,9 +1343,19 @@ context_mod_list:
                  if (md)
                      unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
         }
-	| context_mod_list context_mod_embedded {
-		unsmob_context_mod ($1)->add_context_mods
-			(unsmob_context_mod ($2)->get_mods ());
+	| context_mod_list context_mod_arg {
+		if (scm_is_eq ($2, SCM_UNSPECIFIED))
+			;
+		else if (unsmob_music ($2)) {
+			SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
+			$2 = scm_call_2 (proc, parser->self_scm (), $2);
+		}
+		if (unsmob_context_mod ($2))
+			unsmob_context_mod ($$)->add_context_mods
+				(unsmob_context_mod ($2)->get_mods ());
+		else {
+			parser->parser_error (@2, _ ("not a context mod"));
+		}
         }
         ;
 
@@ -2025,6 +2079,23 @@ optional_id:
 	}
 	;
 
+// We must not have lookahead tokens parsed in lyric mode.  In order
+// to save confusion, we take almost the same set as permitted with
+// \lyricmode and/or \lyrics.  However, music identifiers are also
+// allowed, and they obviously do not require switching into lyrics
+// mode for parsing.
+
+lyric_mode_music:
+	{
+		parser->lexer_->push_lyric_state ();
+	} grouped_music_list
+	{
+		parser->lexer_->pop_state ();
+		$$ = $2;
+	}
+	| MUSIC_IDENTIFIER
+	;
+
 complex_music:
 	music_function_call
 	| repeated_music		{ $$ = $1; }
@@ -2137,20 +2208,11 @@ mode_changing_head_with_context:
 	;
 
 new_lyrics:
-	ADDLYRICS { parser->lexer_->push_lyric_state (); }
-	/*cont */
-	composite_music {
-	/* Can also use music at the expensive of two S/Rs similar to
-           \repeat \alternative */
-		parser->lexer_->pop_state ();
-
-		$$ = scm_cons ($3, SCM_EOL);
+	ADDLYRICS lyric_mode_music {
+		$$ = scm_list_1 ($2);
 	}
-	| new_lyrics ADDLYRICS {
-		parser->lexer_->push_lyric_state ();
-	} composite_music {
-		parser->lexer_->pop_state ();
-		$$ = scm_cons ($4, $1);
+	| new_lyrics ADDLYRICS lyric_mode_music {
+		$$ = scm_cons ($3, $1);
 	}
 	;
 
@@ -2158,11 +2220,8 @@ re_rhythmed_music:
 	composite_music new_lyrics {
 		$$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
 	} %prec COMPOSITE
-	| LYRICSTO simple_string {
-		parser->lexer_->push_lyric_state ();
-	} music {
-		parser->lexer_->pop_state ();
-		$$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $4);
+	| LYRICSTO simple_string lyric_mode_music {
+		$$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $3);
 	}
 	;
 
@@ -2947,12 +3006,16 @@ dots:
 
 tremolo_type:
 	':'	{
-		$$ = SCM_INUM0;
+		$$ = scm_from_int (parser->default_tremolo_type_);
 	}
 	| ':' UNSIGNED {
-		if (SCM_UNBNDP (make_duration ($2)))
+		if (SCM_UNBNDP (make_duration ($2))) {
 			parser->parser_error (@2, _ ("not a duration"));
-		$$ = $2;
+			$$ = scm_from_int (parser->default_tremolo_type_);
+		} else {
+			$$ = $2;
+			parser->default_tremolo_type_ = scm_to_int ($2);
+		}
 	}
 	;
 
@@ -3571,16 +3634,12 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 	} else if (scm_is_number (sid)) {
 		*destination = sid;
 		return NUMBER_IDENTIFIER;
-        } else if (unsmob_context_def (sid)) {
-                Context_def *def= unsmob_context_def (sid)->clone ();
-
-                *destination = def->self_scm ();
-                def->unprotect ();
-
-                return CONTEXT_DEF_IDENTIFIER;
+	} else if (unsmob_context_def (sid))
+	{
+		*destination = unsmob_context_def (sid)->clone ()->unprotect ();
+		return SCM_IDENTIFIER;
         } else if (unsmob_context_mod (sid)) {
                 *destination = unsmob_context_mod (sid)->smobbed_copy ();
-
                 return CONTEXT_MOD_IDENTIFIER;
 	} else if (Music *mus = unsmob_music (sid)) {
 		mus = mus->clone ();
@@ -3595,12 +3654,8 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 		*destination = unsmob_duration (sid)->smobbed_copy ();
 		return DURATION_IDENTIFIER;
 	} else if (unsmob_output_def (sid)) {
-		Output_def *p = unsmob_output_def (sid);
-		p = p->clone ();
-
-		*destination = p->self_scm ();
-		p->unprotect ();
-		return OUTPUT_DEF_IDENTIFIER;
+		*destination = unsmob_output_def (sid)->clone ()->unprotect ();
+		return SCM_IDENTIFIER;
 	} else if (unsmob_score (sid)) {
 		*destination = unsmob_score (sid)->clone ()->unprotect ();
 		return SCM_IDENTIFIER;