sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename Opcode member "opcode" to "name"

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-02-22 19:16:27 +01:00
parent 1fdf900725
commit 10ffad5d4b
8 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devtools/Preprocessor.cpp
View file

@ -39,13 +39,13 @@ protected:
std::cout << '\n'; std::cout << '\n';
std::cout << '<' << header << '>' << '\n'; std::cout << '<' << header << '>' << '\n';
for (const sfz::Opcode& opc : opcodes) for (const sfz::Opcode& opc : opcodes)
std::cout << opc.opcode << '=' << opc.value << '\n'; std::cout << opc.name << '=' << opc.value << '\n';
} }
else if (g_mode == OutputXML) { else if (g_mode == OutputXML) {
pugi::xml_node block_node = g_xml_doc.append_child(header.c_str()); pugi::xml_node block_node = g_xml_doc.append_child(header.c_str());
for (const sfz::Opcode& opc : opcodes) { for (const sfz::Opcode& opc : opcodes) {
pugi::xml_node opcode_node = block_node.append_child("opcode"); pugi::xml_node opcode_node = block_node.append_child("opcode");
opcode_node.append_attribute("name").set_value(opc.opcode.c_str()); opcode_node.append_attribute("name").set_value(opc.name.c_str());
opcode_node.append_attribute("value").set_value(opc.value.c_str()); opcode_node.append_attribute("value").set_value(opc.value.c_str());
} }
} }

31
src/sfizz/Opcode.cpp
View file

