X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=9e257060ae3451dd02ea78de9c80b396e5f430ab;hb=2a984a02e2d85732e92eb1fd95cc0a73fc40c60d;hp=fec7bd8820b45795a589a3a4a17805b542ebddc7;hpb=cc5bab1baaba3259adb5452be429891bc3c08696;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index fec7bd8820..9e257060ae 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -81,7 +81,7 @@ or
 %left ADDLYRICS
 
 %right ':' UNSIGNED REAL E_UNSIGNED EVENT_IDENTIFIER EVENT_FUNCTION '^' '_'
-       HYPHEN EXTENDER DURATION_IDENTIFIER
+       HYPHEN EXTENDER DURATION_IDENTIFIER '!'
 
  /* The above are needed for collecting tremoli and other items (that
     could otherwise be interpreted as belonging to the next function
@@ -146,32 +146,36 @@ Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const str
 	parser->parser_error (*i, s);
 }
 
+// The following are somewhat precarious constructs as they may change
+// the value of the lookahead token.  That implies that the lookahead
+// token must not yet have made an impact on the state stack other
+// than causing the reduction of the current rule, or switching the
+// lookahead token while Bison is mulling it over will cause trouble.
+
 #define MYBACKUP(Token, Value, Location)				\
-do									\
-	if (yychar == YYEMPTY)						\
-	{								\
+	do {								\
+		if (yychar != YYEMPTY)					\
+			parser->lexer_->push_extra_token		\
+				(yylloc, yychar, yylval);		\
 		if (Token)						\
-			parser->lexer_->push_extra_token (Token, Value); \
-		parser->lexer_->push_extra_token (BACKUP);		\
-	} else {							\
-		parser->parser_error					\
-			(Location, _("Too much lookahead"));		\
-	}								\
-while (0)
+			parser->lexer_->push_extra_token		\
+				(Location, Token, Value);		\
+		parser->lexer_->push_extra_token (Location, BACKUP);	\
+		yychar = YYEMPTY;					\
+	} while (0)
 
 
 #define MYREPARSE(Location, Pred, Token, Value)				\
-do									\
-	if (yychar == YYEMPTY)						\
-	{								\
-		parser->lexer_->push_extra_token (Token, Value);	\
-		parser->lexer_->push_extra_token (REPARSE,		\
-						  Pred);		\
-	} else {							\
-		parser->parser_error					\
-			(Location, _("Too much lookahead"));		\
-	}								\
-while (0)
+	do {								\
+		if (yychar != YYEMPTY)					\
+			parser->lexer_->push_extra_token		\
+				(yylloc, yychar, yylval);		\
+		parser->lexer_->push_extra_token			\
+			(Location, Token, Value);			\
+		parser->lexer_->push_extra_token			\
+			(Location, REPARSE, Pred);			\
+		yychar = YYEMPTY;					\
+	} while (0)
 
 %}
 
@@ -333,6 +337,7 @@ If we give names, Bison complains.
 %token CONTEXT_MOD_IDENTIFIER
 %token DRUM_PITCH
 %token PITCH_IDENTIFIER
+%token PITCH_ARG
 %token DURATION_IDENTIFIER
 %token EVENT_IDENTIFIER
 %token EVENT_FUNCTION
@@ -406,6 +411,13 @@ toplevel_expression:
 		SCM proc = parser->lexer_->lookup_identifier ("toplevel-bookpart-handler");
 		scm_call_2 (proc, parser->self_scm (), $1);
 	}
+	| BOOK_IDENTIFIER {
+		SCM proc = parser->lexer_->lookup_identifier
+			(unsmob_book($1)->paper_
+			 ? "toplevel-book-handler"
+			 : "toplevel-bookpart-handler");
+		scm_call_2 (proc, parser->self_scm (), $1);
+	}
 	| score_block {
 		SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler");
 		scm_call_2 (proc, parser->self_scm (), $1);
@@ -437,6 +449,10 @@ toplevel_expression:
 		{
 			SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler");
 			scm_call_2 (proc, parser->self_scm (), out);
+		} else if (unsmob_score ($1))
+		{
+			SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler");
+			scm_call_2 (proc, parser->self_scm (), $1);
 		} else if (!scm_is_eq ($1, SCM_UNSPECIFIED))
 			parser->parser_error (@1, _("bad expression type"));
 	}
@@ -788,6 +804,10 @@ book_body:
 		{
 			SCM proc = parser->lexer_->lookup_identifier ("book-text-handler");
 			scm_call_2 (proc, $1, out);
+		} else if (unsmob_score ($2))
+		{
+			SCM proc = parser->lexer_->lookup_identifier ("book-score-handler");
+			scm_call_2 (proc, $1, $2);
 		} else if (!scm_is_eq ($2, SCM_UNSPECIFIED))
 			parser->parser_error (@2, _("bad expression type"));
 	}
@@ -854,6 +874,10 @@ bookpart_body:
 		{
 			SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
 			scm_call_2 (proc, $1, out);
+		} else if (unsmob_score ($2))
+		{
+			SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler");
+			scm_call_2 (proc, $1, $2);
 		} else if (!scm_is_eq ($2, SCM_UNSPECIFIED))
 			parser->parser_error (@2, _("bad expression type"));
 	}
@@ -873,27 +897,69 @@ bookpart_body:
 
 score_block:
 	SCORE '{' score_body '}' 	{
+		unsmob_score ($3)->origin ()->set_spot (@$);
 		$$ = $3;
 	}
 	;
 
+score_headers:
+	/* empty */
+	{
+		$$ = SCM_EOL;
+	}
+	| score_headers
+	{
+		if (!scm_is_pair ($1)
+		    || !ly_is_module (scm_car ($1)))
+			$1 = scm_cons (ly_make_module (false), $1);
+		parser->lexer_->add_scope (scm_car ($1));
+	} lilypond_header
+	{
+		$$ = $1;
+	}
+	| score_headers output_def
+	{
+                Output_def *od = unsmob_output_def ($2);
+		if (od->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
+		{
+			parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead"));
+
+		}
+		else
+		{
+			if (scm_is_pair ($1) && ly_is_module (scm_car ($1)))
+				scm_set_cdr_x ($1, scm_cons ($2, scm_cdr ($1)));
+			else
+				$$ = scm_cons ($2, $1);
+		}
+	}
+	;
+
+		
+
 score_body:
-	music {
+	score_headers music {
 		SCM scorify = ly_lily_module_constant ("scorify-music");
-		$$ = scm_call_2 (scorify, $1, parser->self_scm ());
+		$$ = scm_call_2 (scorify, $2, parser->self_scm ());
 
-		unsmob_score ($$)->origin ()->set_spot (@$);
+		if (scm_is_pair ($1) && ly_is_module (scm_car ($1)))
+		{
+			unsmob_score ($$)->set_header (scm_car ($1));
+			$1 = scm_cdr ($1);
+		}
+		for (SCM p = scm_reverse_x ($1, SCM_EOL);
+		     scm_is_pair (p); p = scm_cdr (p))
+		{
+			unsmob_score ($$)->
+				add_output_def (unsmob_output_def (scm_car (p)));
+		}
 	}
 	| embedded_scm_active {
-		Score *score;
-		if (unsmob_score ($1))
-			score = new Score (*unsmob_score ($1));
-		else {
-			score = new Score;
+		if (!unsmob_score ($1))
+		{
+			$$ = (new Score)->unprotect ();
 			parser->parser_error (@1, _("score expected"));
 		}
-		unsmob_score ($$)->origin ()->set_spot (@$);
-		$$ = score->unprotect ();
 	}
 	| score_body
 	{
@@ -1540,6 +1606,11 @@ function_arglist_nonbackup_reparse:
 	;
 
 
+// function_arglist_backup can't occur at the end of an argument
+// list.  It needs to be careful about avoiding lookahead only until
+// it has made a decision whether or not to accept the parsed entity.
+// At that point of time, music requiring lookahead to parse becomes
+// fine.
 function_arglist_backup:
 	function_arglist_common
 	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup embedded_scm_arg_closed
@@ -1650,7 +1721,7 @@ function_arglist_backup:
 			else {
 				$$ = scm_cons (loc_on_music (@3, $1), $3);
 				MYBACKUP (UNSIGNED, $5, @5);
-				parser->lexer_->push_extra_token ('-');
+				parser->lexer_->push_extra_token (@4, '-');
 			}
 		}
 		
@@ -1678,10 +1749,15 @@ function_arglist_backup:
 	}
 	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup PITCH_IDENTIFIER
 	{
-		if (scm_is_true (scm_call_1 ($2, $4)))
+		SCM m = make_music_from_simple (parser, @4, $4);
+		if (unsmob_music (m) && scm_is_true (scm_call_1 ($2, m)))
 		{
 			MYREPARSE (@4, $2, PITCH_IDENTIFIER, $4);
 			$$ = $3;
+		} else if (scm_is_true (scm_call_1 ($2, $4)))
+		{
+			MYREPARSE (@4, $2, PITCH_ARG, $4);
+			$$ = $3;
 		} else {
 			$$ = scm_cons (loc_on_music (@3, $1), $3);
 			MYBACKUP (PITCH_IDENTIFIER, $4, @4);
@@ -1689,10 +1765,15 @@ function_arglist_backup:
 	}
 	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup NOTENAME_PITCH
 	{
-		if (scm_is_true (scm_call_1 ($2, $4)))
+		SCM m = make_music_from_simple (parser, @4, $4);
+		if (unsmob_music (m) && scm_is_true (scm_call_1 ($2, m)))
 		{
 			MYREPARSE (@4, $2, NOTENAME_PITCH, $4);
 			$$ = $3;
+		} else if (scm_is_true (scm_call_1 ($2, $4)))
+		{
+			MYREPARSE (@4, $2, PITCH_ARG, $4);
+			$$ = $3;
 		} else {
 			$$ = scm_cons (loc_on_music (@3, $1), $3);
 			MYBACKUP (NOTENAME_PITCH, $4, @4);
@@ -1700,10 +1781,15 @@ function_arglist_backup:
 	}
 	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup TONICNAME_PITCH
 	{
-		if (scm_is_true (scm_call_1 ($2, $4)))
+		SCM m = make_music_from_simple (parser, @4, $4);
+		if (unsmob_music (m) && scm_is_true (scm_call_1 ($2, m)))
 		{
 			MYREPARSE (@4, $2, TONICNAME_PITCH, $4);
 			$$ = $3;
+		} else if (scm_is_true (scm_call_1 ($2, $4)))
+		{
+			MYREPARSE (@4, $2, PITCH_ARG, $4);
+			$$ = $3;
 		} else {
 			$$ = scm_cons (loc_on_music (@3, $1), $3);
 			MYBACKUP (TONICNAME_PITCH, $4, @4);
@@ -1760,6 +1846,11 @@ function_arglist_backup:
 					       (parser, @3, $3),
 					       $1, $2);
 	}
+	| function_arglist_backup REPARSE pitch_arg
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $1, $2);
+	}		
 	| function_arglist_backup REPARSE bare_number_common
 	{
 		$$ = check_scheme_arg (parser, @3,
@@ -2182,8 +2273,8 @@ re_rhythmed_music:
 	;
 
 context_change:
-	CHANGE STRING '=' STRING  {
-		$$ = MAKE_SYNTAX ("context-change", @$, scm_string_to_symbol ($2), $4);
+	CHANGE symbol '=' simple_string  {
+		$$ = MAKE_SYNTAX ("context-change", @$, $2, $4);
 	}
 	;
 
@@ -2429,10 +2520,10 @@ simple_revert_context:
 		    (scm_object_property (scm_car ($1),
 					  ly_symbol2scm ("is-grob?")))) {
 			$$ = ly_symbol2scm ("Bottom");
-			parser->lexer_->push_extra_token (SCM_IDENTIFIER, $1);
+			parser->lexer_->push_extra_token (@1, SCM_IDENTIFIER, $1);
 		} else {
 			$$ = scm_car ($1);
-			parser->lexer_->push_extra_token (SCM_IDENTIFIER,
+			parser->lexer_->push_extra_token (@1, SCM_IDENTIFIER,
 							  scm_cdr ($1));
 		}
 	}
@@ -2523,13 +2614,19 @@ event_chord:
 		}
 	} %prec ':'
 	| simple_chord_elements post_events	{
-		SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL));
-
-		Input i;
-		/* why is this giving wrong start location? -ns
-		 * i = @$; */
-		i.set_location (@1, @2);
-		$$ = MAKE_SYNTAX ("event-chord", i, elts);
+		if (scm_is_pair ($2)) {
+			if (unsmob_pitch ($1))
+				$1 = make_chord_elements (@1,
+							  $1,
+							  parser->default_duration_.smobbed_copy (),
+							  SCM_EOL);
+
+			SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL));
+
+			$$ = MAKE_SYNTAX ("event-chord", @1, elts);
+		} else if (!unsmob_pitch ($1))
+			$$ = MAKE_SYNTAX ("event-chord", @1, $1);
+		// A mere pitch drops through.
 	} %prec ':'
 	| CHORD_REPETITION optional_notemode_duration post_events {
 		Input i;
@@ -2653,7 +2750,7 @@ music_function_call_closed:
 	;
 
 event_function_event:
-	EVENT_FUNCTION function_arglist_closed {
+	EVENT_FUNCTION function_arglist {
 		$$ = MAKE_SYNTAX ("music-function", @$,
 					 $1, $2);
 	}
@@ -2700,7 +2797,7 @@ post_event_nofinger:
 	direction_less_event {
 		$$ = $1;
 	}
-	| script_dir music_function_call_closed {
+	| script_dir music_function_call {
 		$$ = $2;
 		if (!unsmob_music ($2)->is_mus_type ("post-event")) {
 			parser->parser_error (@2, _ ("post-event expected"));
@@ -2782,11 +2879,21 @@ direction_reqd_event:
 	}
 	| script_abbreviation {
 		SCM s = parser->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
-		Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$);
-		if (scm_is_string (s))
+		if (scm_is_string (s)) {
+			Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$);
 			a->set_property ("articulation-type", s);
-		else parser->parser_error (@1, _ ("expecting string as script definition"));
-		$$ = a->unprotect ();
+			$$ = a->unprotect ();
+		} else {
+			Music *original = unsmob_music (s);
+			if (original && original->is_mus_type ("post-event")) {
+				Music *a = original->clone ();
+				a->set_spot (parser->lexer_->override_input (@$));
+				$$ = a->unprotect ();
+			} else {
+				parser->parser_error (@1, _ ("expecting string or post-event as script definition"));
+				$$ = MY_MAKE_MUSIC ("PostEvents", @$)->unprotect ();
+			}
+		}
 	}
 	;
 
@@ -2860,6 +2967,17 @@ pitch:
 	}
 	;
 
+pitch_arg:
+	PITCH_ARG quotes {
+                if (!scm_is_eq (SCM_INUM0, $2))
+                {
+                        Pitch p = *unsmob_pitch ($1);
+                        p = p.transposed (Pitch (scm_to_int ($2),0,0));
+                        $$ = p.smobbed_copy ();
+                }
+	}
+	;
+
 gen_text_def:
 	full_markup {
 		Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
@@ -3169,6 +3287,7 @@ simple_element:
 	}
 	;
 
+// Can return a single pitch rather than a list.
 simple_chord_elements:
 	new_chord {
                 if (!parser->lexer_->is_chord_state ())
@@ -3207,9 +3326,13 @@ lyric_element_music:
 	} %prec ':'
 	;
 
+// Can return a single pitch rather than a list.
 new_chord:
-	steno_tonic_pitch optional_notemode_duration   {
-		$$ = make_chord_elements (@$, $1, $2, SCM_EOL);
+	steno_tonic_pitch maybe_notemode_duration   {
+		if (SCM_UNBNDP ($2))
+			$$ = $1;
+		else
+			$$ = make_chord_elements (@$, $1, $2, SCM_EOL);
 	}
 	| steno_tonic_pitch optional_notemode_duration chord_separator chord_items {
 		SCM its = scm_reverse_x ($4, SCM_EOL);
@@ -3273,10 +3396,10 @@ step_number:
 	;
 
 tempo_range:
-	UNSIGNED {
+	unsigned_number {
 		$$ = $1;
-	}
-	| UNSIGNED '-' UNSIGNED {
+	} %prec ':'
+	| unsigned_number '-' unsigned_number {
 		$$ = scm_cons ($1, $3);
 	}
 	;
@@ -3345,6 +3468,23 @@ bare_number_closed:
 unsigned_number:
 	UNSIGNED
 	| NUMBER_IDENTIFIER
+	{
+		if (!scm_is_integer ($1)
+		    || scm_is_true (scm_negative_p ($1)))
+		{
+			parser->parser_error (@1, _("not an unsigned integer"));
+			$$ = SCM_INUM0;
+		}
+	}
+	| embedded_scm
+	{
+		if (!scm_is_integer ($1)
+		    || scm_is_true (scm_negative_p ($1)))
+		{
+			parser->parser_error (@1, _("not an unsigned integer"));
+			$$ = SCM_INUM0;
+		}
+	}
 	;
 
 exclamations:
@@ -3359,7 +3499,13 @@ exclamations:
 	;
 
 questions:
-	{ $$ = SCM_UNDEFINED; }
+// This precedence rule is rather weird.  It triggers when '!' is
+// encountered after a pitch, and is used for deciding whether to save
+// this instead for a figure modification.  This should not actually
+// occur in practice as pitches and figures are generated in different
+// modes.  Using a greedy (%right) precedence makes sure that we don't
+// get stuck in a wrong interpretation.
+	{ $$ = SCM_UNDEFINED; } %prec ':'
 	| questions '?'
         {
                 if (SCM_UNBNDP ($1))
@@ -3438,6 +3584,7 @@ markup_uncomposed_list:
 		SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
 		parser->lexer_->push_note_state (nn);
 	} '{' score_body '}' {
+		unsmob_score ($4)->origin ()->set_spot (@$);
 		$$ = scm_list_1 (scm_list_2 (ly_lily_module_constant ("score-lines-markup-list"), $4));
 		parser->lexer_->pop_state ();
 	}
@@ -3514,6 +3661,7 @@ simple_markup:
 		SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
 		parser->lexer_->push_note_state (nn);
 	} '{' score_body '}' {
+		unsmob_score ($4)->origin ()->set_spot (@$);
 		$$ = scm_list_2 (ly_lily_module_constant ("score-markup"), $4);
 		parser->lexer_->pop_state ();
 	}
@@ -3605,6 +3753,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 		*destination = p->self_scm ();
 		p->unprotect ();
 		return OUTPUT_DEF_IDENTIFIER;
+	} else if (unsmob_score (sid)) {
+		*destination = unsmob_score (sid)->clone ()->unprotect ();
+		return SCM_IDENTIFIER;
 	}
 
 	return -1;
@@ -3829,6 +3980,9 @@ yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser)
 
 	lex->lexval_ = s;
 	lex->lexloc_ = loc;
+	int tok = lex->pop_extra_token ();
+	if (tok >= 0)
+		return tok;
 	lex->prepare_for_next_token ();
 	return lex->yylex ();
 }