X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Flexer.ll;h=bb9ee2271a641e89f5e966272216dfba1172b0b7;hb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;hp=a5cc4354fc30ec2e9e22317f74a2501e0119a6cf;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index a5cc4354fc..bb9ee2271a 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -4,7 +4,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -28,18 +28,20 @@
 
 /* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks
    when building the actual lexer.  */
+
 #define LEXER_CC
 
 #include <iostream>
+
 using namespace std;
 
+#include "music-function.hh"
 #include "source-file.hh"
 #include "parse-scm.hh"
 #include "lily-guile.hh"
 #include "string.hh"
 #include "string-convert.hh"
-#include "my-lily-lexer.hh"
-#include "input-file-results.hh"
+#include "lily-lexer.hh"
 #include "interval.hh"
 #include "lily-guile.hh"
 #include "parser.hh"
@@ -58,7 +60,7 @@ RH 7 fix (?)
 void strip_trailing_white (String&);
 void strip_leading_white (String&);
 String lyric_fudge (String s);
-
+int music_function_type (SCM);
 SCM lookup_markup_command (String s);
 bool is_valid_version (String s);
 
@@ -67,9 +69,16 @@ bool is_valid_version (String s);
 	yy_push_state (quote);\
 	yylval.string = new String
 
+#define start_lyric_quote()	\
+	yy_push_state (lyric_quote);\
+	yylval.string = new String
+
 #define yylval \
 	(*(YYSTYPE*)lexval)
 
+#define yylloc \
+	(*(YYLTYPE*)lexloc)
+
 #define YY_USER_ACTION	add_lexed_char (YYLeng ());
 /*
 
@@ -89,22 +98,22 @@ SCM (* scm_parse_error_handler) (void *);
 %option noyywrap
 %option nodefault
 %option debug
-%option yyclass="My_lily_lexer"
+%option yyclass="Lily_lexer"
 %option stack
 %option never-interactive 
 %option warn
 
-%x encoding
-%x renameinput
-%x version
 %x chords
+%x figures
 %x incl
 %x lyrics
+%x lyric_quote
+%x longcomment
+%x markup
 %x notes
-%x figures
 %x quote
-%x longcomment
-%x markup 
+%x renameinput
+%x version
 
 A		[a-zA-Z]
 AA		{A}|_
@@ -133,6 +142,7 @@ LYRICS		({AA}|{TEX})[^0-9 \t\n\r\f]*
 ESCAPED		[nt\\'"]
 EXTENDER	__
 HYPHEN		--
+BOM_UTF8	\357\273\277
 %%
 
 
@@ -140,7 +150,17 @@ HYPHEN		--
 	// windows-suck-suck-suck
 }
 
-<INITIAL,chords,incl,markup,lyrics,notes,figures>{
+<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
+  if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
+    {
+      LexerError (_ ("stray UTF-8 BOM encountered").to_str0 ());
+      exit (1);
+    }
+  if (be_verbose_global)
+     message (_ ("Skipping UTF-8 BOM"));
+}
+
+<INITIAL,chords,figures,incl,lyrics,markup,notes>{
   "%{"	{
 	yy_push_state (longcomment);
   }
@@ -157,21 +177,12 @@ HYPHEN		--
   }
 }
 
-<INITIAL>\\encoding{WHITE}*	{
-	yy_push_state (encoding);
-}
 <INITIAL,chords,lyrics,notes,figures>\\version{WHITE}*	{
 	yy_push_state (version);
 }
 <INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}*	{
 	yy_push_state (renameinput);
 }
-<encoding>\"[^"]*\"     {
-	String s (YYText () + 1);
-	s = s.left_string (s.index_last ('\"'));
-	set_encoding (s);
-	yy_pop_state ();
-}
 <version>\"[^"]*\"     { /* got the version number */
 	String s (YYText () + 1);
 	s = s.left_string (s.index_last ('\"'));
@@ -179,31 +190,30 @@ HYPHEN		--
 	yy_pop_state ();
 	if (!is_valid_version (s))
 		return INVALID;
+
+	SCM top_scope = scm_car (scm_last_pair (scopes_));
+	scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T);
+
 }
 <renameinput>\"[^"]*\"     {
-	String s (YYText ()+1);
+	String s (YYText () + 1);
 	s = s.left_string (s.index_last ('\"'));
 
