X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=f9601985f40b6bed668c7853e61bb359f2ab1f13;hb=afcf9fa8d6794b08cd62f66dfd22c0f108a7c6e0;hp=c658e7bf8acfe3de6b2fe13fa4292239840dfe8b;hpb=aeb2de649b6409561db9d4530ef6c1eef56f0445;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index c658e7bf8a..f9601985f4 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -4,7 +4,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -22,58 +22,63 @@
  */
 
 
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
+
+#include <cstdio>
+#include <cctype>
+#include <cerrno>
 
 /* 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 "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 "context-def.hh"
+#include "identifier-smob.hh"
+#include "international.hh"
 #include "interval.hh"
 #include "lily-guile.hh"
-#include "parser.hh"
-#include "warn.hh"
+#include "lily-lexer.hh"
+#include "lilypond-input-version.hh"
 #include "main.hh"
+#include "music-function.hh"
+#include "parse-scm.hh"
+#include "parser.hh"
+#include "source-file.hh"
+#include "std-string.hh"
+#include "string-convert.hh"
 #include "version.hh"
-#include "lilypond-input-version.hh"
-#include "translator-def.hh"
-#include "identifier-smob.hh"
+#include "warn.hh"
 
 /*
 RH 7 fix (?)
 */
 #define isatty HORRIBLEKLUDGE
 
-void strip_trailing_white (String&);
-void strip_leading_white (String&);
-String lyric_fudge (String s);
-
-SCM
-lookup_markup_command (String s);
-
-bool
-valid_version_b (String s);
-
+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);
 
 
 #define start_quote()	\
 	yy_push_state (quote);\
-	yylval.string = new String
+	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 ());
 /*
 
@@ -82,7 +87,7 @@ LYRICS		({AA}|{TEX})[^0-9 \t\n\f]*
 */
 
 
-SCM scan_fraction (String);
+SCM scan_fraction (string);
 SCM (* scm_parse_error_handler) (void *);
 
 
@@ -93,21 +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 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 sourcefilename
+%x version
 
 A		[a-zA-Z]
 AA		{A}|_
@@ -118,6 +124,8 @@ ACCENT		\\[`'"^]
 NATIONAL	[\001-\006\021-\027\031\036\200-\377]
 TEX		{AA}|-|{PUNCT}|{ACCENT}|{NATIONAL}
 WORD		{A}{AN}*
+DASHED_WORD		{A}({AN}|-)*
+DASHED_KEY_WORD		\\{DASHED_WORD}
 ALPHAWORD	{A}+
 DIGIT		{N}
 UNSIGNED	{N}+
@@ -136,6 +144,7 @@ LYRICS		({AA}|{TEX})[^0-9 \t\n\r\f]*
 ESCAPED		[nt\\'"]
 EXTENDER	__
 HYPHEN		--
+BOM_UTF8	\357\273\277
 %%
 
 
@@ -143,7 +152,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").c_str ());
+      exit (1);
+    }
+  if (be_verbose_global)
+     message (_ ("Skipping UTF-8 BOM"));
+}
+
+<INITIAL,chords,figures,incl,lyrics,markup,notes>{
   "%{"	{
 	yy_push_state (longcomment);
   }
@@ -163,35 +182,40 @@ HYPHEN		--
 <INITIAL,chords,lyrics,notes,figures>\\version{WHITE}*	{
 	yy_push_state (version);
 }
-<INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}*	{
-	yy_push_state (renameinput);
+<INITIAL,chords,lyrics,notes,figures>\\sourcefilename{WHITE}*	{
+	yy_push_state (sourcefilename);
 }
 <version>\"[^"]*\"     { /* got the version number */
-	String s (YYText ()+1);
-	s = s.left_string (s.index_last ('\"'));
+	string s (YYText () + 1);
+	s = s.substr (0, s.rfind ('\"'));
 
-	yy_pop_state();
-	 if (!valid_version_b (s))
+	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>\"[^"]*\"     { /* got the version number */
-	String s (YYText ()+1);
-	s = s.left_string (s.index_last ('\"'));
+<sourcefilename>\"[^"]*\"     {
+	string s (YYText () + 1);
+	s = s.substr (0, s.rfind ('\"'));
 
-	yy_pop_state();
-	this->here_input().source_file_->name_ = s;
-	scm_module_define (gh_car (scopes_),
+	yy_pop_state ();
+	this->here_input().get_source_file ()->name_ = s;
+	message (_f ("Renaming input to: `%s'", s.c_str ()));
+	progress_indication ("\n");
+	scm_module_define (scm_car (scopes_),
 		     ly_symbol2scm ("input-file-name"),
-		     scm_makfrom0str (s.to_str0()));
+		     scm_makfrom0str (s.c_str ()));
 
 }
