X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;fp=lily%2Fparser.yy;h=83e95491c292f82fb79d4a3439c0947806d86bc5;hb=9391b173e05e0752aadd10fad93f01edad33516c;hp=52fe450b7d8c3848f87796d30469ac8bcb0b51bc;hpb=3af0951f9a11677240efa6228683dd4fcea13eaf;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 52fe450b7d..83e95491c2 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -229,7 +229,7 @@ static Music *make_music_with_input (SCM name, Input where);
 SCM check_scheme_arg (Lily_parser *parser, Input loc,
 		      SCM arg, SCM args, SCM pred, SCM disp = SCM_UNDEFINED);
 SCM make_music_from_simple (Lily_parser *parser, Input loc, SCM pitch);
-SCM loc_on_music (Lily_parser *parser, Input loc, SCM arg);
+SCM loc_on_copy (Lily_parser *parser, Input loc, SCM arg);
 SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list);
 SCM make_chord_step (SCM step, Rational alter);
 SCM make_simple_markup (SCM a);
@@ -346,7 +346,6 @@ If we give names, Bison complains.
 %token BOOK_IDENTIFIER
 %token CHORD_MODIFIER
 %token CHORD_REPETITION
-%token CONTEXT_MOD_IDENTIFIER
 %token DRUM_PITCH
  /* Artificial token for durations in argument lists */
 %token DURATION_ARG
@@ -501,8 +500,8 @@ lookup:
 	LOOKUP_IDENTIFIER
 	| LOOKUP_IDENTIFIER '.' symbol_list_rev
 	{
-		$$ = loc_on_music (parser, @$,
-				   nested_property ($1, scm_reverse_x ($3, SCM_EOL)));
+		$$ = loc_on_copy (parser, @$,
+				  nested_property ($1, scm_reverse_x ($3, SCM_EOL)));
 	}
 	;
 
@@ -1494,14 +1493,6 @@ context_modification:
                 parser->lexer_->pop_state ();
                 $$ = $4;
         }
-        | WITH CONTEXT_MOD_IDENTIFIER
-        {
-                $$ = $2;
-        }
-        | CONTEXT_MOD_IDENTIFIER
-        {
-                $$ = $1;
-        }
 	| WITH context_modification_arg
 	{
 		if (unsmob<Music> ($2)) {
@@ -1511,7 +1502,10 @@ context_modification:
 		if (unsmob<Context_mod> ($2))
 			$$ = $2;
 		else {
-			parser->parser_error (@2, _ ("not a context mod"));
+			// let's permit \with #*unspecified* to go for
+			// an empty context mod
+			if (!scm_is_eq ($2, SCM_UNSPECIFIED))
+				parser->parser_error (@2, _ ("not a context mod"));
 			$$ = Context_mod ().smobbed_copy ();
 		}
 	}
@@ -1564,24 +1558,16 @@ context_mod_list:
 		if (!SCM_UNBNDP ($2))
 			unsmob<Context_mod> ($1)->add_context_mod ($2);
         }
-        | context_mod_list CONTEXT_MOD_IDENTIFIER {
-                 Context_mod *md = unsmob<Context_mod> ($2);
-                 if (md)
-                     unsmob<Context_mod> ($1)->add_context_mods (md->get_mods ());
-        }
 	| context_mod_list context_mod_arg {
-		if (scm_is_eq ($2, SCM_UNSPECIFIED))
-			;
-		else if (unsmob<Music> ($2)) {
+		if (unsmob<Music> ($2)) {
 			SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
 			$2 = scm_call_1 (proc, $2);
 		}
 		if (unsmob<Context_mod> ($2))
 			unsmob<Context_mod> ($$)->add_context_mods
 				(unsmob<Context_mod> ($2)->get_mods ());
-		else {
+		else if (!scm_is_eq ($2, SCM_UNSPECIFIED))
 			parser->parser_error (@2, _ ("not a context mod"));
-		}
         }
         ;
 
@@ -2006,7 +1992,7 @@ function_arglist_backup:
 				$$ = scm_cons ($$, $3);
 			else
 			{
-				$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+				$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 				MYBACKUP (SCM_ARG, $4, @4);
 			}
 		}
