(c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
-
+#include <ctype.h>
#include <iostream.h>
+
#include "translator-def.hh"
#include "lily-guile.hh"
#include "change-iterator.hh"
#include "un-relativable-music.hh"
#include "chord.hh"
+
+
+bool
+regular_identifier_b (SCM id)
+{
+ String str = ly_scm2string (id);
+ char const *s = str.ch_C() ;
+
+ bool v = true;
+ while (*s && v)
+ {
+ v = v && isalpha (*s);
+ s++;
+ }
+ return v;
+}
+
+
bool
is_duration_b (int t)
{
%union {
Link_array<Request> *reqvec;
- String * string;
+
+ String *string; // needed by the lexer as temporary scratch area.
Music *music;
Score *score;
Scope *scope;
Scheme_hash_table *scmhash;
- Musical_req* musreq;
Music_output_def * outputdef;
- Midi_def* midi;
- Real real;
Request * request;
/* We use SCMs to do strings, because it saves us the trouble of
%token MIDI
%token MM_T
%token PITCH
+%token DEFAULT
%token NAME
%token PITCHNAMES
%token NOTES
%token <scm> MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER
%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
%token <scm> RESTNAME
-%token <scm> STRING
+%token <scm> STRING
%token <scm> SCM_T
%token <i> UNSIGNED
-%token <real> REAL
+%token <scm> REAL
%type <outputdef> output_def
%type <scmhash> lilypond_header lilypond_header_body
%type <request> extender_req
%type <request> hyphen_req
%type <scm> string bare_number number_expression
+
%type <score> score_block score_body
%type <scm> translator_spec_block translator_spec_body
Scope *sc = new Scope ($$);
THIS->lexer_p_-> scope_l_arr_.push (sc);
}
- | lilypond_header_body assignment semicolon {
+ | lilypond_header_body assignment {
}
;
THIS->remember_spot ();
}
/* cont */ '=' identifier_init {
+ if (! regular_identifier_b ($1))
+ THIS->parser_error (_ ("Identifier should have alphabetic characters only"));
+
THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4);
/*
$$ = unsmob_translator_def ($1)->clone_scm ();
unsmob_translator_def ($$)-> set_spot (THIS->here_input ());
}
- | TYPE STRING semicolon {
+ | TYPE STRING {
$$ = Translator_def::make_scm ();
Translator_def*td = unsmob_translator_def ($$);
td->translator_group_type_ = $2;
unsmob_translator_def ($$)->add_pop_property (
scm_string_to_symbol ($2), $4);
}
- | translator_spec_body STRING '=' identifier_init semicolon {
- SCM v = gh_int2scm (0);
- if (gh_string_p ($4) || gh_number_p ($4) || gh_boolean_p ($4))
- v = $4;
- else
- THIS->parser_error (_ ("Wrong type for property value"));
-
- /* ugh*/
- unsmob_translator_def ($$)->add_property_assign ($2, v);
- }
- | translator_spec_body NAME STRING semicolon {
+ | translator_spec_body NAME STRING {
unsmob_translator_def ($$)->type_name_ = $3;
}
- | translator_spec_body CONSISTS STRING semicolon {
+ | translator_spec_body CONSISTS STRING {
unsmob_translator_def ($$)->add_element ($3);
}
- | translator_spec_body ALIAS STRING semicolon {
+ | translator_spec_body ALIAS STRING {
Translator_def*td = unsmob_translator_def ($$);
td->type_aliases_ = gh_cons ($3, td->type_aliases_);
}
->add_property_assign (scm_symbol_to_string (gh_caar (p)), gh_cdar (p));
}
- | translator_spec_body CONSISTSEND STRING semicolon {
+ | translator_spec_body CONSISTSEND STRING {
unsmob_translator_def ($$)->add_last_element ( $3);
}
- | translator_spec_body ACCEPTS STRING semicolon {
+ | translator_spec_body ACCEPTS STRING {
unsmob_translator_def ($$)->set_acceptor ($3,true);
}
- | translator_spec_body DENIES STRING semicolon {
+ | translator_spec_body DENIES STRING {
unsmob_translator_def ($$)->set_acceptor ($3,false);
}
- | translator_spec_body REMOVE STRING semicolon {
+ | translator_spec_body REMOVE STRING {
unsmob_translator_def ($$)->remove_element ($3);
}
;
THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
$$ = p;
}
- | music_output_def_body assignment semicolon {
+ | music_output_def_body assignment {
}
| music_output_def_body translator_spec_block {
| music_output_def_body STYLESHEET embedded_scm {
dynamic_cast<Paper_def*> ($$)-> style_sheet_ = $3;
}
- | music_output_def_body tempo_request semicolon {
+ | music_output_def_body tempo_request {
/*
junk this ? there already is tempo stuff in
music.
scm_unprotect_object ($2->self_scm ());
}
- | CONTEXT STRING '=' STRING Music {
+ | CONTEXT string '=' string Music {
Context_specced_music *csm = new Context_specced_music (SCM_EOL);
csm->set_mus_property ("element", $5->self_scm ());
scm_unprotect_object ($5->self_scm ());
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
}
- | BAR STRING ';' {
+ | BAR STRING {
Music *t = new Music (SCM_EOL);
t->set_mus_property ("iterator-ctor",
csm->set_mus_property ("context-type", ly_str02scm ("Score"));
}
- | PARTIAL duration_length ';' {
+ | PARTIAL duration_length {
Music * p = new Music (SCM_EOL);
p->set_mus_property ("symbol", ly_symbol2scm ( "measurePosition"));
p->set_mus_property ("iterator-ctor",
$$ =sp ;
sp-> set_mus_property ("context-type", ly_str02scm ( "Score"));
}
- | CLEF STRING ';' {
+ | CLEF STRING {
SCM func = scm_eval2 (ly_symbol2scm ("clef-name-to-properties"), SCM_EOL);
SCM result = gh_call1 (func, $2);
$$ =sp ;
sp-> set_mus_property ("context-type", ly_str02scm ("Staff"));
}
- | TIME_T bare_unsigned '/' bare_unsigned ';' {
+ | TIME_T bare_unsigned '/' bare_unsigned {
Music * p = new Music (SCM_EOL);
p->set_mus_property ("symbol",
ly_symbol2scm ( "timeSignatureFraction"));
command_req:
shorthand_command_req { $$ = $1; }
- | verbose_command_req semicolon { $$ = $1; }
+ | verbose_command_req { $$ = $1; }
;
shorthand_command_req:
sp_p->set_spot (THIS->here_input ());
$$ = sp_p;
}
- | MARK {
+ | MARK DEFAULT {
Mark_req * m = new Mark_req;
$$ = m;
}
$$ = m;
}
- | PENALTY bare_int {
+ | PENALTY SCM_T {
+
+
Break_req * b = new Break_req;
- b->set_mus_property ("penalty", gh_double2scm ( $2 / 100.0));
+ SCM s = $2;
+ if (!gh_number_p (s))
+ s =gh_int2scm (0);
+
+ b->set_mus_property ("penalty", s);
b->set_spot (THIS->here_input ());
$$ = b;
}
| tempo_request {
$$ = $1;
}
- | KEY {
+ | KEY DEFAULT {
Key_change_req *key_p= new Key_change_req;
$$ = key_p;
}
gen_text_def
| verbose_request
| script_abbreviation {
- SCM s = THIS->lexer_p_->lookup_identifier ("dash-" + ly_scm2string ($1));
+ SCM s = THIS->lexer_p_->lookup_identifier ("dash" + ly_scm2string ($1));
Articulation_req *a = new Articulation_req;
if (gh_string_p (s))
a->set_mus_property ("articulation-type", s);
script_abbreviation:
'^' {
- $$ = gh_str02scm ("hat");
+ $$ = gh_str02scm ("Hat");
}
| '+' {
- $$ = gh_str02scm ("plus");
+ $$ = gh_str02scm ("Plus");
}
| '-' {
- $$ = gh_str02scm ("dash");
+ $$ = gh_str02scm ("Dash");
}
| '|' {
- $$ = gh_str02scm ("bar");
+ $$ = gh_str02scm ("Bar");
}
| '>' {
- $$ = gh_str02scm ("larger");
+ $$ = gh_str02scm ("Larger");
}
| '.' {
- $$ = gh_str02scm ("dot");
+ $$ = gh_str02scm ("Dot");
}
;
$$ = new Sequential_music (SCM_EOL);
$$->set_mus_property ("elements", ms);
}
- | STRING {
- THIS->remember_spot ();
- }
- /* cont */
- optional_notemode_duration {
- if (!THIS->lexer_p_->lyric_state_b ()) {
- THIS->pop_spot ().error (_ ("Have to be in Lyric mode for lyrics"));
- THIS->error_level_i_ = 1;
- THIS->parser_error (_ ("Giving up"));
- }
- else
- THIS->pop_spot ();
+ | STRING optional_notemode_duration {
+
Lyric_req* lreq_p = new Lyric_req;
lreq_p->set_mus_property ("text", $1);
- lreq_p->set_mus_property ("duration",$3);
+ lreq_p->set_mus_property ("duration",$2);
lreq_p->set_spot (THIS->here_input ());
Simultaneous_music* velt_p = new Request_chord (SCM_EOL);
velt_p->set_mus_property ("elements", gh_list (lreq_p->self_scm (), SCM_UNDEFINED));
UNSIGNED {
$$ = gh_int2scm ($1);
}
- | DIGIT {
- $$ = gh_int2scm ($1);
- }
| REAL {
- $$ = gh_double2scm ($1);
+ $$ = $1;
}
| NUMBER_IDENTIFIER {
$$ = $1;
}
| REAL CM_T {
- $$ = gh_double2scm ($1 CM);
+ $$ = gh_double2scm (gh_scm2double ($1) CM );
}
| REAL PT_T {
- $$ = gh_double2scm ($1 PT);
+ $$ = gh_double2scm (gh_scm2double ($1) PT);
}
| REAL IN_T {
- $$ = gh_double2scm ($1 INCH);
+ $$ = gh_double2scm (gh_scm2double ($1) INCH);
}
| REAL MM_T {
- $$ = gh_double2scm ($1 MM);
+ $$ = gh_double2scm (gh_scm2double ($1) MM);
}
| REAL CHAR_T {
- $$ = gh_double2scm ($1 CHAR);
+ $$ = gh_double2scm (gh_scm2double ($1) CHAR);
}
;
bare_unsigned:
- bare_number {
- if (scm_integer_p ($1) == SCM_BOOL_T) {
- $$ = gh_scm2int ($1);
-
- } else {
- THIS->parser_error (_ ("need integer number arg"));
- $$ = 0;
- }
- if ($$ < 0) {
- THIS->parser_error (_ ("Must be positive integer"));
- $$ = -$$;
- }
-
+ UNSIGNED {
+ $$ = $1;
+ }
+ | DIGIT {
+ $$ = $1;
}
;
+
bare_int:
bare_number {
if (scm_integer_p ($1) == SCM_BOOL_T)
;
-semicolon:
- ';'
- ;
-
%%
void
projects / lilypond.git / blobdiff