From 13b14f40025f2685c779f714b8ca62ac1d064642 Mon Sep 17 00:00:00 2001 From: lachrymaL Date: Mon, 13 Dec 2021 00:05:31 -0500 Subject: [PATCH] clang and gcc pounded the msvc --- CMakeSettings.json | 2 +- NouVeL/Parser.cpp | 6 +++--- test_utf8.nvl | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 test_utf8.nvl diff --git a/CMakeSettings.json b/CMakeSettings.json index 03984cb..8979b5a 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -4,7 +4,7 @@ "name": "x64-Debug", "generator": "Ninja", "configurationType": "Debug", - "inheritEnvironments": [ "msvc_x64_x64" ], + "inheritEnvironments": [ "clang_cl_x64_x64" ], "buildRoot": "${projectDir}\\out\\build\\${name}", "installRoot": "${projectDir}\\out\\install\\${name}", "cmakeCommandArgs": "", diff --git a/NouVeL/Parser.cpp b/NouVeL/Parser.cpp index af9a99d..57bb5c5 100644 --- a/NouVeL/Parser.cpp +++ b/NouVeL/Parser.cpp @@ -18,7 +18,7 @@ namespace { operator std::string() const { return accept; } - constexpr bool operator== (const std::string& other) const { + bool operator== (const std::string& other) const { return accept == other; } }; @@ -29,7 +29,7 @@ namespace { constexpr operator char() const { return accept[0]; } - constexpr bool operator== (const std::string& other) const { + bool operator== (const std::string& other) const { return accept == other; } }; @@ -271,7 +271,7 @@ namespace { throw std::runtime_error("Cannot match closing subexpression"); else SkipOverFirstChar(f, pos); - return Object(ParseType::Subexpression, c); + return Object{ ParseType::Subexpression, c }; } else if (t[0] == GROUP_CLOSE) throw std::runtime_error("Cannot match closing subexpression, likely too few arguments"); diff --git a/test_utf8.nvl b/test_utf8.nvl deleted file mode 100644 index 5e11ea0..0000000 --- a/test_utf8.nvl +++ /dev/null @@ -1,3 +0,0 @@ -mmawesome { - sadasd sadasd ["く\"" "ぇrち"[][[[[]]]][][][] "ゅいお" "p"] -}