source file of the LilyPond music typesetter
- (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
*/
-#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 "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"
#include "main.hh"
#include "version.hh"
#include "lilypond-input-version.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
#include "identifier-smob.hh"
/*
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);
-
+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
+#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 ());
/*
%option noyywrap
%option nodefault
%option debug
-%option yyclass="My_lily_lexer"
+%option yyclass="Lily_lexer"
%option stack
%option never-interactive
%option warn
-%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}|_
RESTNAME [rs]
NOTECOMMAND \\{A}+
MARKUPCOMMAND \\({A}|[-_])+
-LYRICS ({AA}|{TEX})[^0-9 \t\n\f]*
+LYRICS ({AA}|{TEX})[^0-9 \t\n\r\f]*
ESCAPED [nt\\'"]
EXTENDER __
HYPHEN --
+BOM_UTF8 \357\273\277
%%
// 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);
}
- %[^{\n].*\n {
+ %[^{\n\r].*[\n\r] {
}
- %[^{\n] { // backup rule
+ %[^{\n\r] { // backup rule
}
- %\n {
+ %[\n\r] {
}
- %[^{\n].* {
+ %[^{\n\r].* {
}
{WHITE}+ {
<INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
yy_push_state (version);
}
+<INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}* {
+ yy_push_state (renameinput);
+}
<version>\"[^"]*\" { /* got the version number */
- String s (YYText ()+1);
+ String s (YYText () + 1);
s = s.left_string (s.index_last ('\"'));
yy_pop_state ();
- if (!valid_version_b (s))
+ 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);
+ s = s.left_string (s.index_last ('\"'));
+
+ 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 (scm_car (scopes_),
+ ly_symbol2scm ("input-file-name"),
+ scm_makfrom0str (s.to_str0 ()));
+
}
<version>. {
- LexerError ("No quoted string found after \\version");
+ LexerError (_ ("quoted string expected after \\version").to_str0 ());
+ yy_pop_state ();
+}
+<renameinput>. {
+ LexerError (_ ("quoted string expected after \\renameinput").to_str0 ());
yy_pop_state ();
}
<longcomment>{
}
<<EOF>> {
LexerError (_ ("EOF found inside a comment").to_str0 ());
+ is_main_input_ = false;
if (! close_input ())
yyterminate (); // can't move this, since it actually rets a YY_NULL
}
<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 */
+<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 (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 ));
}
}
<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 ();
}
yylval.scm = sval;
return SCM_T;
}
-<INITIAL,notes,markup>{
+<INITIAL,notes,lyrics>{
\<\< {
- return CHORD_OPEN;
+ return DOUBLE_ANGLE_OPEN;
}
\>\> {
- return CHORD_CLOSE;
+ return DOUBLE_ANGLE_CLOSE;
}
}
<figures>{
yylval.i = String_convert::dec2int (String (YYText () +1));
return E_UNSIGNED;
}
-
\" {
start_quote ();
}
*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 ());
yylval.scm = scm_makfrom0str (s.to_str0 ());
- return STRING;
+ return LYRICS_STRING;
}
. {
return YYText ()[0];
\" {
start_quote ();
}
+ \\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"))
return MARKUP_HEAD_SCM0_MARKUP1;
else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2"))
return MARKUP_HEAD_SCM0_SCM1_MARKUP2;
+ else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
+ return MARKUP_HEAD_SCM0_SCM1_SCM2;
else {
+ programming_error ("no parser tag defined for this markup signature");
ly_display_scm (s);
assert(false);
}
} else
return scan_escaped_word (str);
}
- {LYRICS} {
+ [{}] {
+ return YYText ()[0];
+ }
+ [^#{}"\\ \t\n\r\f]+ {
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 lyric. Did you forget a space?"));
+ _ ("Brace found at end of markup. Did you forget a space?"));
yylval.scm = scm_makfrom0str (s.to_str0 ());
return STRING;
}
- {WHITE} {
-
- }
- . {
- return YYText ()[0];
+ . {
+ return YYText()[0];
}
}
<<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 ();
}
}
{REAL} {
Real r;
- int cnv=sscanf (YYText (), "%lf", &r);
+ int cnv = sscanf (YYText (), "%lf", &r);
assert (cnv == 1);
- yylval.scm = gh_double2scm (r);
+ yylval.scm = scm_from_double (r);
return REAL;
}
}
<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 '(':
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 '\\':
%%
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.to_str0 ());
+
+ 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 ());
}
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 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;
}
}
}
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;
}
void
strip_leading_white (String&s)
{
- int i=0;
+ int i = 0;
for (; i < s.length (); i++)
if (!isspace (s[i]))
break;
void
strip_trailing_white (String&s)
{
- int i=s.length ();
+ int i = s.length ();
while (i--)
if (!isspace (s[i]))
break;
-/* 1.3.146 == removal of ; */
-Lilypond_version oldest_version ("1.3.146");
+/* 2.1.2x something -> \property -> \set. */
+Lilypond_version oldest_version ("2.3.22");
bool
-valid_version_b (String s)
+is_valid_version (String s)
{
Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
Lilypond_version ver (s);
/*
- substittute _ adn \,
+ substitute _ and \,
*/
String
lyric_fudge (String s)
{
- char * chars =s.get_copy_str0 ();
+ char * chars = s.get_copy_str0 ();
for (char * p = chars; *p ; p++)
{
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);
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.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 ("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
+ {
+ /* TODO: print location */
+ error (_ ("can't find signature for music function"));
+ }
+
+ return MUSIC_FUNCTION_SCM;
}
-// 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 SCM proc ;
- if (!proc)
- proc = scm_c_eval_string ("lookup-markup-command");
+}
- return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ()));
+static int
+yy_top_state ()
+{
+ return 0;
}
+
+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
projects / lilypond.git / blobdiff