Prevent some parsing warnings

This commit is contained in:
teejusb
2025-03-05 08:28:37 -08:00
parent c502388d15
commit 906cb93d55
2 changed files with 36 additions and 0 deletions
+20
View File
@@ -449,6 +449,10 @@ void SMLoader::ParseBPMs( std::vector<std::pair<float, float>> &out, const RStri
for( unsigned b=0; b<arrayBPMChangeExpressions.size(); b++ )
{
std::vector<RString> arrayBPMChangeValues;
Trim(arrayBPMChangeExpressions[b]);
if (arrayBPMChangeExpressions[b].empty()) {
continue;
}
split( arrayBPMChangeExpressions[b], "=", arrayBPMChangeValues );
if( arrayBPMChangeValues.size() != 2 )
{
@@ -479,6 +483,10 @@ void SMLoader::ParseStops( std::vector<std::pair<float, float>> &out, const RStr
for( unsigned f=0; f<arrayFreezeExpressions.size(); f++ )
{
std::vector<RString> arrayFreezeValues;
Trim(arrayFreezeExpressions[f]);
if (arrayFreezeExpressions[f].empty()) {
continue;
}
split( arrayFreezeExpressions[f], "=", arrayFreezeValues );
if( arrayFreezeValues.size() != 2 )
{
@@ -745,6 +753,10 @@ void SMLoader::ProcessDelays( TimingData &out, const RString line, const int row
for( unsigned f=0; f<arrayDelayExpressions.size(); f++ )
{
std::vector<RString> arrayDelayValues;
Trim(arrayDelayExpressions[f]);
if (arrayDelayExpressions[f].empty()) {
continue;
}
split( arrayDelayExpressions[f], "=", arrayDelayValues );
if( arrayDelayValues.size() != 2 )
{
@@ -845,6 +857,10 @@ void SMLoader::ProcessTickcounts( TimingData &out, const RString line, const int
for( unsigned f=0; f<arrayTickcountExpressions.size(); f++ )
{
std::vector<RString> arrayTickcountValues;
Trim(arrayTickcountExpressions[f]);
if (arrayTickcountExpressions[f].empty()) {
continue;
}
split( arrayTickcountExpressions[f], "=", arrayTickcountValues );
if( arrayTickcountValues.size() != 2 )
{
@@ -930,6 +946,10 @@ void SMLoader::ProcessFakes( TimingData &out, const RString line, const int rows
for( unsigned b=0; b<arrayFakeExpressions.size(); b++ )
{
std::vector<RString> arrayFakeValues;
Trim(arrayFakeExpressions[b]);
if (arrayFakeExpressions[b].empty()) {
continue;
}
split( arrayFakeExpressions[b], "=", arrayFakeValues );
if( arrayFakeValues.size() != 2 )
{
+16
View File
@@ -752,6 +752,10 @@ void SSCLoader::ProcessBPMs( TimingData &out, const RString sParam )
for( unsigned b=0; b<arrayBPMExpressions.size(); b++ )
{
std::vector<RString> arrayBPMValues;
Trim(arrayBPMExpressions[b]);
if (arrayBPMExpressions[b].empty()) {
continue;
}
split( arrayBPMExpressions[b], "=", arrayBPMValues );
if( arrayBPMValues.size() != 2 )
{
@@ -786,6 +790,10 @@ void SSCLoader::ProcessStops( TimingData &out, const RString sParam )
for( unsigned b=0; b<arrayStopExpressions.size(); b++ )
{
std::vector<RString> arrayStopValues;
Trim(arrayStopExpressions[b]);
if (arrayStopExpressions[b].empty()) {
continue;
}
split( arrayStopExpressions[b], "=", arrayStopValues );
if( arrayStopValues.size() != 2 )
{
@@ -818,6 +826,10 @@ void SSCLoader::ProcessWarps( TimingData &out, const RString sParam, const float
for( unsigned b=0; b<arrayWarpExpressions.size(); b++ )
{
std::vector<RString> arrayWarpValues;
Trim(arrayWarpExpressions[b]);
if (arrayWarpExpressions[b].empty()) {
continue;
}
split( arrayWarpExpressions[b], "=", arrayWarpValues );
if( arrayWarpValues.size() != 2 )
{
@@ -855,6 +867,10 @@ void SSCLoader::ProcessLabels( TimingData &out, const RString sParam )
for( unsigned b=0; b<arrayLabelExpressions.size(); b++ )
{
std::vector<RString> arrayLabelValues;
Trim(arrayLabelExpressions[b]);
if (arrayLabelExpressions[b].empty()) {
continue;
}
split( arrayLabelExpressions[b], "=", arrayLabelValues );
if( arrayLabelValues.size() != 2 )
{