@@ -2017,7 +2003,7 @@ function_arglist_backup:
 		{
 			$$ = scm_cons ($4, $3);
 		} else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (EVENT_IDENTIFIER, $4, @4);
 		}
 	}
@@ -2033,7 +2019,7 @@ function_arglist_backup:
 		} else if (scm_is_true (scm_call_1 ($2, $4)))
 			$$ = scm_cons ($4, $3);
 		else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (PITCH_IDENTIFIER, $4, @4);
 		}
 	}
@@ -2049,7 +2035,7 @@ function_arglist_backup:
 		} else if (scm_is_true (scm_call_1 ($2, $4)))
 			$$ = scm_cons ($4, $3);
 		else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (TONICNAME_PITCH, $4, @4);
 		}
 	}
@@ -2058,7 +2044,7 @@ function_arglist_backup:
 		if (scm_is_true (scm_call_1 ($2, $4)))
 			$$ = scm_cons ($4, $3);
 		else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (SCM_IDENTIFIER, $4, @4);
 		}
 	}
@@ -2080,11 +2066,11 @@ function_arglist_backup:
 					  ($2, make_music_from_simple (parser, @4, d))))
 					MYREPARSE (@4, $2, DURATION_ARG, d);
 				else {
-					$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+					$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 					MYBACKUP (UNSIGNED, $4, @4);
 				}
 			} else {
-				$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+				$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 				MYBACKUP (UNSIGNED, $4, @4);
 			}
 		}
@@ -2096,7 +2082,7 @@ function_arglist_backup:
 			$$ = $3;
 			MYREPARSE (@4, $2, REAL, $4);
 		} else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (REAL, $4, @4);
 		}
 	}
@@ -2106,7 +2092,7 @@ function_arglist_backup:
 		{
 			$$ = scm_cons ($4, $3);
 		} else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (NUMBER_IDENTIFIER, $4, @4);
 		}
 	}
@@ -2123,7 +2109,7 @@ function_arglist_backup:
 			if (scm_is_true (scm_call_1 ($2, $$)))
 				$$ = scm_cons ($$, $3);
 			else {
-				$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+				$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 				MYBACKUP (UNSIGNED, $5, @5);
 				parser->lexer_->push_extra_token (@4, '-');
 			}
@@ -2136,7 +2122,7 @@ function_arglist_backup:
 			MYREPARSE (@5, $2, REAL, n);
 			$$ = $3;
 		} else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (REAL, n, @5);
 		}
 	}
@@ -2146,7 +2132,7 @@ function_arglist_backup:
 		if (scm_is_true (scm_call_1 ($2, n))) {
 			$$ = scm_cons (n, $3);
 		} else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (NUMBER_IDENTIFIER, n, @5);
 		}
 	}
@@ -2160,7 +2146,7 @@ function_arglist_backup:
 			  ($2, make_music_from_simple (parser, @4, $4))))
 			MYREPARSE (@4, $2, DURATION_ARG, $4);
 		else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (DURATION_IDENTIFIER, $4, @4);
 		}
 	}
@@ -2175,7 +2161,7 @@ function_arglist_backup:
 			else
 				$$ = scm_cons (res, $3);
 		else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (SCM_IDENTIFIER, $4, @4);
 		}
 	}
@@ -2190,7 +2176,7 @@ function_arglist_backup:
 			else
 				$$ = scm_cons (res, $3);
 		else {
-			$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+			$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 			MYBACKUP (STRING, $4, @4);
 		}
 	}
@@ -2229,7 +2215,7 @@ function_arglist:
 	function_arglist_nonbackup
 	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup DEFAULT
 	{
-		$$ = scm_cons (loc_on_music (parser, @4, $1), $3);
+		$$ = scm_cons (loc_on_copy (parser, @4, $1), $3);
 	}
 	;
 
