Implement OnSong parser #461
Draft
+843
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![codeclimate[bot]](https://avatars.githubusercontent.com/in/9403?s=60&v=4){kind=small}
bkeepers
force-pushed
the
onsong-parser
branch
from
f96211a
to
fa6045d
Compare
bkeepers
commented
Feb 17, 2022
| DirectiveSection | ||
| = "{" _ ("start_of_" / "so") type:DirectiveSectionTypes _ name:(":" _ @MetaValue)? "}" EOL | ||
| items:SectionBody* | ||
| "{" _ ("end_of_" / "eo") DirectiveSectionTypes _ "}" EOL // FIXME: must match start tag |
src/parser/on_song_grammar.pegjs
Outdated
| ChordsOverLyrics | ||
| = chords:(_ @(chord:Chord { return { chord, column: location().start.column } }))+ EOL | ||
| lyrics:(@Lyrics EOL)? { | ||
| // FIXME: |
| '[D/F#]': 'D/F#', | ||
| '[Bsus2]': 'Bsus2', | ||
| '\\[notachord]': Error, | ||
| // '[unknown]': ExpectWarning, // FIXME |
* origin/master: Bump jest from 27.4.0 to 27.5.1 (martijnversluis#463) Bump @babel/core from 7.17.0 to 7.17.5 (martijnversluis#464) 6.0.2 Ensure pinst is installed 6.0.1 Add Husky pre-commit hook to re-generate README.md on commit (martijnversluis#462) Point sponsor button to GitHub sponsors profile 6.0.0 Enharmonic rules (martijnversluis#460)
bkeepers
commented
Feb 21, 2022
| ], | ||
| }, | ||
|
|
||
| // TODO: "You can also start the line with a period or a back tick character |
| ChordsOverLyrics | ||
| = annotations:(_ @(annotation:(Chord / MusicalInstruction) { return { annotation, column: location().start.column } }))+ EOL | ||
| lyrics:(@Lyrics EOL)? { | ||
| // FIXME: Is there a better way to do this in PEG? |
* origin/master: Bump eslint from 8.9.0 to 8.10.0 (martijnversluis#468) 6.1.0 Implement Song#setCapo and Song#setKey (martijnversluis#467) Bump pinst from 2.1.6 to 3.0.0 (martijnversluis#465) Bump @babel/cli from 7.17.3 to 7.17.6 (martijnversluis#466)
|
Code Climate has analyzed commit d32c941 and detected 4 issues on this pull request. Here's the issue category breakdown:
View more on Code Climate. |
|
@bkeepers Hey just wanted to notify you: within a downstream fork we did a TypeScript conversion and we had to migrate to Peggy too. I'll be merging the PR. Please let me know if you need any help rebasing your PR, I'm eager to help you out. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a WIP for implementing a parser for the OnSong format. I'm opening it early as it will likely be a long-lived PR that will require a lot of feedback and involve changes to other parts of ChordSheetJS.
TODO:
{start_of_*}…{end_of_*})SongmodelMaybe not in this PR, but other things that could be added eventually:
parse(source, {transpose: 2})- With support for calling JS functions in peg.js, I think it would be just as easy to perform transpose at parse timeCloses #458
cc chordbook/chordbook#130 @mattgraham