-
 <version>. 	{
-	LexerError ("No quoted string found after \\version");
+	LexerError (_ ("quoted string expected after \\version").c_str ());
 	yy_pop_state ();
 }
-<renameinput>. 	{
-	LexerError ("No quoted string found after \\renameinput");
+<sourcefilename>. 	{
+	LexerError (_ ("quoted string expected after \\sourcefilename").c_str ());
 	yy_pop_state ();
 }
 <longcomment>{
@@ -204,7 +228,8 @@ HYPHEN		--
 		yy_pop_state ();
 	}
 	<<EOF>> 	{
-		LexerError (_ ("EOF found inside a comment").to_str0 ());
+		LexerError (_ ("EOF found inside a comment").c_str ());
+		is_main_input_ = false;
 		if (! close_input ()) 
 		  yyterminate (); // can't move this, since it actually rets a YY_NULL
 	}
@@ -212,96 +237,74 @@ 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 disallowed outside init files"));
+		error (_ ("\\maininput not allowed outside init files"));
 }
 
 <INITIAL,chords,lyrics,figures,notes>\\include           {
 	yy_push_state (incl);
 }
-<incl>\"[^"]*\";?   { /* got the include file name */
-	String s (YYText ()+1);
-	s = s.left_string (s.index_last ('"'));
+<incl>\"[^"]*\"   { /* got the include file name */
+	string s (YYText ()+1);
+	s = s.substr (0, s.rfind ('"'));
 
-	new_input (s, &global_input_file->sources_ );
+	new_input (s, sources_);
 	yy_pop_state ();
 }
-<incl>\\{BLACK}*;?{WHITE} { /* got the include identifier */
-	String s = YYText () + 1;
+<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);
+	  s = s.substr (0, s.length () - 1);
 
 	SCM sid = lookup_identifier (s);
-	if (gh_string_p (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 ));
+	    string msg (_f ("wrong or undefined identifier: `%s'", s ));
 
-	    LexerError (msg.to_str0 ());
+	    LexerError (msg.c_str ());
 	    SCM err = scm_current_error_port ();
 	    scm_puts ("This value was found in the table: ", err);
 	    scm_display (sid, err);
 	  }
 }
 <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,chords,lyrics,notes,figures>\\\${BLACK}*{WHITE}	{
-	String s=YYText () + 2;
-	s=s.left_string (s.length () - 1);
-	return scan_escaped_word (s); 
-}
-<INITIAL,chords,lyrics,notes,figures>\${BLACK}*{WHITE}		{
-	String s=YYText () + 1;
-	s=s.left_string (s.length () - 1);
-	return scan_bare_word (s);
-}
-<INITIAL,chords,lyrics,notes,figures>\\\${BLACK}*		{ // backup rule
-	error (_("white expected"));
-	exit (1);
-}
-<INITIAL,chords,lyrics,notes,figures>\${BLACK}*		{ // backup rule
-	error (_("white expected"));
-	exit (1);
-}
-
-<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;
-	if (main_input_b_ && safe_global_b) {
-		error (_ ("Can't evaluate Scheme in safe mode"));
-		yylval.scm =  SCM_EOL;
-		return SCM_T;
-	}
-	SCM sval = ly_parse_scm (s, &n, here_input());
+	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 ();
 	}
