s416496/musique
1
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

changed chord invocation arguments

Browse Source
This commit is contained in:
Robert Bendun 2022-10-27 21:09:46 +02:00
parent 02740d5865
commit e4797d08e1
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Block can be called with more parameters then it requires - Block can be called with more parameters then it requires
- Removed `[]` sequence notation in favour of `()` - Removed `[]` sequence notation in favour of `()`
- reorganized fold argument order - reorganized fold argument order
- Moved from `(<note> <octave> <length>)` invocation to `(<note> <length>)`
### Fixed ### Fixed

16
musique/value/chord.cc
View File

@ -30,23 +30,21 @@ Result<Value> Chord::operator()(Interpreter& interpreter, std::vector<Value> arg
std::vector<Chord> current = { *this }; std::vector<Chord> current = { *this };
enum State { enum State {
Waiting_For_Octave,
Waiting_For_Length, Waiting_For_Length,
Waiting_For_Note Waiting_For_Note
} state = Waiting_For_Octave; } state = Waiting_For_Length;
static constexpr auto guard = Guard<1> { static constexpr auto guard = Guard<1> {
.name = "note creation", .name = "note creation",
.possibilities = { .possibilities = {
"(note:music [octave:number [duration:number]])+" "(note:music [duration:number])+"
} }
}; };
auto const next = [&state] { auto const next = [&state] {
switch (state) { switch (state) {
break; case Waiting_For_Length: state = Waiting_For_Note; break; case Waiting_For_Length: state = Waiting_For_Note;
break; case Waiting_For_Note: state = Waiting_For_Octave; break; case Waiting_For_Note: state = Waiting_For_Length;
break; case Waiting_For_Octave: state = Waiting_For_Length;
} }
}; };
@ -58,10 +56,6 @@ Result<Value> Chord::operator()(Interpreter& interpreter, std::vector<Value> arg
}; };
switch (state) { switch (state) {
break; case Waiting_For_Octave:
resolve(&Note::octave, number.floor().as_int());
return {};
break; case Waiting_For_Length: break; case Waiting_For_Length:
resolve(&Note::length, number); resolve(&Note::length, number);
return {}; return {};
@ -73,7 +67,7 @@ Result<Value> Chord::operator()(Interpreter& interpreter, std::vector<Value> arg
for (auto &arg : args) { for (auto &arg : args) {
if (auto collection = get_if<Collection>(arg)) { if (auto collection = get_if<Collection>(arg)) {
if (state != Waiting_For_Length && state != Waiting_For_Octave) { if (state != Waiting_For_Length) {
return guard.yield_error(); return guard.yield_error();
} }
@ -106,7 +100,7 @@ Result<Value> Chord::operator()(Interpreter& interpreter, std::vector<Value> arg
[](Chord &c) { return std::move(c); }); [](Chord &c) { return std::move(c); });
current.clear(); current.clear();
current.push_back(std::move(*chord)); current.push_back(std::move(*chord));
state = Waiting_For_Octave; state = Waiting_For_Length;
} }
} }