-	yy_pop_state();
-	this->here_input().source_file_->name_ = s;
-	progress_indication ("\n");
-	progress_indication (_f ("input renamed to: `%s'", s.to_str0 ()));
+	yy_pop_state ();
+	this->here_input().get_source_file ()->name_ = s;
+	message (_f ("Renaming input to: `%s'", s.to_str0 ()));
 	progress_indication ("\n");
-	scm_module_define (ly_car (scopes_),
+	scm_module_define (scm_car (scopes_),
 		     ly_symbol2scm ("input-file-name"),
-		     scm_makfrom0str (s.to_str0()));
+		     scm_makfrom0str (s.to_str0 ()));
 
 }
-<encoding>. 	{
-	LexerError (_ ("No quoted string found after \\encoding").to_str0 ());
-	yy_pop_state ();
-}
 <version>. 	{
-	LexerError (_ ("No quoted string found after \\version").to_str0 ());
+	LexerError (_ ("quoted string expected after \\version").to_str0 ());
 	yy_pop_state ();
 }
 <renameinput>. 	{
-	LexerError (_ ("No quoted string found after \\renameinput").to_str0 ());
+	LexerError (_ ("quoted string expected after \\renameinput").to_str0 ());
 	yy_pop_state ();
 }
 <longcomment>{
@@ -217,7 +227,7 @@ HYPHEN		--
 	}
 	<<EOF>> 	{
 		LexerError (_ ("EOF found inside a comment").to_str0 ());
-		main_input_b_ = false;
+		is_main_input_ = false;
 		if (! close_input ()) 
 		  yyterminate (); // can't move this, since it actually rets a YY_NULL
 	}
@@ -225,10 +235,10 @@ HYPHEN		--
 
 
 <INITIAL,chords,lyrics,notes,figures>\\maininput           {
-	if (!main_input_b_)
+	if (!is_main_input_)
 	{
 		start_main_input ();
-		main_input_b_ = true;
+		is_main_input_ = true;
 	}
 	else
 		error (_ ("\\maininput not allowed outside init files"));
@@ -237,22 +247,22 @@ HYPHEN		--
 <INITIAL,chords,lyrics,figures,notes>\\include           {
 	yy_push_state (incl);
 }
-<incl>\"[^"]*\";?   { /* got the include file name */
+<incl>\"[^"]*\"   { /* got the include file name */
 	String s (YYText ()+1);
 	s = s.left_string (s.index_last ('"'));
 
-	new_input (s, &global_input_file->sources_);
+	new_input (s, sources_);
 	yy_pop_state ();
 }
-<incl>\\{BLACK}*;?{WHITE} { /* got the include identifier */
+<incl>\\{BLACK}*{WHITE} { /* got the include identifier */
 	String s = YYText () + 1;
 	strip_trailing_white (s);
 	if (s.length () && (s[s.length () - 1] == ';'))
 	  s = s.left_string (s.length () - 1);
 
 	SCM sid = lookup_identifier (s);
-	if (is_string (sid)) {
-		new_input (ly_scm2string (sid), &global_input_file->sources_);
+	if (scm_is_string (sid)) {
+		new_input (ly_scm2string (sid), sources_);
 		yy_pop_state ();
 	} else { 
 	    String msg (_f ("wrong or undefined identifier: `%s'", s ));
@@ -264,31 +274,31 @@ HYPHEN		--
 	  }
 }
 <incl>\"[^"]*   { // backup rule
-	error (_ ("Missing end quote"));
+	error (_ ("end quote missing"));
 	exit (1);
 }
 <chords,notes,figures>{RESTNAME} 	{
-	const char *s = YYText ();
+	char const *s = YYText ();
 	yylval.scm = scm_makfrom0str (s);
 	return RESTNAME;
 }
 <chords,notes,figures>R		{
 	return MULTI_MEASURE_REST;
 }
-<INITIAL,markup,chords,lyrics,notes,figures>#	{ //embedded scm
-	//char const* s = YYText () + 1;
-	char const* s = here_str0 ();
+<INITIAL,chords,figures,lyrics,markup,notes>#	{ //embedded scm
 	int n = 0;
-	SCM sval = ly_parse_scm (s, &n, here_input (),
-		safe_global_b && main_input_b_);
+	Input hi = here_input();
+	hi.step_forward ();
+	SCM sval = ly_parse_scm (hi.start (), &n, hi,
+		be_safe_global && is_main_input_);
 
 	if (sval == SCM_UNDEFINED)
 	{
 		sval = SCM_UNSPECIFIED;
-		errorlevel_ = 1;
+		error_level_ = 1;
  	}
 
-	for (int i=0; i < n; i++)
+	for (int i = 0; i < n; i++)
 	{
 		yyinput ();
 	}
@@ -305,10 +315,10 @@ HYPHEN		--
 }
 <INITIAL,notes,lyrics>{ 
 	\<\<   {
-		return LESSLESS;
+		return DOUBLE_ANGLE_OPEN;
 	}
 	\>\>   {
-		return MOREMORE;
+		return DOUBLE_ANGLE_CLOSE;
 	}
 }
 <figures>{
@@ -348,7 +358,6 @@ HYPHEN		--
 		yylval.i = String_convert::dec2int (String (YYText () +1));
 		return E_UNSIGNED;
 	}
