*/
#define isatty HORRIBLEKLUDGE
-void strip_trailing_white (std::string&);
-void strip_leading_white (std::string&);
-std::string lyric_fudge (std::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 (std::string s);
-bool is_valid_version (std::string s);
+SCM lookup_markup_command (string s);
+bool is_valid_version (string s);
#define start_quote() \
yy_push_state (quote);\
- yylval.string = new std::string
+ yylval.string = new string
#define start_lyric_quote() \
yy_push_state (lyric_quote);\
- yylval.string = new std::string
+ yylval.string = new string
#define yylval \
(*(YYSTYPE*)lexval)
*/
-SCM scan_fraction (std::string);
+SCM scan_fraction (string);
SCM (* scm_parse_error_handler) (void *);
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}+
yy_push_state (sourcefilename);
}
<version>\"[^"]*\" { /* got the version number */
- std::string s (YYText () + 1);
+ string s (YYText () + 1);
s = s.substr (0, s.rfind ('\"'));
yy_pop_state ();
}
<sourcefilename>\"[^"]*\" {
- std::string s (YYText () + 1);
+ string s (YYText () + 1);
s = s.substr (0, s.rfind ('\"'));
yy_pop_state ();
LexerError (_ ("quoted string expected after \\version").c_str ());
yy_pop_state ();
}
-<sourcefilename>>. {
+<sourcefilename>. {
LexerError (_ ("quoted string expected after \\sourcefilename").c_str ());
yy_pop_state ();
}
yy_push_state (incl);
}
<incl>\"[^"]*\" { /* got the include file name */
- std::string s (YYText ()+1);
+ string s (YYText ()+1);
s = s.substr (0, s.rfind ('"'));
new_input (s, sources_);
yy_pop_state ();
}
<incl>\\{BLACK}*{WHITE} { /* got the include identifier */
- std::string s = YYText () + 1;
+ string s = YYText () + 1;
strip_trailing_white (s);
if (s.length () && (s[s.length () - 1] == ';'))
s = s.substr (0, s.length () - 1);
new_input (ly_scm2string (sid), sources_);
yy_pop_state ();
} else {
- std::string msg (_f ("wrong or undefined identifier: `%s'", s ));
+ string msg (_f ("wrong or undefined identifier: `%s'", s ));
LexerError (msg.c_str ());
SCM err = scm_current_error_port ();
{
yyinput ();
}
- char_count_stack_.top () += n;
+ char_count_stack_.back () += n;
if (unpack_identifier (sval) != SCM_UNDEFINED)
{
}
{DIGIT} {
- yylval.i = String_convert::dec2int (std::string (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return DIGIT;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2int (std::string (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
{E_UNSIGNED} {
- yylval.i = String_convert::dec2int (std::string (YYText () +1));
+ yylval.i = String_convert::dec2int (string (YYText () +1));
return E_UNSIGNED;
}
\" {
yy_pop_state ();
/* yylval is union. Must remember STRING before setting SCM*/
- std::string *sp = yylval.string;
+ string *sp = yylval.string;
yylval.scm = scm_makfrom0str (sp->c_str ());
delete sp;
return STRING;
yy_pop_state ();
/* yylval is union. Must remember STRING before setting SCM*/
- std::string *sp = yylval.string;
+ string *sp = yylval.string;
yylval.scm = scm_makfrom0str (sp->c_str ());
delete sp;
return LYRICS_STRING;
return FRACTION;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2int (std::string (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
{NOTECOMMAND} {
}
{LYRICS} {
/* ugr. This sux. */
- std::string s (YYText ());
+ string s (YYText ());
if (s == "__")
return yylval.i = EXTENDER;
if (s == "--")
return FRACTION;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2int (std::string (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
\" {
return SCORE;
}
{MARKUPCOMMAND} {
- std::string str (YYText () + 1);
+ string str (YYText () + 1);
SCM s = lookup_markup_command (str);
if (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) {
return YYText ()[0];
}
[^#{}"\\ \t\n\r\f]+ {
- std::string s (YYText ());
+ string s (YYText ());
char c = s[s.length () - 1];
/* brace open is for not confusing dumb tools. */
yyterminate ();
}
+<INITIAL>{
+ {DASHED_WORD} {
+ return scan_bare_word (YYText ());
+ }
+ {DASHED_KEY_WORD} {
+ return scan_escaped_word (YYText () + 1);
+ }
+}
{WORD} {
return scan_bare_word (YYText ());
}
{UNSIGNED} {
- yylval.i = String_convert::dec2int (std::string (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
}
<*>. {
- std::string msg = _f ("invalid character: `%c'", YYText ()[0]);
+ string msg = _f ("invalid character: `%c'", YYText ()[0]);
LexerError (msg.c_str ());
return YYText ()[0];
}
int
-Lily_lexer::scan_escaped_word (std::string str)
+Lily_lexer::scan_escaped_word (string str)
{
// use more SCM for this.
return identifier_type (sid);
}
- std::string msg (_f ("unknown escaped string: `\\%s'", str));
+ string msg (_f ("unknown escaped string: `\\%s'", str));
LexerError (msg.c_str ());
yylval.scm = scm_makfrom0str (str.c_str ());
}
int
-Lily_lexer::scan_bare_word (std::string str)
+Lily_lexer::scan_bare_word (string str)
{
SCM sym = ly_symbol2scm (str.c_str ());
if ((YYSTATE == notes) || (YYSTATE == chords)) {
}
/*
- urg, belong to std::string (_convert)
+ urg, belong to string (_convert)
and should be generalised
*/
void
-strip_leading_white (std::string&s)
+strip_leading_white (string&s)
{
ssize i = 0;
for (; i < s.length (); i++)
}
void
-strip_trailing_white (std::string&s)
+strip_trailing_white (string&s)
{
ssize i = s.length ();
while (i--)
-/* 2.1.2x something -> \property -> \set. */
-Lilypond_version oldest_version ("2.3.22");
+Lilypond_version oldest_version ("2.7.38");
bool
-is_valid_version (std::string s)
+is_valid_version (string s)
{
Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
Lilypond_version ver (s);
/*
substitute _ and \,
*/
-std::string
-lyric_fudge (std::string s)
+string
+lyric_fudge (string s)
{
char *chars = string_copy (s);
*p = ' ';
}
- s = std::string (chars);
+ s = string (chars);
delete[] chars;
ssize i = 0;
Convert "NUM/DEN" into a '(NUM . DEN) cons.
*/
SCM
-scan_fraction (std::string frac)
+scan_fraction (string frac)
{
ssize i = frac.find ('/');
- std::string left = frac.substr (0, i);
- std::string right = frac.substr (i + 1, (frac.length () - i + 1));
+ 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);
}
SCM
-lookup_markup_command (std::string s)
+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", MUSIC_FUNCTION_SCM_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"));
- 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 ("scm-scm-scm"))
- {
- return MUSIC_FUNCTION_SCM_SCM_SCM;
- }
- 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
+ SCM token_type = scm_hashq_ref (signature_hash_table, type, SCM_BOOL_F);
+ if (!scm_is_number (token_type))
{
- /* TODO: print location */
- error (_ ("can't find signature for music function"));
+ programming_error (_ ("can't find signature for music function"));
+ return MUSIC_FUNCTION_SCM;
}
-
- return MUSIC_FUNCTION_SCM;
+
+ return scm_to_int (token_type);
}
/* Shut up lexer warnings. */
projects / lilypond.git / blobdiff