From 1f7f105584a87a99e8974af7b19d0c78f4aa7f65 Mon Sep 17 00:00:00 2001 From: redtide Date: Mon, 22 Jun 2020 16:01:19 +0200 Subject: [PATCH] Fix unused variables warnings --- src/sfizz/OpcodeCleanup.cpp | 112 ++++++++++++++++++------------------ src/sfizz/OpcodeCleanup.re | 2 + 2 files changed, 59 insertions(+), 55 deletions(-) diff --git a/src/sfizz/OpcodeCleanup.cpp b/src/sfizz/OpcodeCleanup.cpp index 9c8956484..863a6eb07 100644 --- a/src/sfizz/OpcodeCleanup.cpp +++ b/src/sfizz/OpcodeCleanup.cpp @@ -1,4 +1,4 @@ -/* Generated by re2c 1.3 on Fri May 15 08:30:58 2020 */ +/* Generated by re2c 1.3 on Mon Jun 22 16:43:52 2020 */ #line 1 "src/sfizz/OpcodeCleanup.re" /* -*- mode: c++; -*- */ // SPDX-License-Identifier: BSD-2-Clause @@ -8,6 +8,7 @@ // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz #include "Opcode.h" +#include "Macros.h" #include "absl/strings/string_view.h" #include "absl/strings/str_cat.h" #include "absl/strings/ascii.h" @@ -22,7 +23,7 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc // always convert it to lower case absl::AsciiStrToLower(&opcode); - #line 27 "src/sfizz/OpcodeCleanup.re" + #line 28 "src/sfizz/OpcodeCleanup.re" #define YYMAXNMATCH 4 @@ -31,6 +32,7 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc const char* YYMARKER; const char* yypmatch[2 * YYMAXNMATCH]; size_t yynmatch; + UNUSED(yynmatch); const char* yyt1; const char* yyt2; const char* yyt3; @@ -40,7 +42,7 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc return absl::string_view(beg, end - beg); }; - #line 48 "src/sfizz/OpcodeCleanup.re" + #line 50 "src/sfizz/OpcodeCleanup.re" //-------------------------------------------------------------------------- @@ -50,7 +52,7 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc YYCURSOR = opcode.c_str(); -#line 54 "src/sfizz/OpcodeCleanup.cpp" +#line 56 "src/sfizz/OpcodeCleanup.cpp" { char yych; yych = *YYCURSOR; @@ -66,11 +68,11 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yy2: ++YYCURSOR; yy3: -#line 63 "src/sfizz/OpcodeCleanup.re" +#line 65 "src/sfizz/OpcodeCleanup.re" { goto end_region_oncc; } -#line 74 "src/sfizz/OpcodeCleanup.cpp" +#line 76 "src/sfizz/OpcodeCleanup.cpp" yy4: yych = *(YYMARKER = ++YYCURSOR); if (yych <= 0x00) goto yy3; @@ -154,14 +156,14 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[1] = YYCURSOR; yypmatch[3] = yyt2 - 3; yypmatch[5] = YYCURSOR - 1; -#line 58 "src/sfizz/OpcodeCleanup.re" +#line 60 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat(group(1), "_oncc", group(2)); goto end_region_oncc; } -#line 163 "src/sfizz/OpcodeCleanup.cpp" +#line 165 "src/sfizz/OpcodeCleanup.cpp" } -#line 67 "src/sfizz/OpcodeCleanup.re" +#line 69 "src/sfizz/OpcodeCleanup.re" end_region_oncc: @@ -176,7 +178,7 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc YYCURSOR = opcode.c_str(); -#line 180 "src/sfizz/OpcodeCleanup.cpp" +#line 182 "src/sfizz/OpcodeCleanup.cpp" { char yych; yych = *YYCURSOR; @@ -216,11 +218,11 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yy19: ++YYCURSOR; yy20: -#line 166 "src/sfizz/OpcodeCleanup.re" +#line 168 "src/sfizz/OpcodeCleanup.re" { goto end_region; } -#line 224 "src/sfizz/OpcodeCleanup.cpp" +#line 226 "src/sfizz/OpcodeCleanup.cpp" yy21: yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -760,12 +762,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[0] = yyt1 - 4; yypmatch[1] = YYCURSOR; yypmatch[3] = YYCURSOR - 1; -#line 148 "src/sfizz/OpcodeCleanup.re" +#line 150 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("fil1_", group(1)); goto end_region; } -#line 769 "src/sfizz/OpcodeCleanup.cpp" +#line 771 "src/sfizz/OpcodeCleanup.cpp" yy98: yych = *++YYCURSOR; yy99: @@ -784,12 +786,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[2] = yyt3; yypmatch[3] = yyt2; yypmatch[1] = YYCURSOR; -#line 130 "src/sfizz/OpcodeCleanup.re" +#line 132 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("volume", group(1)); goto end_region; } -#line 793 "src/sfizz/OpcodeCleanup.cpp" +#line 795 "src/sfizz/OpcodeCleanup.cpp" yy103: yych = *++YYCURSOR; if (yych <= 0x00) { @@ -874,12 +876,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[2] = yyt3; yypmatch[3] = yyt2; yypmatch[1] = YYCURSOR; -#line 134 "src/sfizz/OpcodeCleanup.re" +#line 136 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("pitch", group(1)); goto end_region; } -#line 883 "src/sfizz/OpcodeCleanup.cpp" +#line 885 "src/sfizz/OpcodeCleanup.cpp" yy117: yych = *++YYCURSOR; if (yych <= 0x00) { @@ -1019,12 +1021,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[0] = yyt1 - 3; yypmatch[1] = YYCURSOR; yypmatch[3] = YYCURSOR - 1; -#line 108 "src/sfizz/OpcodeCleanup.re" +#line 110 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("off_", group(1)); goto end_region; } -#line 1028 "src/sfizz/OpcodeCleanup.cpp" +#line 1030 "src/sfizz/OpcodeCleanup.cpp" yy139: yych = *++YYCURSOR; switch (yych) { @@ -1110,12 +1112,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[0] = yyt1 - 4; yypmatch[1] = YYCURSOR; yypmatch[3] = YYCURSOR - 1; -#line 112 "src/sfizz/OpcodeCleanup.re" +#line 114 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("bend_", group(1)); goto end_region; } -#line 1119 "src/sfizz/OpcodeCleanup.cpp" +#line 1121 "src/sfizz/OpcodeCleanup.cpp" yy153: ++YYCURSOR; yynmatch = 2; @@ -1123,12 +1125,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[2] = yyt3; yypmatch[3] = yyt2; yypmatch[1] = YYCURSOR; -#line 152 "src/sfizz/OpcodeCleanup.re" +#line 154 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("cutoff1", group(1)); goto end_region; } -#line 1132 "src/sfizz/OpcodeCleanup.cpp" +#line 1134 "src/sfizz/OpcodeCleanup.cpp" yy155: yych = *++YYCURSOR; if (yych <= 0x00) { @@ -1321,12 +1323,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yynmatch = 1; yypmatch[0] = YYCURSOR - 8; yypmatch[1] = YYCURSOR; -#line 116 "src/sfizz/OpcodeCleanup.re" +#line 118 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("fil1_type"); goto end_region; } -#line 1330 "src/sfizz/OpcodeCleanup.cpp" +#line 1332 "src/sfizz/OpcodeCleanup.cpp" yy186: yych = *++YYCURSOR; switch (yych) { @@ -1375,12 +1377,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[0] = yyt1 - 4; yypmatch[1] = YYCURSOR; yypmatch[3] = YYCURSOR - 1; -#line 104 "src/sfizz/OpcodeCleanup.re" +#line 106 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("loop_", group(1)); goto end_region; } -#line 1384 "src/sfizz/OpcodeCleanup.cpp" +#line 1386 "src/sfizz/OpcodeCleanup.cpp" yy193: yych = *++YYCURSOR; switch (yych) { @@ -1498,12 +1500,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[0] = yyt1 - 3; yypmatch[1] = YYCURSOR; yypmatch[3] = YYCURSOR - 5; -#line 120 "src/sfizz/OpcodeCleanup.re" +#line 122 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("fil", group(1), "_type"); goto end_region; } -#line 1507 "src/sfizz/OpcodeCleanup.cpp" +#line 1509 "src/sfizz/OpcodeCleanup.cpp" yy212: yych = *++YYCURSOR; switch (yych) { @@ -1545,12 +1547,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[2] = yyt1 - 4; yypmatch[3] = yyt1 - 2; yypmatch[5] = YYCURSOR - 1; -#line 139 "src/sfizz/OpcodeCleanup.re" +#line 141 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("start_", group(1), "cc", group(2)); goto end_region; } -#line 1554 "src/sfizz/OpcodeCleanup.cpp" +#line 1556 "src/sfizz/OpcodeCleanup.cpp" yy219: yych = *++YYCURSOR; switch (yych) { @@ -1650,12 +1652,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[3] = yyt2 - 1; yypmatch[5] = yyt3 - 2; yypmatch[7] = YYCURSOR - 1; -#line 95 "src/sfizz/OpcodeCleanup.re" +#line 97 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3)); goto end_region; } -#line 1659 "src/sfizz/OpcodeCleanup.cpp" +#line 1661 "src/sfizz/OpcodeCleanup.cpp" yy233: ++YYCURSOR; yynmatch = 3; @@ -1665,12 +1667,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[2] = yyt1 - 8; yypmatch[3] = yyt1 - 6; yypmatch[5] = YYCURSOR - 1; -#line 161 "src/sfizz/OpcodeCleanup.re" +#line 163 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat(group(1), "hdcc", group(2)); goto end_region; } -#line 1674 "src/sfizz/OpcodeCleanup.cpp" +#line 1676 "src/sfizz/OpcodeCleanup.cpp" yy235: yych = *++YYCURSOR; switch (yych) { @@ -1686,12 +1688,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[1] = YYCURSOR; yypmatch[3] = yyt2 - 1; yypmatch[5] = YYCURSOR - 1; -#line 99 "src/sfizz/OpcodeCleanup.re" +#line 101 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat(group(1), "_", group(2), "1"); goto end_region; } -#line 1695 "src/sfizz/OpcodeCleanup.cpp" +#line 1697 "src/sfizz/OpcodeCleanup.cpp" yy238: yych = *++YYCURSOR; switch (yych) { @@ -1721,12 +1723,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[2] = yyt3; yypmatch[3] = yyt2; yypmatch[1] = YYCURSOR; -#line 156 "src/sfizz/OpcodeCleanup.re" +#line 158 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("resonance1", group(1)); goto end_region; } -#line 1730 "src/sfizz/OpcodeCleanup.cpp" +#line 1732 "src/sfizz/OpcodeCleanup.cpp" yy243: yych = *++YYCURSOR; if (yych <= 0x00) { @@ -1779,12 +1781,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[2] = yyt1 - 6; yypmatch[3] = yyt1 - 4; yypmatch[5] = YYCURSOR - 1; -#line 143 "src/sfizz/OpcodeCleanup.re" +#line 145 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("start_", group(1), "hdcc", group(2)); goto end_region; } -#line 1788 "src/sfizz/OpcodeCleanup.cpp" +#line 1790 "src/sfizz/OpcodeCleanup.cpp" yy253: yych = *++YYCURSOR; switch (yych) { @@ -1882,12 +1884,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[3] = yyt2 - 1; yypmatch[5] = yyt3 - 2; yypmatch[7] = YYCURSOR - 1; -#line 91 "src/sfizz/OpcodeCleanup.re" +#line 93 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3)); goto end_region; } -#line 1891 "src/sfizz/OpcodeCleanup.cpp" +#line 1893 "src/sfizz/OpcodeCleanup.cpp" yy265: yych = *++YYCURSOR; switch (yych) { @@ -1921,12 +1923,12 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[3] = yyt2 - 1; yypmatch[5] = yyt3 - 2; yypmatch[7] = YYCURSOR - 1; -#line 87 "src/sfizz/OpcodeCleanup.re" +#line 89 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat(group(1), "_", group(2), "_oncc", group(3)); goto end_region; } -#line 1930 "src/sfizz/OpcodeCleanup.cpp" +#line 1932 "src/sfizz/OpcodeCleanup.cpp" yy270: yych = *++YYCURSOR; if (yych >= 0x01) goto yy34; @@ -1934,14 +1936,14 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yynmatch = 1; yypmatch[0] = YYCURSOR - 16; yypmatch[1] = YYCURSOR; -#line 125 "src/sfizz/OpcodeCleanup.re" +#line 127 "src/sfizz/OpcodeCleanup.re" { opcode = "group"; goto end_region; } -#line 1943 "src/sfizz/OpcodeCleanup.cpp" +#line 1945 "src/sfizz/OpcodeCleanup.cpp" } -#line 170 "src/sfizz/OpcodeCleanup.re" +#line 172 "src/sfizz/OpcodeCleanup.re" end_region: @@ -1956,7 +1958,7 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc YYCURSOR = opcode.c_str(); -#line 1960 "src/sfizz/OpcodeCleanup.cpp" +#line 1962 "src/sfizz/OpcodeCleanup.cpp" { char yych; yych = *YYCURSOR; @@ -1967,11 +1969,11 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yy275: ++YYCURSOR; yy276: -#line 190 "src/sfizz/OpcodeCleanup.re" +#line 192 "src/sfizz/OpcodeCleanup.re" { goto end_control; } -#line 1975 "src/sfizz/OpcodeCleanup.cpp" +#line 1977 "src/sfizz/OpcodeCleanup.cpp" yy277: yych = *(YYMARKER = ++YYCURSOR); switch (yych) { @@ -2069,14 +2071,14 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc yypmatch[0] = yyt1 - 10; yypmatch[1] = YYCURSOR; yypmatch[3] = YYCURSOR - 1; -#line 185 "src/sfizz/OpcodeCleanup.re" +#line 187 "src/sfizz/OpcodeCleanup.re" { opcode = absl::StrCat("set_hdcc", group(1)); goto end_control; } -#line 2078 "src/sfizz/OpcodeCleanup.cpp" +#line 2080 "src/sfizz/OpcodeCleanup.cpp" } -#line 194 "src/sfizz/OpcodeCleanup.re" +#line 196 "src/sfizz/OpcodeCleanup.re" end_control: diff --git a/src/sfizz/OpcodeCleanup.re b/src/sfizz/OpcodeCleanup.re index 3cf7bc47c..3b0774e24 100644 --- a/src/sfizz/OpcodeCleanup.re +++ b/src/sfizz/OpcodeCleanup.re @@ -6,6 +6,7 @@ // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz #include "Opcode.h" +#include "Macros.h" #include "absl/strings/string_view.h" #include "absl/strings/str_cat.h" #include "absl/strings/ascii.h" @@ -31,6 +32,7 @@ static std::string cleanUpOpcodeName(absl::string_view rawOpcode, OpcodeScope sc const char* YYMARKER; const char* yypmatch[2 * YYMAXNMATCH]; size_t yynmatch; + UNUSED(yynmatch); /*!stags:re2c format = "const char* @@; "; */