-
 	\" {
 		start_quote ();
 	}
@@ -378,10 +387,31 @@ HYPHEN		--
 		*yylval.string += YYText ();
 	}
 }
+<lyric_quote>{
+	\\{ESCAPED}	{
+		*yylval.string += to_string (escaped_char (YYText ()[1]));
+	}
+	[^\\"]+	{
+		*yylval.string += YYText ();
+	}
+	\"	{
+
+		yy_pop_state ();
+
+		/* yylval is union. Must remember STRING before setting SCM*/
+		String *sp = yylval.string;
+		yylval.scm = scm_makfrom0str (sp->to_str0 ());
+		delete sp;
+		return LYRICS_STRING;
+	}
+	.	{
+		*yylval.string += YYText ();
+	}
+}
 
 <lyrics>{
 	\" {
-		start_quote ();
+		start_lyric_quote ();
 	}
 	{FRACTION}	{
 		yylval.scm =  scan_fraction (YYText ());
@@ -410,7 +440,7 @@ HYPHEN		--
 		yylval.scm = scm_makfrom0str (s.to_str0 ());
 
 
-		return STRING;
+		return LYRICS_STRING;
 	}
 	. {
 		return YYText ()[0];
@@ -459,19 +489,16 @@ HYPHEN		--
 	\" {
 		start_quote ();
 	}
-	\< {
-		return '<';
-	}
-	\> {
-		return '>';
+	\\score {
+		return SCORE;
 	}
 	{MARKUPCOMMAND} {
 		String str (YYText () + 1);
 		SCM s = lookup_markup_command (str);
 
-		if (is_pair (s) && is_symbol (ly_cdr (s)) ) {
-			yylval.scm = ly_car(s);
-			SCM tag = ly_cdr(s);
+		if (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) {
+			yylval.scm = scm_car(s);
+			SCM tag = scm_cdr(s);
 			if (tag == ly_symbol2scm("markup0"))
 				return MARKUP_HEAD_MARKUP0;
 			if (tag == ly_symbol2scm("empty"))
@@ -491,7 +518,7 @@ HYPHEN		--
 			else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
 				return MARKUP_HEAD_SCM0_SCM1_SCM2;
 			else {
-				programming_error ("No parser tag defined for this signature. Abort"); 
+				programming_error ("no parser tag defined for this signature"); 
 				ly_display_scm (s);
 				assert(false);
 			}
@@ -520,10 +547,16 @@ HYPHEN		--
 }
 
 <<EOF>> {
-	main_input_b_ = false;
-	if (! close_input ()) { 
- 	  yyterminate (); // can't move this, since it actually rets a YY_NULL
+	if (is_main_input_)
+	{
+		is_main_input_ = false;
+		if (!close_input ())
+ 	        /* Returns YY_NULL */
+			yyterminate ();
 	}
+	else if (!close_input ())
+ 	        /* Returns YY_NULL */
+ 	  	yyterminate ();
 }
 
 
@@ -535,10 +568,10 @@ HYPHEN		--
 }
 {REAL}		{
 	Real r;
-	int cnv=sscanf (YYText (), "%lf", &r);
+	int cnv = sscanf (YYText (), "%lf", &r);
 	assert (cnv == 1);
 
-	yylval.scm = scm_make_real (r);
+	yylval.scm = scm_from_double (r);
 	return REAL;
 }
 
@@ -563,13 +596,13 @@ HYPHEN		--
 }
 
 <INITIAL,lyrics,notes,figures>\\. {
-    char c= YYText ()[1];
+    char c = YYText ()[1];
 
     switch (c) {
     case '>':
-	return E_BIGGER;
+	return E_ANGLE_CLOSE;
     case '<':
-	return E_SMALLER;
+	return E_ANGLE_OPEN;
     case '!':
 	return E_EXCLAMATION;
     case '(':
@@ -577,9 +610,9 @@ HYPHEN		--
     case ')':
 	return E_CLOSE;
     case '[':
-	return E_LEFTSQUARE;
+	return E_BRACKET_OPEN;
     case ']':
-	return E_RIGHTSQUARE;
+	return E_BRACKET_CLOSE;
     case '~':
 	return E_TILDE;
     case '\\':
@@ -599,46 +632,53 @@ HYPHEN		--
 %%
 
 void
-My_lily_lexer::push_note_state (SCM tab)
+Lily_lexer::push_chord_state (SCM tab)
 {
 	pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_);
-	yy_push_state (notes);
+	yy_push_state (chords);
 }
 
 void
-My_lily_lexer::push_figuredbass_state()
+Lily_lexer::push_figuredbass_state ()
 {
 	yy_push_state (figures);
 }
+
 void
-My_lily_lexer::push_chord_state (SCM tab)
+Lily_lexer::push_initial_state ()
 {
-	pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_);
-	yy_push_state (chords);
+	yy_push_state (INITIAL);
 }
 
 void
-My_lily_lexer::push_lyric_state ()
+Lily_lexer::push_lyric_state ()
 {
 	yy_push_state (lyrics);
 }
 
 void
-My_lily_lexer::push_markup_state ()
+Lily_lexer::push_markup_state ()
 {
 	yy_push_state (markup);
 }
 
 void
-My_lily_lexer::pop_state ()
+Lily_lexer::push_note_state (SCM tab)
+{
+	pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_);
+	yy_push_state (notes);
+}
+
+void
+Lily_lexer::pop_state ()
 {
 	if (YYSTATE == notes || YYSTATE == chords)
-		pitchname_tab_stack_ = ly_cdr (pitchname_tab_stack_);
+		pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_);
 	yy_pop_state ();
 }
 
 int
