Skip to content

Commit cd490bd

Browse files
authored
Merge pull request #5958 from A1029384756/master
moved checking of -vet-unused-procedures and -vet-packages flags to after all flags are parsed
2 parents a162626 + 411a5b6 commit cd490bd

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

src/main.cpp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,23 +1309,17 @@ gb_internal bool parse_build_flags(Array<String> args) {
13091309
build_context.vet_flags |= VetFlag_All;
13101310
break;
13111311

1312-
case BuildFlag_VetUnusedVariables: build_context.vet_flags |= VetFlag_UnusedVariables; break;
1313-
case BuildFlag_VetUnusedImports: build_context.vet_flags |= VetFlag_UnusedImports; break;
1314-
case BuildFlag_VetUnused: build_context.vet_flags |= VetFlag_Unused; break;
1315-
case BuildFlag_VetShadowing: build_context.vet_flags |= VetFlag_Shadowing; break;
1316-
case BuildFlag_VetUsingStmt: build_context.vet_flags |= VetFlag_UsingStmt; break;
1317-
case BuildFlag_VetUsingParam: build_context.vet_flags |= VetFlag_UsingParam; break;
1318-
case BuildFlag_VetStyle: build_context.vet_flags |= VetFlag_Style; break;
1319-
case BuildFlag_VetSemicolon: build_context.vet_flags |= VetFlag_Semicolon; break;
1320-
case BuildFlag_VetCast: build_context.vet_flags |= VetFlag_Cast; break;
1321-
case BuildFlag_VetTabs: build_context.vet_flags |= VetFlag_Tabs; break;
1322-
case BuildFlag_VetUnusedProcedures:
1323-
build_context.vet_flags |= VetFlag_UnusedProcedures;
1324-
if (!set_flags[BuildFlag_VetPackages]) {
1325-
gb_printf_err("-%.*s must be used with -vet-packages\n", LIT(name));
1326-
bad_flags = true;
1327-
}
1328-
break;
1312+
case BuildFlag_VetUnusedVariables: build_context.vet_flags |= VetFlag_UnusedVariables; break;
1313+
case BuildFlag_VetUnusedImports: build_context.vet_flags |= VetFlag_UnusedImports; break;
1314+
case BuildFlag_VetUnused: build_context.vet_flags |= VetFlag_Unused; break;
1315+
case BuildFlag_VetShadowing: build_context.vet_flags |= VetFlag_Shadowing; break;
1316+
case BuildFlag_VetUsingStmt: build_context.vet_flags |= VetFlag_UsingStmt; break;
1317+
case BuildFlag_VetUsingParam: build_context.vet_flags |= VetFlag_UsingParam; break;
1318+
case BuildFlag_VetStyle: build_context.vet_flags |= VetFlag_Style; break;
1319+
case BuildFlag_VetSemicolon: build_context.vet_flags |= VetFlag_Semicolon; break;
1320+
case BuildFlag_VetCast: build_context.vet_flags |= VetFlag_Cast; break;
1321+
case BuildFlag_VetTabs: build_context.vet_flags |= VetFlag_Tabs; break;
1322+
case BuildFlag_VetUnusedProcedures: build_context.vet_flags |= VetFlag_UnusedProcedures; break;
13291323

13301324
case BuildFlag_VetPackages:
13311325
{
@@ -1788,6 +1782,11 @@ gb_internal bool parse_build_flags(Array<String> args) {
17881782
}
17891783
}
17901784

1785+
if (set_flags[BuildFlag_VetUnusedProcedures] && !set_flags[BuildFlag_VetPackages]) {
1786+
gb_printf_err("-vet-unused-procedures must be used with -vet-packages\n");
1787+
bad_flags = true;
1788+
}
1789+
17911790
if ((!(build_context.export_timings_format == TimingsExportUnspecified)) && (build_context.export_timings_file.len == 0)) {
17921791
gb_printf_err("`-export-timings:<format>` requires `-export-timings-file:<filename>` to be specified as well\n");
17931792
bad_flags = true;

0 commit comments

Comments
 (0)