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>
*/
*/
-#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 "lily-lexer.hh"
#include "interval.hh"
#include "lily-guile.hh"
#include "parser.hh"
#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 chords
-%x encoding
%x figures
%x incl
%x lyrics
%x lyric_quote
%x longcomment
-%x markup
+%x markup
%x notes
%x quote
%x renameinput
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);
}
}
}
-<INITIAL,notes>\\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 ('\"'));
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>{
}
<<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
}
<INITIAL,chords,lyrics,notes,figures>\\maininput {
- if (!main_input_b_)
+ if (!is_main_input_)
{
start_main_input ();
- main_input_b_ = true;
-/*
-This is broken - we should switch to \notes when the pitchnames are loaded.
-Then we get spanish etc. correct. --hwn.
-
-*/
- SCM nn = lookup_identifier ("pitchnames");
- push_note_state (alist_to_hashq (nn));
+ is_main_input_ = true;
}
else
error (_ ("\\maininput not allowed outside init files"));
<INITIAL,chords,lyrics,figures,notes>\\include {
yy_push_state (incl);
}
-<incl>\"[^"]*\";? { /* got the include file name */
-/* FIXME: semicolon? */
+<incl>\"[^"]*\" { /* got the include file name */
String s (YYText ()+1);
s = s.left_string (s.index_last ('"'));
new_input (s, sources_);
yy_pop_state ();
}
-<incl>\\{BLACK}*;?{WHITE} { /* got the include identifier */
-/* FIXME: semicolon? */
+<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 (ly_c_string_p (sid)) {
+ if (scm_is_string (sid)) {
new_input (ly_scm2string (sid), sources_);
yy_pop_state ();
} else {
}
}
<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)
{
error_level_ = 1;
}
- for (int i=0; i < n; i++)
+ for (int i = 0; i < n; i++)
{
yyinput ();
}
yylval.i = String_convert::dec2int (String (YYText () +1));
return E_UNSIGNED;
}
-
\" {
start_quote ();
}
\" {
start_quote ();
}
- \< {
- return '<';
- }
- \> {
- return '>';
- }
\\score {
return SCORE;
}
String str (YYText () + 1);
SCM s = lookup_markup_command (str);
- if (ly_c_pair_p (s) && ly_c_symbol_p (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"))
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);
}
}
<<EOF>> {
- if (main_input_b_)
+ if (is_main_input_)
{
- main_input_b_ = false;
+ is_main_input_ = false;
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 = scm_make_real (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_chord_state (SCM tab)
+Lily_lexer::push_chord_state (SCM tab)
{
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_initial_state ()
+Lily_lexer::push_initial_state ()
{
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::push_note_state (SCM tab)
+Lily_lexer::push_note_state (SCM tab)
{
pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_);
yy_push_state (notes);
}
void
-My_lily_lexer::pop_state ()
+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;
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);
}
}
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 (ly_c_pair_p (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 (ly_c_pair_p (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 (ly_c_symbol_p (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;
}
}
}
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;
}
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;
/* 2.1.2x something -> \property -> \set. */
-Lilypond_version oldest_version ("2.2.0");
+Lilypond_version oldest_version ("2.3.22");
bool
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 scm_cons (scm_int2num (n), scm_int2num (d));
-}
-
-// 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; }
-
-static void
-avoid_silly_flex_induced_gcc_warnings ()
-{
- (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 ();
+ return scm_cons (scm_from_int (n), scm_from_int (d));
}
-#endif
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"));
+ SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
if (type == ly_symbol2scm ("scm"))
{
return MUSIC_FUNCTION_SCM;
{
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 not find signature for music function.");
+ error (_ ("can't find signature for music function"));
}
return MUSIC_FUNCTION_SCM;
}
+
+/* Shut up lexer warnings. */
+#if YY_STACK_USED
+
+static void
+yy_push_state (int)
+{
+}
+
+static void
+yy_pop_state ()
+{
+}
+
+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