-My_lily_lexer::identifier_type (SCM sid)
+Lily_lexer::identifier_type (SCM sid)
 {
 	int k = try_special_identifiers (&yylval.scm , sid);
 	return k >= 0  ? k : SCM_IDENTIFIER;
@@ -646,17 +686,25 @@ My_lily_lexer::identifier_type (SCM sid)
 
 
 int
-My_lily_lexer::scan_escaped_word (String str)
+Lily_lexer::scan_escaped_word (String str)
 {
 	// use more SCM for this.
 
 //	SCM sym = ly_symbol2scm (str.to_str0 ());
 
-	int l = lookup_keyword (str);
-	if (l != -1) {
-		return l;
-	}
+	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 (is_music_function (sid))
+	{
+		yylval.scm = get_music_function_transform (sid);
+		return music_function_type (yylval.scm);
+	}
+
 	if (sid != SCM_UNDEFINED)
 	{
 		yylval.scm = sid;
@@ -672,24 +720,24 @@ My_lily_lexer::scan_escaped_word (String str)
 }
 
 int
-My_lily_lexer::scan_bare_word (String str)
+Lily_lexer::scan_bare_word (String str)
 {
 	SCM sym = ly_symbol2scm (str.to_str0 ());
 	if ((YYSTATE == notes) || (YYSTATE == chords)) {
 		SCM handle = SCM_BOOL_F;
-		if (is_pair (pitchname_tab_stack_))
-			handle = scm_hashq_get_handle (ly_car (pitchname_tab_stack_), sym);
+		if (scm_is_pair (pitchname_tab_stack_))
+			handle = scm_hashq_get_handle (scm_car (pitchname_tab_stack_), sym);
 		
-		if (is_pair (handle)) {
-			yylval.scm = ly_cdr (handle);
+		if (scm_is_pair (handle)) {
+			yylval.scm = scm_cdr (handle);
 			if (unsmob_pitch (yylval.scm)) 
 	                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
-			else if (is_symbol (yylval.scm))
+			else if (scm_is_symbol (yylval.scm))
 			    return DRUM_PITCH;
 		}
 		else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
 		{
-		    yylval.scm = ly_cdr (handle);
+		    yylval.scm = scm_cdr (handle);
 		    return CHORD_MODIFIER;
 		}
 	}
@@ -699,25 +747,25 @@ My_lily_lexer::scan_bare_word (String str)
 }
 
 bool
-My_lily_lexer::is_note_state () const
+Lily_lexer::is_note_state () const
 {
 	return YY_START == notes;
 }
 
 bool
-My_lily_lexer::is_chord_state () const
+Lily_lexer::is_chord_state () const
 {
 	return YY_START == chords;
 }
 
 bool
-My_lily_lexer::is_lyric_state () const
+Lily_lexer::is_lyric_state () const
 {
 	return YY_START == lyrics;
 }
 
 bool
-My_lily_lexer::is_figure_state () const
+Lily_lexer::is_figure_state () const
 {
 	return YY_START == figures;
 }
@@ -729,7 +777,7 @@ My_lily_lexer::is_figure_state () const
 void
 strip_leading_white (String&s)
 {
-	int i=0;
+	int i = 0;
 	for (;  i < s.length (); i++) 
 		if (!isspace (s[i]))
 			break;
@@ -740,7 +788,7 @@ strip_leading_white (String&s)
 void
 strip_trailing_white (String&s)
 {
-	int i=s.length ();	
+	int i = s.length ();	
 	while (i--) 
 		if (!isspace (s[i]))
 			break;
@@ -751,7 +799,7 @@ strip_trailing_white (String&s)
 
 
 /* 2.1.2x something -> \property -> \set. */ 
-Lilypond_version oldest_version ("2.1.25");
+Lilypond_version oldest_version ("2.3.22");
 
 
 bool
@@ -775,7 +823,7 @@ is_valid_version (String s)
 String
 lyric_fudge (String s)
 {
-  char  * chars  =s.get_copy_str0 ();
+  char  * chars  = s.get_copy_str0 ();
 
   for (char * p = chars; *p ; p++)
     {
@@ -786,8 +834,8 @@ lyric_fudge (String s)
   s = String (chars);
   delete[] chars;
 
-  int i =0;	
-  if ((i=s.index ("\\,")) != -1)   // change "\," to TeX's "\c "
+  int i = 0;	
+  if ((i = s.index ("\\,")) != -1)   // change "\," to TeX's "\c "
     {
       * (s.get_str0 () + i + 1) = 'c';
       s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2);
@@ -809,7 +857,7 @@ scan_fraction (String frac)
 
 	int n = String_convert::dec2int (left);
 	int d = String_convert::dec2int (right);
-	return scm_cons (scm_int2num (n), scm_int2num (d));
+	return scm_cons (scm_from_int (n), scm_from_int (d));
 }
 
 // Breaks for flex 2.5.31
@@ -835,6 +883,72 @@ avoid_silly_flex_induced_gcc_warnings ()
 SCM
 lookup_markup_command (String s)
 {
-	SCM proc = ly_scheme_function ("lookup-markup-command");
+	SCM proc = ly_lily_module_constant ("lookup-markup-command");
 	return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ()));
 }
+
+
+int
+music_function_type (SCM func)
+{
+	SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
+	if (type == ly_symbol2scm ("scm"))
+	{
+		return MUSIC_FUNCTION_SCM;
+	}
+	else if (type == ly_symbol2scm ("music"))
+	{
+		return MUSIC_FUNCTION_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("scm-music"))
+	{
+		return MUSIC_FUNCTION_SCM_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("scm-scm"))
+	{
+		return MUSIC_FUNCTION_SCM_SCM;
+	}
+	else if (type == ly_symbol2scm ("music-music"))
+	{
+		return MUSIC_FUNCTION_MUSIC_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("scm-music-music"))
+	{
+		return MUSIC_FUNCTION_SCM_MUSIC_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("scm-scm-music"))
+	{
+		return MUSIC_FUNCTION_SCM_SCM_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("markup"))
+	{
+		return MUSIC_FUNCTION_MARKUP;
+	}
+	else if (type == ly_symbol2scm ("markup-music"))
+	{
+		return MUSIC_FUNCTION_MARKUP_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("markup-markup"))
+	{
+		return MUSIC_FUNCTION_MARKUP_MARKUP;
+	}
+	else if (type == ly_symbol2scm ("markup-music-music"))
+	{
+		return MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("markup-markup-music"))
+	{
+		return MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC;
+	}
+	else if (type == ly_symbol2scm ("noarg"))
+	{
+		return MUSIC_FUNCTION;
+	}
+	else
+		{
+		/* TODO: print location */
+		error (_ ("can't find signature for music function"));
+		}
+
+	return MUSIC_FUNCTION_SCM;
+}