From cf7819c0ae01556e251284786660e1805a3f802c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 6 Sep 2002 17:56:36 +0000 Subject: [PATCH] (chord_inversion): use CHORD_SLASH for '/' --- ChangeLog | 4 ++++ lily/lexer.ll | 3 +++ lily/parser.yy | 13 +++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ec04b9e98..91da130e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-09-06 Han-Wen Nienhuys + + * lily/parser.yy (chord_inversion): use CHORD_SLASH for '/' + 2002-09-06 Jérémie Lumbroso * Documentation/user/refman.itely: minor corrections (replacing diff --git a/lily/lexer.ll b/lily/lexer.ll index 78b43638f2..8413a0ce43 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -398,6 +398,9 @@ HYPHEN -- \/\+ { return CHORD_BASS; } + \/ { + return CHORD_SLASH; + } \^ { return CHORD_CARET; } diff --git a/lily/parser.yy b/lily/parser.yy index eb01922e05..66b2e63568 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -243,7 +243,7 @@ yylex (YYSTYPE *s, void * v) %token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE %token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE %token E_BACKSLASH -%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET +%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET CHORD_SLASH %token FIGURE_SPACE @@ -310,6 +310,7 @@ yylex (YYSTYPE *s, void * v) %type command_req verbose_command_req %type extender_req %type hyphen_req +%type string_request %type string bare_number number_expression number_term number_factor %type score_block score_body @@ -1396,9 +1397,17 @@ post_request: verbose_request | request_with_dir | close_request + | string_request ; +/* +TODO. +*/ +string_request: + '/' DIGIT { $$ = new Text_script_req (); } + ; + request_that_take_dir: gen_text_def | verbose_request @@ -2025,7 +2034,7 @@ chord_inversion: { $$ = SCM_EOL; } - | '/' steno_tonic_pitch { + | CHORD_SLASH steno_tonic_pitch { $$ = $2; } ; -- 2.39.5