-	char_count_stack_.top () += n;
+	char_count_stack_.back () += n;
 
 	if (unpack_identifier (sval) != SCM_UNDEFINED)
 	{
@@ -314,10 +317,10 @@ HYPHEN		--
 }
 <INITIAL,notes,lyrics>{ 
 	\<\<   {
-		return LESSLESS;
+		return DOUBLE_ANGLE_OPEN;
 	}
 	\>\>   {
-		return MOREMORE;
+		return DOUBLE_ANGLE_CLOSE;
 	}
 }
 <figures>{
@@ -346,18 +349,17 @@ HYPHEN		--
 	}
 
 	{DIGIT}		{
-		yylval.i = String_convert::dec2int (String (YYText ()));
+		yylval.i = String_convert::dec2int (string (YYText ()));
 		return DIGIT;
 	}
 	{UNSIGNED}		{
-		yylval.i = String_convert::dec2int (String (YYText ()));
+		yylval.i = String_convert::dec2int (string (YYText ()));
 		return UNSIGNED;
 	}
 	{E_UNSIGNED}	{
-		yylval.i = String_convert::dec2int (String (YYText () +1));
+		yylval.i = String_convert::dec2int (string (YYText () +1));
 		return E_UNSIGNED;
 	}
-
 	\" {
 		start_quote ();
 	}
@@ -378,8 +380,8 @@ HYPHEN		--
 		yy_pop_state ();
 
 		/* yylval is union. Must remember STRING before setting SCM*/
-		String *sp = yylval.string;
-		yylval.scm = scm_makfrom0str (sp->to_str0 ());
+		string *sp = yylval.string;
+		yylval.scm = scm_makfrom0str (sp->c_str ());
 		delete sp;
 		return STRING;
 	}
@@ -387,17 +389,38 @@ 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->c_str ());
+		delete sp;
+		return LYRICS_STRING;
+	}
+	.	{
+		*yylval.string += YYText ();
+	}
+}
 
 <lyrics>{
 	\" {
-		start_quote ();
+		start_lyric_quote ();
 	}
 	{FRACTION}	{
 		yylval.scm =  scan_fraction (YYText ());
 		return FRACTION;
 	}
 	{UNSIGNED}		{
-		yylval.i = String_convert::dec2int (String (YYText ()));
+		yylval.i = String_convert::dec2int (string (YYText ()));
 		return UNSIGNED;
 	}
 	{NOTECOMMAND}	{
@@ -405,7 +428,7 @@ HYPHEN		--
 	}
 	{LYRICS} {
 		/* ugr. This sux. */
-		String s (YYText ()); 
+		string s (YYText ()); 
 		if (s == "__")
 			return yylval.i = EXTENDER;
 		if (s == "--")
@@ -416,10 +439,10 @@ HYPHEN		--
 		if (c == '{' ||  c == '}') // brace open is for not confusing dumb tools.
 			here_input ().warning (
 				_ ("Brace found at end of lyric.  Did you forget a space?"));
-		yylval.scm = scm_makfrom0str (s.to_str0 ());
+		yylval.scm = scm_makfrom0str (s.c_str ());
 
 
-		return STRING;
+		return LYRICS_STRING;
 	}
 	. {
 		return YYText ()[0];
@@ -437,7 +460,7 @@ HYPHEN		--
 		return FRACTION;
 	}
 	{UNSIGNED}		{
-		yylval.i = String_convert::dec2int (String (YYText ()));
+		yylval.i = String_convert::dec2int (string (YYText ()));
 		return UNSIGNED;
 	}
 	\" {
@@ -468,21 +491,20 @@ HYPHEN		--
 	\" {
 		start_quote ();
 	}