@ -7,6 +7,7 @@
#include "Opcode.h" #include "Opcode.h"
#include "LFODescription.h" #include "LFODescription.h"
#include "StringViewHelpers.h" #include "StringViewHelpers.h"
#include "Debug.h"
#include "absl/strings/ascii.h" #include "absl/strings/ascii.h"
#include "absl/strings/match.h" #include "absl/strings/match.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
@ -17,31 +18,31 @@
namespace sfz { namespace sfz {
Opcode::Opcode(absl::string_view inputOpcode, absl::string_view inputValue) Opcode::Opcode(absl::string_view inputOpcode, absl::string_view inputValue)
: opcode(trim(inputOpcode)) : name(trim(inputOpcode))
, value(trim(inputValue)) , value(trim(inputValue))
, category(identifyCategory(inputOpcode)) , category(identifyCategory(inputOpcode))
{ {
size_t nextCharIndex { 0 }; size_t nextCharIndex { 0 };
int parameterPosition { 0 }; int parameterPosition { 0 };
auto nextNumIndex = opcode.find_first_of("1234567890"); auto nextNumIndex = name.find_first_of("1234567890");
while (nextNumIndex != opcode.npos) { while (nextNumIndex != name.npos) {
const auto numLetters = nextNumIndex - nextCharIndex; const auto numLetters = nextNumIndex - nextCharIndex;
parameterPosition += numLetters; parameterPosition += numLetters;
lettersOnlyHash = hashNoAmpersand(opcode.substr(nextCharIndex, numLetters), lettersOnlyHash); lettersOnlyHash = hashNoAmpersand(name.substr(nextCharIndex, numLetters), lettersOnlyHash);
nextCharIndex = opcode.find_first_not_of("1234567890", nextNumIndex); nextCharIndex = name.find_first_not_of("1234567890", nextNumIndex);
uint32_t returnedValue; uint32_t returnedValue;
const auto numDigits = (nextCharIndex == opcode.npos) ? opcode.npos : nextCharIndex - nextNumIndex; const auto numDigits = (nextCharIndex == name.npos) ? name.npos : nextCharIndex - nextNumIndex;
if (absl::SimpleAtoi(opcode.substr(nextNumIndex, numDigits), &returnedValue)) { if (absl::SimpleAtoi(name.substr(nextNumIndex, numDigits), &returnedValue)) {
lettersOnlyHash = hash("&", lettersOnlyHash); lettersOnlyHash = hash("&", lettersOnlyHash);
parameters.push_back(returnedValue); parameters.push_back(returnedValue);
} }
nextNumIndex = opcode.find_first_of("1234567890", nextCharIndex); nextNumIndex = name.find_first_of("1234567890", nextCharIndex);
} }
if (nextCharIndex != opcode.npos) if (nextCharIndex != name.npos)
lettersOnlyHash = hashNoAmpersand(opcode.substr(nextCharIndex), lettersOnlyHash); lettersOnlyHash = hashNoAmpersand(name.substr(nextCharIndex), lettersOnlyHash);
} }
static absl::string_view extractBackInteger(absl::string_view opcodeName) static absl::string_view extractBackInteger(absl::string_view opcodeName)
@ -54,7 +55,7 @@ static absl::string_view extractBackInteger(absl::string_view opcodeName)
std::string Opcode::getDerivedName(OpcodeCategory newCategory, unsigned number) const std::string Opcode::getDerivedName(OpcodeCategory newCategory, unsigned number) const
{ {
std::string derivedName(opcode); std::string derivedName(name);
switch (category) { switch (category) {
case kOpcodeNormal: case kOpcodeNormal:
@ -65,8 +66,8 @@ std::string Opcode::getDerivedName(OpcodeCategory newCategory, unsigned number)
case kOpcodeSmoothCcN: case kOpcodeSmoothCcN:
{ {
// when the input is cc, first delete the suffix `_*cc` // when the input is cc, first delete the suffix `_*cc`
size_t pos = opcode.rfind('_'); size_t pos = name.rfind('_');
assert(pos != opcode.npos); ASSERT(pos != name.npos);
derivedName.resize(pos); derivedName.resize(pos);
} }
break; break;
@ -75,7 +76,7 @@ std::string Opcode::getDerivedName(OpcodeCategory newCategory, unsigned number)
// helper to extract the cc number optionally if the next part needs it // helper to extract the cc number optionally if the next part needs it
auto ccNumberSuffix = [this, number]() -> std::string { auto ccNumberSuffix = [this, number]() -> std::string {
return (number != ~0u) ? std::to_string(number) : return (number != ~0u) ? std::to_string(number) :
std::string(extractBackInteger(opcode)); std::string(extractBackInteger(name));
}; };
switch (newCategory) { switch (newCategory) {
@ -448,5 +449,5 @@ absl::optional<LFOWave> Opcode::readOptional(OpcodeSpec<LFOWave> spec) const
std::ostream &operator<<(std::ostream &os, const sfz::Opcode &opcode) std::ostream &operator<<(std::ostream &os, const sfz::Opcode &opcode)
{ {
return os << opcode.opcode << '=' << '"' << opcode.value << '"'; return os << opcode.name << '=' << '"' << opcode.value << '"';
} }

2
src/sfizz/Opcode.h
View file

@ -66,7 +66,7 @@ enum OpcodeScope {
struct Opcode { struct Opcode {
Opcode() = delete; Opcode() = delete;
Opcode(absl::string_view inputOpcode, absl::string_view inputValue); Opcode(absl::string_view inputOpcode, absl::string_view inputValue);
std::string opcode {}; std::string name {};
std::string value {}; std::string value {};
uint64_t lettersOnlyHash { Fnv1aBasis }; uint64_t lettersOnlyHash { Fnv1aBasis };
// This is to handle the integer parameters of some opcodes // This is to handle the integer parameters of some opcodes

2
src/sfizz/OpcodeCleanup.cpp
View file

@ -2643,7 +2643,7 @@ end_control:
Opcode Opcode::cleanUp(OpcodeScope scope) const Opcode Opcode::cleanUp(OpcodeScope scope) const
{ {
return Opcode(cleanUpOpcodeName(opcode, scope), value); return Opcode(cleanUpOpcodeName(name, scope), value);
} }
} // namespace sfz } // namespace sfz

2
src/sfizz/OpcodeCleanup.re
View file

@ -237,7 +237,7 @@ end_control:
Opcode Opcode::cleanUp(OpcodeScope scope) const Opcode Opcode::cleanUp(OpcodeScope scope) const
{ {
return Opcode(cleanUpOpcodeName(opcode, scope), value); return Opcode(cleanUpOpcodeName(name, scope), value);
} }
} // namespace sfz } // namespace sfz

6
src/sfizz/Synth.cpp
View file

@ -142,13 +142,13 @@ void Synth::Impl::buildRegion(const std::vector<Opcode>& regionOpcodes)
// //
auto parseOpcodes = [&](const std::vector<Opcode>& opcodes) { auto parseOpcodes = [&](const std::vector<Opcode>& opcodes) {
for (auto& opcode : opcodes) { for (auto& opcode : opcodes) {
const auto unknown = absl::c_find_if(unknownOpcodes_, [&](absl::string_view sv) { return sv.compare(opcode.opcode) == 0; }); const auto unknown = absl::c_find_if(unknownOpcodes_, [&](absl::string_view sv) { return sv.compare(opcode.name) == 0; });
if (unknown != unknownOpcodes_.end()) { if (unknown != unknownOpcodes_.end()) {
continue; continue;
} }
if (!lastRegion->parseOpcode(opcode)) if (!lastRegion->parseOpcode(opcode))
unknownOpcodes_.emplace_back(opcode.opcode); unknownOpcodes_.emplace_back(opcode.name);
} }
}; };
@ -405,7 +405,7 @@ void Synth::Impl::handleControlOpcodes(const std::vector<Opcode>& members)
break; break;
default: default:
// Unsupported control opcode // Unsupported control opcode
DBG("Unsupported control opcode: " << member.opcode); DBG("Unsupported control opcode: " << member.name);
} }
} }
} }

36
tests/OpcodeT.cpp
View file

@ -14,7 +14,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Normal construction") SECTION("Normal construction")
{ {
Opcode opcode { "sample", "dummy" }; Opcode opcode { "sample", "dummy" };
REQUIRE(opcode.opcode == "sample"); REQUIRE(opcode.name == "sample");
REQUIRE(opcode.lettersOnlyHash == hash("sample")); REQUIRE(opcode.lettersOnlyHash == hash("sample"));
REQUIRE(opcode.parameters.empty()); REQUIRE(opcode.parameters.empty());
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
@ -23,7 +23,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Normal construction with underscore") SECTION("Normal construction with underscore")
{ {
Opcode opcode { "sample_underscore", "dummy" }; Opcode opcode { "sample_underscore", "dummy" };
REQUIRE(opcode.opcode == "sample_underscore"); REQUIRE(opcode.name == "sample_underscore");
REQUIRE(opcode.lettersOnlyHash == hash("sample_underscore")); REQUIRE(opcode.lettersOnlyHash == hash("sample_underscore"));
REQUIRE(opcode.parameters.empty()); REQUIRE(opcode.parameters.empty());
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
@ -32,7 +32,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Normal construction with ampersand") SECTION("Normal construction with ampersand")
{ {
Opcode opcode { "sample&_ampersand", "dummy" }; Opcode opcode { "sample&_ampersand", "dummy" };
REQUIRE(opcode.opcode == "sample&_ampersand"); REQUIRE(opcode.name == "sample&_ampersand");
REQUIRE(opcode.lettersOnlyHash == hash("sample_ampersand")); REQUIRE(opcode.lettersOnlyHash == hash("sample_ampersand"));
REQUIRE(opcode.parameters.empty()); REQUIRE(opcode.parameters.empty());
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
@ -41,7 +41,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Normal construction with multiple ampersands") SECTION("Normal construction with multiple ampersands")
{ {
Opcode opcode { "&sample&_ampersand&", "dummy" }; Opcode opcode { "&sample&_ampersand&", "dummy" };
REQUIRE(opcode.opcode == "&sample&_ampersand&"); REQUIRE(opcode.name == "&sample&_ampersand&");
REQUIRE(opcode.lettersOnlyHash == hash("sample_ampersand")); REQUIRE(opcode.lettersOnlyHash == hash("sample_ampersand"));
REQUIRE(opcode.parameters.empty()); REQUIRE(opcode.parameters.empty());
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
@ -50,7 +50,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Parameterized opcode") SECTION("Parameterized opcode")
{ {
Opcode opcode { "sample123", "dummy" }; Opcode opcode { "sample123", "dummy" };
REQUIRE(opcode.opcode == "sample123"); REQUIRE(opcode.name == "sample123");
REQUIRE(opcode.lettersOnlyHash == hash("sample&")); REQUIRE(opcode.lettersOnlyHash == hash("sample&"));
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
REQUIRE(opcode.parameters.size() == 1); REQUIRE(opcode.parameters.size() == 1);
@ -60,7 +60,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Parameterized opcode with ampersand") SECTION("Parameterized opcode with ampersand")
{ {
Opcode opcode { "sample&123", "dummy" }; Opcode opcode { "sample&123", "dummy" };
REQUIRE(opcode.opcode == "sample&123"); REQUIRE(opcode.name == "sample&123");
REQUIRE(opcode.lettersOnlyHash == hash("sample&")); REQUIRE(opcode.lettersOnlyHash == hash("sample&"));
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
REQUIRE(opcode.parameters.size() == 1); REQUIRE(opcode.parameters.size() == 1);
@ -70,7 +70,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Parameterized opcode with underscore") SECTION("Parameterized opcode with underscore")
{ {
Opcode opcode { "sample_underscore123", "dummy" }; Opcode opcode { "sample_underscore123", "dummy" };
REQUIRE(opcode.opcode == "sample_underscore123"); REQUIRE(opcode.name == "sample_underscore123");
REQUIRE(opcode.lettersOnlyHash == hash("sample_underscore&")); REQUIRE(opcode.lettersOnlyHash == hash("sample_underscore&"));
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
REQUIRE(opcode.parameters == std::vector<uint16_t>({ 123 })); REQUIRE(opcode.parameters == std::vector<uint16_t>({ 123 }));
@ -79,7 +79,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Parameterized opcode within the opcode") SECTION("Parameterized opcode within the opcode")
{ {
Opcode opcode { "sample1_underscore", "dummy" }; Opcode opcode { "sample1_underscore", "dummy" };
REQUIRE(opcode.opcode == "sample1_underscore"); REQUIRE(opcode.name == "sample1_underscore");
REQUIRE(opcode.lettersOnlyHash == hash("sample&_underscore")); REQUIRE(opcode.lettersOnlyHash == hash("sample&_underscore"));
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
REQUIRE(opcode.parameters == std::vector<uint16_t>({ 1 })); REQUIRE(opcode.parameters == std::vector<uint16_t>({ 1 }));
@ -88,7 +88,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Parameterized opcode within the opcode") SECTION("Parameterized opcode within the opcode")
{ {
Opcode opcode { "sample123_underscore", "dummy" }; Opcode opcode { "sample123_underscore", "dummy" };
REQUIRE(opcode.opcode == "sample123_underscore"); REQUIRE(opcode.name == "sample123_underscore");
REQUIRE(opcode.lettersOnlyHash == hash("sample&_underscore")); REQUIRE(opcode.lettersOnlyHash == hash("sample&_underscore"));
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
REQUIRE(opcode.parameters.size() == 1); REQUIRE(opcode.parameters.size() == 1);
@ -98,7 +98,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Parameterized opcode within the opcode twice") SECTION("Parameterized opcode within the opcode twice")
{ {
Opcode opcode { "sample123_double44_underscore", "dummy" }; Opcode opcode { "sample123_double44_underscore", "dummy" };
REQUIRE(opcode.opcode == "sample123_double44_underscore"); REQUIRE(opcode.name == "sample123_double44_underscore");
REQUIRE(opcode.lettersOnlyHash == hash("sample&_double&_underscore")); REQUIRE(opcode.lettersOnlyHash == hash("sample&_double&_underscore"));
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
REQUIRE(opcode.parameters.size() == 2); REQUIRE(opcode.parameters.size() == 2);
@ -110,7 +110,7 @@ TEST_CASE("[Opcode] Construction")
SECTION("Parameterized opcode within the opcode twice, with a back parameter") SECTION("Parameterized opcode within the opcode twice, with a back parameter")
{ {
Opcode opcode { "sample123_double44_underscore23", "dummy" }; Opcode opcode { "sample123_double44_underscore23", "dummy" };
REQUIRE(opcode.opcode == "sample123_double44_underscore23"); REQUIRE(opcode.name == "sample123_double44_underscore23");
REQUIRE(opcode.lettersOnlyHash == hash("sample&_double&_underscore&")); REQUIRE(opcode.lettersOnlyHash == hash("sample&_double&_underscore&"));
REQUIRE(opcode.value == "dummy"); REQUIRE(opcode.value == "dummy");
REQUIRE(opcode.parameters.size() == 3); REQUIRE(opcode.parameters.size() == 3);
@ -198,8 +198,8 @@ TEST_CASE("[Opcode] Normalization")
{ {
// *_ccN // *_ccN
REQUIRE(Opcode("foo_cc7", "").cleanUp(kOpcodeScopeRegion).opcode == "foo_oncc7"); REQUIRE(Opcode("foo_cc7", "").cleanUp(kOpcodeScopeRegion).name == "foo_oncc7");
REQUIRE(Opcode("foo_cc7", "").cleanUp(kOpcodeScopeControl).opcode == "foo_cc7"); REQUIRE(Opcode("foo_cc7", "").cleanUp(kOpcodeScopeControl).name == "foo_cc7");
// <region> // <region>
@ -275,8 +275,8 @@ TEST_CASE("[Opcode] Normalization")
for (auto pair : regionSpecific) { for (auto pair : regionSpecific) {
absl::string_view input = pair.first; absl::string_view input = pair.first;
absl::string_view expected = pair.second; absl::string_view expected = pair.second;
REQUIRE(Opcode(input, "").cleanUp(kOpcodeScopeRegion).opcode == expected); REQUIRE(Opcode(input, "").cleanUp(kOpcodeScopeRegion).name == expected);
REQUIRE(Opcode(input, "").cleanUp(kOpcodeScopeGeneric).opcode == input); REQUIRE(Opcode(input, "").cleanUp(kOpcodeScopeGeneric).name == input);
} }
// <control> // <control>
@ -289,13 +289,13 @@ TEST_CASE("[Opcode] Normalization")
for (auto pair : controlSpecific) { for (auto pair : controlSpecific) {
absl::string_view input = pair.first; absl::string_view input = pair.first;
absl::string_view expected = pair.second; absl::string_view expected = pair.second;
REQUIRE(Opcode(input, "").cleanUp(kOpcodeScopeControl).opcode == expected); REQUIRE(Opcode(input, "").cleanUp(kOpcodeScopeControl).name == expected);
REQUIRE(Opcode(input, "").cleanUp(kOpcodeScopeGeneric).opcode == input); REQUIRE(Opcode(input, "").cleanUp(kOpcodeScopeGeneric).name == input);
} }
// case // case
REQUIRE(Opcode("SaMpLe", "").cleanUp(kOpcodeScopeRegion).opcode == "sample"); REQUIRE(Opcode("SaMpLe", "").cleanUp(kOpcodeScopeRegion).name == "sample");
} }
TEST_CASE("[Opcode] opcode read (uint8_t)") TEST_CASE("[Opcode] opcode read (uint8_t)")

6
tests/ParsingT.cpp
View file

@ -95,7 +95,7 @@ TEST_CASE("[Parsing] Empty2")
namespace sfz{ namespace sfz{
bool operator==(const Opcode& lhs, const Opcode& rhs) bool operator==(const Opcode& lhs, const Opcode& rhs)
{ {
return (lhs.opcode == rhs.opcode) && (lhs.value == rhs.value); return (lhs.name == rhs.name) && (lhs.value == rhs.value);
} }
} }
@ -142,10 +142,10 @@ void memberTestNew(absl::string_view member, absl::string_view opcode, absl::str
REQUIRE(mock.fullBlockHeaders.size() == 1); REQUIRE(mock.fullBlockHeaders.size() == 1);
REQUIRE(mock.fullBlockMembers.size() == 1); REQUIRE(mock.fullBlockMembers.size() == 1);
REQUIRE(mock.headers[0] == "region"); REQUIRE(mock.headers[0] == "region");
REQUIRE(mock.opcodes[0].opcode == opcode); REQUIRE(mock.opcodes[0].name == opcode);
REQUIRE(mock.opcodes[0].value == value); REQUIRE(mock.opcodes[0].value == value);
REQUIRE(mock.fullBlockHeaders[0] == "region"); REQUIRE(mock.fullBlockHeaders[0] == "region");
REQUIRE(mock.fullBlockMembers[0][0].opcode == opcode); REQUIRE(mock.fullBlockMembers[0][0].name == opcode);
REQUIRE(mock.fullBlockMembers[0][0].value == value); REQUIRE(mock.fullBlockMembers[0][0].value == value);
} }