@@ -2237,7 +2223,7 @@ function_arglist_skip_nonbackup:
 	function_arglist_nonbackup
 	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup
 	{
-		$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+		$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 	}
 	;
 
@@ -2497,7 +2483,7 @@ function_arglist_optional:
 	function_arglist_backup
 	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup DEFAULT
 	{
-		$$ = scm_cons (loc_on_music (parser, @4, $1), $3);
+		$$ = scm_cons (loc_on_copy (parser, @4, $1), $3);
 	}
 	| function_arglist_skip_backup BACKUP
 	;
@@ -2506,7 +2492,7 @@ function_arglist_skip_backup:
 	function_arglist_backup
 	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup
 	{
-		$$ = scm_cons (loc_on_music (parser, @3, $1), $3);
+		$$ = scm_cons (loc_on_copy (parser, @3, $1), $3);
 	}
 	;
 
@@ -2956,15 +2942,11 @@ event_chord:
 		}
 	} %prec ':'
 	| CHORD_REPETITION optional_notemode_duration post_events {
-		Input i;
-		i.set_location (@1, @3);
-		$$ = MAKE_SYNTAX (repetition_chord, i,
+		$$ = MAKE_SYNTAX (repetition_chord, @$,
 				  $2, scm_reverse_x ($3, SCM_EOL));
 	} %prec ':'
 	| MULTI_MEASURE_REST optional_notemode_duration post_events {
-		Input i;
-		i.set_location (@1, @3);
-		$$ = MAKE_SYNTAX (multi_measure_rest, i, $2,
+		$$ = MAKE_SYNTAX (multi_measure_rest, @$, $2,
 				  scm_reverse_x ($3, SCM_EOL));
 	} %prec ':'
 	| tempo_event
@@ -4088,7 +4070,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 		return SCM_IDENTIFIER;
         } else if (unsmob<Context_mod> (sid)) {
                 *destination = unsmob<Context_mod> (sid)->smobbed_copy ();
-                return CONTEXT_MOD_IDENTIFIER;
+                return SCM_IDENTIFIER;
 	} else if (Music *mus = unsmob<Music> (sid)) {
 		mus = mus->clone ();
 		*destination = mus->self_scm ();
@@ -4164,7 +4146,7 @@ SCM check_scheme_arg (Lily_parser *parser, Input loc,
 	return args;
 }
 
-SCM loc_on_music (Lily_parser *parser, Input loc, SCM arg)
+SCM loc_on_copy (Lily_parser *parser, Input loc, SCM arg)
 {
 	if (Music *m = unsmob<Music> (arg))
 	{
@@ -4172,6 +4154,34 @@ SCM loc_on_music (Lily_parser *parser, Input loc, SCM arg)
 		m->set_spot (parser->lexer_->override_input (loc));
 		return m->unprotect ();
 	}
+	if (Book *b = unsmob<Book> (arg))
+	{
+		b = b->clone ();
+		b->origin ()->set_spot (parser->lexer_->override_input (loc));
+		return b->unprotect ();
+	}
+	if (Context_def *cd = unsmob<Context_def> (arg))
+	{
+		cd = cd->clone ();
+		cd->origin ()->set_spot (parser->lexer_->override_input (loc));
+		return cd->unprotect ();
+	}
+	if (Output_def *od = unsmob<Output_def> (arg))
+	{
+		od = od->clone ();
+		od->input_origin_ = parser->lexer_->override_input (loc);
+		return od->unprotect ();
+	}
+	if (Score *s = unsmob<Score> (arg))
+	{
+		s = s->clone ();
+		s->origin ()->set_spot (parser->lexer_->override_input (loc));
+		return s->unprotect ();
+	}
+	if (Context_mod *cm = unsmob<Context_mod> (arg))
+	{
+		return cm->smobbed_copy ();
+	}
 	return arg;
 }