diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2026-01-30 10:37:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-30 10:37:42 +0000 |
| commit | 3f35aef47d772a7393ea31a78922600515ce9ed8 (patch) | |
| tree | cddb56cfe63f3752b8b7a8c314d9cc652f22ec28 /src/parser.cpp | |
| parent | 70059b0fba3099d0d67232ed89c268710f435a36 (diff) | |
| parent | 30ef01ee8d1175dc5a974d8bee62b7ea00651941 (diff) | |
Merge pull request #6194 from Faker-09/vet_flags
Fix for various combinations of -vet options on the command line and top of file not working together
Diffstat (limited to 'src/parser.cpp')
| -rw-r--r-- | src/parser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/parser.cpp b/src/parser.cpp index 2eb559e06..c14055275 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -6390,7 +6390,7 @@ gb_internal String vet_tag_get_token(String s, String *out, bool allow_colon) { } -gb_internal u64 parse_vet_tag(Token token_for_pos, String s) { +gb_internal u64 parse_vet_tag(Token token_for_pos, String s, u64 base_vet_flags) { String const prefix = str_lit("vet"); GB_ASSERT(string_starts_with(s, prefix)); if (build_require_space_after(s, prefix)) { @@ -6399,7 +6399,7 @@ gb_internal u64 parse_vet_tag(Token token_for_pos, String s) { } s = string_trim_whitespace(substring(s, prefix.len, s.len)); - u64 vet_flags = build_context.vet_flags; + u64 vet_flags = base_vet_flags; if (s.len == 0) { vet_flags |= VetFlag_All; @@ -6631,7 +6631,7 @@ gb_internal bool parse_file_tag(const String &lc, const Token &tok, AstFile *f) return false; } } else if (string_starts_with(lc, str_lit("vet"))) { - f->vet_flags = parse_vet_tag(tok, lc); + f->vet_flags = parse_vet_tag(tok, lc, ast_file_vet_flags(f)); f->vet_flags_set = true; } else if (string_starts_with(lc, str_lit("test"))) { if ((build_context.command_kind & Command_test) == 0) { |