From 0de7df9eab9b256e0d1c8da7c9fc8c422c5ac1a7 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Mon, 31 Jul 2023 11:37:14 +0100
Subject: Improve `//+vet`; remove `using` in many places; add `//+vet
 !using-stmt` where necessary

---
 src/parser.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'src/parser.cpp')

diff --git a/src/parser.cpp b/src/parser.cpp
index b99182189..7d1c37d84 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -5563,7 +5563,9 @@ gb_internal u64 parse_vet_tag(Token token_for_pos, String s) {
 
 	while (s.len > 0) {
 		String p = string_trim_whitespace(vet_tag_get_token(s, &s));
-		if (p.len == 0) break;
+		if (p.len == 0) {
+			break;
+		}
 
 		bool is_notted = false;
 		if (p[0] == '!') {
@@ -5571,14 +5573,10 @@ gb_internal u64 parse_vet_tag(Token token_for_pos, String s) {
 			p = substring(p, 1, p.len);
 			if (p.len == 0) {
 				syntax_error(token_for_pos, "Expected a vet flag name after '!'");
-				break;
+				return build_context.vet_flags;
 			}
 		}
 
-		if (p.len == 0) {
-			continue;
-		}
-
 		u64 flag = get_vet_flag_from_name(p);
 		if (flag != VetFlag_NONE) {
 			if (is_notted) {
@@ -5595,13 +5593,20 @@ gb_internal u64 parse_vet_tag(Token token_for_pos, String s) {
 			error_line("\tusing-stmt\n");
 			error_line("\tusing-param\n");
 			error_line("\textra\n");
-			break;
+			return build_context.vet_flags;
 		}
 	}
 
+	if (vet_flags == 0 && vet_not_flags == 0) {
+		return build_context.vet_flags;
+	}
 	if (vet_flags == 0 && vet_not_flags != 0) {
-		vet_flags = VetFlag_All;
+		return build_context.vet_flags &~ vet_not_flags;
+	}
+	if (vet_flags != 0 && vet_not_flags == 0) {
+		return vet_flags;
 	}
+	GB_ASSERT(vet_flags != 0 && vet_not_flags != 0);
 	return vet_flags &~ vet_not_flags;
 }
 
-- 
cgit v1.2.3