projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce the doctest lease duration...
[python_utils.git]
/
music
/
chords.g4
diff --git
a/music/chords.g4
b/music/chords.g4
index 9083e7530a6ff1d5bc9b4c1f2a3c200b7f35af39..182461760d11f9e836740f2d5ec55a1567ce0a23 100644
(file)
--- a/
music/chords.g4
+++ b/
music/chords.g4
@@
-17,7
+17,8
@@
grammar chords;
parse
grammar chords;
parse
- : rootNote majMinSusPowerExpr* addNotesExpr* extensionExpr* overBassNoteExpr*
+ : rootNote majMinSusPowerExpr* addNotesExpr* overBassNoteExpr*
+ | rootNote majMinSusPowerExpr* addNotesExpr extensionExpr* overBassNoteExpr
;
rootNote
;
rootNote
@@
-53,6
+54,7
@@
addNotesExpr
: ADD* SIX
| ADD* SEVEN
| MAJ_SEVEN
: ADD* SIX
| ADD* SEVEN
| MAJ_SEVEN
+ | MIN_SEVEN
| ADD* NINE
| ADD* ELEVEN
;
| ADD* NINE
| ADD* ELEVEN
;
@@
-127,6
+129,8
@@
ELEVEN: '11';
MAJ_SEVEN: MAJOR '7';
MAJ_SEVEN: MAJOR '7';
+MIN_SEVEN: MINOR '7';
+
INTERVAL: (MAJOR|MINOR)* ('b'|'#')* DIGITS ;
DIGITS: [1-9]+ ;
INTERVAL: (MAJOR|MINOR)* ('b'|'#')* DIGITS ;
DIGITS: [1-9]+ ;