-	\< {
-		return '<';
-	}
-	\> {
-		return '>';
+	\\score {
+		return SCORE;
 	}
 	{MARKUPCOMMAND} {
-		String str (YYText() + 1);
+		string str (YYText () + 1);
 		SCM s = lookup_markup_command (str);
 
-		if (gh_pair_p (s) && gh_symbol_p (gh_cdr (s)) ) {
-			yylval.scm = gh_car(s);
-			SCM tag = gh_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"))
+				return MARKUP_HEAD_EMPTY;
 			else if (tag == ly_symbol2scm ("markup0-markup1"))
 				return MARKUP_HEAD_MARKUP0_MARKUP1;
 			else if (tag == ly_symbol2scm ("markup-list0"))
@@ -498,7 +520,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 markup signature"); 
 				ly_display_scm (s);
 				assert(false);
 			}
@@ -506,16 +528,17 @@ HYPHEN		--
 			return scan_escaped_word (str);
 	}
 	[{}]	{
-		return YYText()[0];
+		return YYText ()[0];
 	}
 	[^#{}"\\ \t\n\r\f]+ {
-		String s (YYText ()); 
+		string s (YYText ()); 
 
 		char c = s[s.length () - 1];
-		if (c == '{' ||  c == '}') // brace open is for not confusing dumb tools.
+		/* brace open is for not confusing dumb tools.  */
+		if (c == '{' ||  c == '}')
 			here_input ().warning (
 				_ ("Brace found at end of markup.  Did you forget a space?"));
-		yylval.scm = scm_makfrom0str (s.to_str0 ());
+		yylval.scm = scm_makfrom0str (s.c_str ());
 
 
 		return STRING;
@@ -526,13 +549,26 @@ HYPHEN		--
 }
 
 <<EOF>> {
-
-
-	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 ();
 }
 
+<INITIAL>{
+	{DASHED_WORD}	{
+		return scan_bare_word (YYText ());
+	}
+	{DASHED_KEY_WORD}	{
+		return scan_escaped_word (YYText () + 1);
+	}
+}
 
 {WORD}	{
 	return scan_bare_word (YYText ());
@@ -542,15 +578,16 @@ HYPHEN		--
 }
 {REAL}		{
 	Real r;
-	int cnv=sscanf (YYText (), "%lf", &r);
+	int cnv = sscanf (YYText (), "%lf", &r);
 	assert (cnv == 1);
+	(void) cnv;
 
-	yylval.scm = gh_double2scm (r);
+	yylval.scm = scm_from_double (r);
 	return REAL;
 }
 
 {UNSIGNED}	{
-	yylval.i = String_convert::dec2int (String (YYText ()));
+	yylval.i = String_convert::dec2int (string (YYText ()));
 	return UNSIGNED;
 }
 
@@ -570,13 +607,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 '(':
@@ -584,9 +621,11 @@ HYPHEN		--
     case ')':
 	return E_CLOSE;
     case '[':
-	return E_LEFTSQUARE;
+	return E_BRACKET_OPEN;
+    case '+':
+	return E_PLUS;
     case ']':
-	return E_RIGHTSQUARE;
+	return E_BRACKET_CLOSE;
     case '~':
 	return E_TILDE;
     case '\\':
@@ -598,169 +637,185 @@ HYPHEN		--
 }
 
 <*>.		{
-	String msg = _f ("invalid character: `%c'", YYText ()[0]);
-	LexerError (msg.to_str0 ());
+	string msg = _f ("invalid character: `%c'", YYText ()[0]);
+	LexerError (msg.c_str ());
 	return YYText ()[0];
 }
 
 %%
 
 void
-My_lily_lexer::push_note_state ()
+Lily_lexer::push_chord_state (SCM tab)
 {
-	yy_push_state (notes);
+	pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_);
+	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 ()
+Lily_lexer::push_initial_state ()
 {
-	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_ = 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);
+	int k = try_special_identifiers (&yylval.scm , sid);
 	return k >= 0  ? k : SCM_IDENTIFIER;
 }
 
 
 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 ());
+//	SCM sym = ly_symbol2scm (str.c_str ());
+
+	int i = lookup_keyword (str);
+ 	if (i == MARKUP && is_lyric_state ())
+ 		return LYRIC_MARKUP;
+	if (i != -1)
+		return i;
 
-	int l = lookup_keyword (str);
-	if (l != -1) {
-		return l;
-	}
 	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;
 		return identifier_type (sid);
 	}
 
-	if ((YYSTATE != notes) && (YYSTATE != chords)) {
-		SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
-		
-		if (gh_pair_p (pitch))
-		{
-			yylval.scm = ly_cdr (pitch);
-			return NOTENAME_PITCH;
-		}
-	}
-	String msg (_f ("unknown escaped string: `\\%s'", str));	
-	LexerError (msg.to_str0 ());
+	string msg (_f ("unknown escaped string: `\\%s'", str));	
+	LexerError (msg.c_str ());
 
-	yylval.scm = scm_makfrom0str (str.to_str0 ());
+	yylval.scm = scm_makfrom0str (str.c_str ());
 
 	return STRING;
 }
 
 int
