From 926549304e5b6a5858c9a65f66a28aaead78af5d Mon Sep 17 00:00:00 2001 From: Ken Matsui <26405363+ken-matsui@users.noreply.github.com> Date: Thu, 30 Jan 2025 20:44:30 -0500 Subject: [PATCH] Manifest: define keywords as global (#1133) --- src/Manifest.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Manifest.cc b/src/Manifest.cc index 00a98122a..22bbceaa6 100644 --- a/src/Manifest.cc +++ b/src/Manifest.cc @@ -40,6 +40,9 @@ static const fs::path GIT_SRC_DIR(GIT_DIR / "src"); static const std::unordered_set ALLOWED_CHARS = { '-', '_', '/', '.', '+' // allowed in the dependency name }; +static const std::unordered_set KEYWORDS = { +#include "Keywords.def" +}; Result Edition::tryFromString(std::string str) noexcept { @@ -550,11 +553,7 @@ validatePackageName(const std::string_view name) noexcept { std::isalnum(name[name.size() - 1]), "package name must end with a letter or digit" ); - - const std::unordered_set keywords = { -#include "Keywords.def" - }; - Ensure(!keywords.contains(name), "package name must not be a C++ keyword"); + Ensure(!KEYWORDS.contains(name), "package name must not be a C++ keyword"); return Ok(); }