X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=0df70e20082f50bb4a6f131b00d6f55382f9b6af;hb=9352789b729682d683482c2852cc7b53e9dcdc70;hp=e74dced0885534a2bee9ad22115dec42d60b4ef5;hpb=01df8ad908c92687d0c352e5ad5f067e52809423;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index e74dced088..0df70e2008 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -120,6 +120,7 @@ SCM (* scm_parse_error_handler) (void *);
 %x incl
 %x lyrics
 %x longcomment
+%x maininput
 %x markup
 %x notes
 %x quote
@@ -216,16 +217,10 @@ BOM_UTF8	\357\273\277
   "%{"	{
 	yy_push_state (longcomment);
   }
-  %[^{\n\r][^\n\r]*[\n\r]	{
+  %[^{\n\r][^\n\r]*[\n\r]?	{
 	  (void) YYText_utf8 ();
   }
-  %[^{\n\r]	{ // backup rule
-	  (void) YYText_utf8 ();
-  }
-  %[\n\r]	{
-  }
-  %[^{\n\r][^\n\r]*	{
-	  (void) YYText_utf8 ();
+  %[\n\r]?	{
   }
   {WHITE}+ 	{
 
@@ -314,9 +309,12 @@ BOM_UTF8	\357\273\277
 		start_main_input ();
 		main_input_level_ = include_stack_.size ();
 		is_main_input_ = true;
+		int state = YYSTATE;
+		yy_push_state (maininput);
+		yy_push_state (state);
 	}
 	else
-		error (_ ("\\maininput not allowed outside init files"));
+		LexerError (_ ("\\maininput not allowed outside init files").c_str ());
 }
 
 <INITIAL,chords,lyrics,figures,notes>\\include           {
@@ -376,8 +374,8 @@ BOM_UTF8	\357\273\277
 }
 
 <incl,version,sourcefilename>\"[^""]*   { // backup rule
-	error (_ ("end quote missing"));
-	exit (1);
+	LexerError (_ ("end quote missing").c_str ());
+	yy_pop_state ();
 }
 
     /* Flex picks the longest matching pattern including trailing
@@ -525,7 +523,7 @@ BOM_UTF8	\357\273\277
                                                          SCM_UNDEFINED,
                                                          SCM_UNDEFINED);
 
-		return is_lyric_state () ? LYRICS_STRING : STRING;
+		return STRING;
 	}
 	\\	{
                 yylval = scm_cons (scm_from_locale_string (YYText ()),
@@ -566,7 +564,7 @@ BOM_UTF8	\357\273\277
 		s = lyric_fudge (s);
 		yylval = ly_string2scm (s);
 
-		return LYRICS_STRING;
+		return STRING;
 	}
 	/* This should really just cover {} */
 	. {
@@ -689,19 +687,32 @@ BOM_UTF8	\357\273\277
 
 <longcomment><<EOF>> {
 		LexerError (_ ("EOF found inside a comment").c_str ());
-		is_main_input_ = false; // should be safe , can't have \include in --safe.
-                yylval = SCM_UNSPECIFIED;
-		if (!close_input ())
-		  yyterminate (); // can't move this, since it actually rets a YY_NULL
+		yy_pop_state ();
 	}
 
+<quote><<EOF>> {
+	LexerError (_ ("EOF found inside string").c_str ());
+	yy_pop_state ();
+}
+
 <<EOF>> {
         yylval = SCM_UNSPECIFIED;
         if (is_main_input_)
 	{
 		is_main_input_ = include_stack_.size () > main_input_level_;
 		if (!is_main_input_)
+		{
 			main_input_level_ = 0;
+			pop_state ();
+			if (YYSTATE != maininput)
+			{
+				LexerError (_ ("Unfinished main input").c_str ());
+				do {
+					pop_state ();
+				} while (YYSTATE != maininput);
+			}
+			pop_state ();
+		}
 		if (!close_input () || !is_main_input_)
  	        /* Returns YY_NULL */
 			yyterminate ();
@@ -711,6 +722,13 @@ BOM_UTF8	\357\273\277
  	  	yyterminate ();
 }
 
+<maininput>. {
+	while (include_stack_.size () > main_input_level_
+	       && close_input ())
+		;
+	yyterminate ();
+}
+
 <INITIAL>{
 	{WORD}/[-_]	| // backup rule
 	{WORD}	{
@@ -902,12 +920,16 @@ Lily_lexer::scan_escaped_word (string str)
 
         yylval = SCM_UNSPECIFIED;
 	int i = lookup_keyword (str);
- 	if (i == MARKUP && is_lyric_state ())
- 		return LYRIC_MARKUP;
+
 	if (i != -1)
 		return i;
 
 	SCM sid = lookup_identifier (str);
+	if (Music *m = unsmob_music (sid))
+	{
+		m->set_spot (override_input (last_input_));
+	}
+
 	if (sid != SCM_UNDEFINED)
 		return scan_scm_id (sid);
 
@@ -1067,19 +1089,26 @@ Lily_lexer::eval_scm (SCM readerdata, char extra_token)
 		sval = scm_struct_ref (sval, SCM_INUM0);
 
 		if (scm_is_pair (sval)) {
-			for (SCM v = scm_reverse (scm_cdr (sval));
-			     scm_is_pair (v);
-			     v = scm_cdr (v))
+			for (SCM p = scm_reverse (scm_cdr (sval));
+			     scm_is_pair (p);
+			     p = scm_cdr (p))
 			{
+				SCM v = scm_car (p);
+				if (Music *m = unsmob_music (v))
+				{
+					if (!unsmob_input (m->get_property ("origin")))
+						m->set_spot (override_input (last_input_));
+				}
+					
 				int token;
 				switch (extra_token) {
 				case '$':
-					token = scan_scm_id (scm_car (v));
+					token = scan_scm_id (v);
 					if (!scm_is_eq (yylval, SCM_UNSPECIFIED))
 						push_extra_token (token, yylval);
 					break;
 				case '#':
-					push_extra_token (SCM_IDENTIFIER, scm_car (v));
+					push_extra_token (SCM_IDENTIFIER, v);
 					break;
 				}
 			}
@@ -1088,6 +1117,12 @@ Lily_lexer::eval_scm (SCM readerdata, char extra_token)
 			sval = SCM_UNSPECIFIED;
 	}
 
+	if (Music *m = unsmob_music (sval))
+	{
+		if (!unsmob_input (m->get_property ("origin")))
+			m->set_spot (override_input (last_input_));
+	}
+
 	return sval;
 }