-My_lily_lexer::scan_bare_word (String str)
+Lily_lexer::scan_bare_word (string str)
 {
-	SCM sym = ly_symbol2scm (str.to_str0 ());
+	SCM sym = ly_symbol2scm (str.c_str ());
 	if ((YYSTATE == notes) || (YYSTATE == chords)) {
-		SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
-		if (gh_pair_p (pitch)) {
-		    yylval.scm = ly_cdr (pitch);
-                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
-		} else if ((pitch = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
+		SCM handle = SCM_BOOL_F;
+		if (scm_is_pair (pitchname_tab_stack_))
+			handle = scm_hashq_get_handle (scm_car (pitchname_tab_stack_), sym);
+		
+		if (scm_is_pair (handle)) {
+			yylval.scm = scm_cdr (handle);
+			if (unsmob_pitch (yylval.scm)) 
+	                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
+			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 (pitch);
+		    yylval.scm = scm_cdr (handle);
 		    return CHORD_MODIFIER;
 		}
 	}
 
-	yylval.scm = scm_makfrom0str (str.to_str0 ());
+	yylval.scm = scm_makfrom0str (str.c_str ());
 	return STRING;
 }
 
 bool
-My_lily_lexer::note_state_b () const
+Lily_lexer::is_note_state () const
 {
 	return YY_START == notes;
 }
 
 bool
-My_lily_lexer::chord_state_b () const
+Lily_lexer::is_chord_state () const
 {
 	return YY_START == chords;
 }
 
 bool
-My_lily_lexer::lyric_state_b () const
+Lily_lexer::is_lyric_state () const
 {
 	return YY_START == lyrics;
 }
 
 bool
-My_lily_lexer::figure_state_b () const
+Lily_lexer::is_figure_state () const
 {
 	return YY_START == figures;
 }
 
 /*
- urg, belong to String (_convert)
+ urg, belong to string (_convert)
  and should be generalised 
  */
 void
-strip_leading_white (String&s)
+strip_leading_white (string&s)
 {
-	int i=0;
-	for (;  i < s.length (); i++) 
+	ssize i = 0;
+	for (;  i < s.length (); i++)
 		if (!isspace (s[i]))
 			break;
 
-	s = s.nomid_string (0, i);
+	s = s.substr (i);
 }
 
 void
-strip_trailing_white (String&s)
+strip_trailing_white (string&s)
 {
-	int i=s.length ();	
+	ssize i = s.length ();	
 	while (i--) 
 		if (!isspace (s[i]))
 			break;
 
-	s = s.left_string (i+1);
+	s = s.substr (0, i + 1);
 }
 
 
 
-/* 1.9.0 == postfix articulations */ 
-Lilypond_version oldest_version ("1.9.0");
+Lilypond_version oldest_version ("2.7.38");
 
 
 bool
-valid_version_b (String s)
+is_valid_version (string s)
 {
   Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
   Lilypond_version ver (s);
@@ -775,27 +830,27 @@ valid_version_b (String s)
 	
 
 /*
-  substittute _ adn \,
+  substitute _ and \,
 */
-String
-lyric_fudge (String s)
+string
+lyric_fudge (string s)
 {
-  char  * chars  =s.get_copy_str0 ();
+  char *chars = string_copy (s);
 
-  for (char * p = chars; *p ; p++)
+  for (char *p = chars; *p ; p++)
     {
       if (*p == '_' && (p == chars || *(p-1) != '\\'))
 	*p = ' ';
     }
   
-  s = String (chars);
+  s = string (chars);
   delete[] chars;
 
-  int i =0;	
-  if ((i=s.index ("\\,")) != -1)   // change "\," to TeX's "\c "
+  ssize i = 0;	
+  if ((i = s.find ("\\,")) != NPOS)   // change "\," to TeX's "\c "
     {
-      * (s.get_str0 () + i + 1) = 'c';
-      s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2);
+      * (((char*)s.c_str ()) + i + 1) = 'c';
+      s = s.substr (0, i + 2) + " " + s.substr (i - 2);
     }
 
   return s;
@@ -805,44 +860,104 @@ lyric_fudge (String s)
 Convert "NUM/DEN" into a '(NUM . DEN) cons.
 */
 SCM
-scan_fraction (String frac)
+scan_fraction (string frac)
 {
-	int i = frac.index ('/');
-	int l = frac.length ();
-	String left = frac.left_string (i);
-	String right = frac.right_string (l - i - 1);
+	ssize i = frac.find ('/');
+	string left = frac.substr (0, i);
+	string right = frac.substr (i + 1, (frac.length () - i + 1));
 
 	int n = String_convert::dec2int (left);
 	int d = String_convert::dec2int (right);
-	return gh_cons (gh_int2scm (n), gh_int2scm (d));
+	return scm_cons (scm_from_int (n), scm_from_int (d));
+}
+
+SCM
+lookup_markup_command (string s)
+{
+	SCM proc = ly_lily_module_constant ("lookup-markup-command");
+	return scm_call_1 (proc, scm_makfrom0str (s.c_str ()));
+}
+
+struct Parser_signature
+{
+	char *symbol;
+	int token_type;
+};
+static SCM signature_hash_table;
+
+static void init_signature_hash_table ()
+{
+	signature_hash_table = scm_gc_protect_object (scm_c_make_hash_table (31));
+	Parser_signature sigs[]  = {
+		{"scm", MUSIC_FUNCTION_SCM},
+		{"music", MUSIC_FUNCTION_MUSIC},
+		{"scm-music", MUSIC_FUNCTION_SCM_MUSIC},
+		{"scm-scm", MUSIC_FUNCTION_SCM_SCM},
+		{"music-music", MUSIC_FUNCTION_MUSIC_MUSIC},
+		{"scm-music-music", MUSIC_FUNCTION_SCM_MUSIC_MUSIC},
+		{"scm-scm-music", MUSIC_FUNCTION_SCM_SCM_MUSIC},
+		{"scm-scm-scm-music", MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC},
+		{"scm-scm-scm-scm-music", MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC},
+		{"scm-scm-scm", MUSIC_FUNCTION_SCM_SCM_SCM},
+		{"markup", MUSIC_FUNCTION_MARKUP},
+		{"markup-music", MUSIC_FUNCTION_MARKUP_MUSIC},
+		{"markup-markup", MUSIC_FUNCTION_MARKUP_MARKUP},
+		{"markup-music-music", MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC},
+		{"markup-markup-music", MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC},
+		{"noarg", MUSIC_FUNCTION},
+		{0,0}
+	};
+
+	for (int i = 0; sigs[i].symbol; i++)
+		scm_hashq_set_x (signature_hash_table, scm_gc_protect_object (ly_symbol2scm (sigs[i].symbol)),
+				 scm_from_int (sigs[i].token_type));
+}
+
+int
+music_function_type (SCM func)
+{
+	if (!signature_hash_table)
+		init_signature_hash_table ();
+
+	SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
+	SCM token_type = scm_hashq_ref (signature_hash_table, type, SCM_BOOL_F);
+	if (!scm_is_number (token_type))
+		{
+		programming_error (_ ("can't find signature for music function"));
+		return MUSIC_FUNCTION_SCM;
+		}
+	
+	return scm_to_int (token_type);
 }
 
-// Breaks for flex 2.5.31
-#if 0
-/* avoid silly flex induced gcc warnings */
-static void yy_push_state (int) {;}
-static void yy_pop_state () {;}
-static int yy_top_state () { return 0; }
+/* Shut up lexer warnings.  */
+#if YY_STACK_USED
 
 static void
-avoid_silly_flex_induced_gcc_warnings ()
+yy_push_state (int)
 {
-	(void)yy_start_stack_ptr;
-	(void)yy_start_stack_depth;
-	(void)yy_start_stack;
-	yy_push_state (0);
-	yy_pop_state ();
-	yy_top_state ();
-	avoid_silly_flex_induced_gcc_warnings ();
 }
-#endif
 
-SCM
-lookup_markup_command (String s)
+static void
+yy_pop_state ()
+{
+}
+
+static int
+yy_top_state ()
 {
-	static SCM proc ;
-	if (!proc)
-		proc = scm_c_eval_string ("lookup-markup-command");
+  return 0;
+}
 
-	return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ()));
+static void
+silence_lexer_warnings ()
+{
+   (void) yy_start_stack_ptr;
+   (void) yy_start_stack_depth;
+   (void) yy_start_stack;
+   (void) yy_push_state;
+   (void) yy_pop_state;
+   (void) yy_top_state;
+   (void) silence_lexer_warnings;
 }
+#endif