diff --git a/runtime/Cpp/runtime/src/Version.h b/runtime/Cpp/runtime/src/Version.h index 179111909b..3be6b963d2 100644 --- a/runtime/Cpp/runtime/src/Version.h +++ b/runtime/Cpp/runtime/src/Version.h @@ -34,9 +34,9 @@ #define ANTLRCPP_MAKE_VERSION(major, minor, patch) ((major) * 100000 + (minor) * 1000 + (patch)) #define ANTLRCPP_VERSION \ - ANTLRCPP_MAKE_VERSION(ANTLR4CPP_VERSION_MAJOR, ANTLR4CPP_VERSION_MINOR, ANTLR4CPP_VERSION_PATCH) + ANTLRCPP_MAKE_VERSION(ANTLRCPP_VERSION_MAJOR, ANTLRCPP_VERSION_MINOR, ANTLRCPP_VERSION_PATCH) #define ANTLRCPP_VERSION_STRING \ - ANTLR4CPP_STRINGIFY(ANTLR4CPP_VERSION_MAJOR) "." \ - ANTLR4CPP_STRINGIFY(ANTLR4CPP_VERSION_MINOR) "." \ - ANTLR4CPP_STRINGIFY(ANTLR4CPP_VERSION_PATCH) + ANTLR4CPP_STRINGIFY(ANTLRCPP_VERSION_MAJOR) "." \ + ANTLR4CPP_STRINGIFY(ANTLRCPP_VERSION_MINOR) "." \ + ANTLR4CPP_STRINGIFY(ANTLRCPP_VERSION_PATCH) diff --git a/runtime/Cpp/runtime/tests/VersionTest.cpp b/runtime/Cpp/runtime/tests/VersionTest.cpp new file mode 100644 index 0000000000..a59cff4edb --- /dev/null +++ b/runtime/Cpp/runtime/tests/VersionTest.cpp @@ -0,0 +1,24 @@ +#include + +#include "gtest/gtest.h" +#include "RuntimeMetaData.h" +#include "Version.h" + +namespace antlr4 { +namespace { + + static_assert(ANTLRCPP_VERSION == ANTLRCPP_VERSION_MAJOR * 100000 + + ANTLRCPP_VERSION_MINOR * 1000 + ANTLRCPP_VERSION_PATCH, + "ANTLRCPP_VERSION must be a constant expression matching the version components"); + + TEST(VersionTest, StringMatchesVersionComponents) { + const std::string expected = std::to_string(ANTLRCPP_VERSION_MAJOR) + "." + + std::to_string(ANTLRCPP_VERSION_MINOR) + "." + + std::to_string(ANTLRCPP_VERSION_PATCH); + EXPECT_EQ(std::string(ANTLRCPP_VERSION_STRING), expected); + EXPECT_EQ(RuntimeMetaData::VERSION, expected); + EXPECT_EQ(RuntimeMetaData::getRuntimeVersion(), expected); + } + +} +}