From 9c8c5c1b1749da627ca4c33328fe70dfd43c73ed Mon Sep 17 00:00:00 2001
From: anutosh491 <andersonbhat491@gmail.com>
Date: Fri, 13 Jun 2025 12:33:11 +0530
Subject: [PATCH] Replace runtime C++ version detection with compile-time
 extraction from argv

---
 src/xinterpreter.cpp      | 39 ++++++++++++++-------------------------
 test/test_interpreter.cpp |  5 ++++-
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/xinterpreter.cpp b/src/xinterpreter.cpp
index 14972324..3c4a0528 100644
--- a/src/xinterpreter.cpp
+++ b/src/xinterpreter.cpp
@@ -73,31 +73,20 @@ namespace xcpp
         xeus::register_interpreter(this);
     }
 
-    static std::string get_stdopt()
+    static std::string get_stdopt(int argc, const char* const* argv)
     {
-        // We need to find what's the C++ version the interpreter runs with.
-        const char* code = R"(
-int __get_cxx_version () {
-#if __cplusplus > 202302L
-    return 26;
-#elif __cplusplus > 202002L
-    return 23;
-#elif __cplusplus >  201703L
-    return 20;
-#elif __cplusplus > 201402L
-    return 17;
-#elif __cplusplus > 201103L || (defined(_WIN32) && _MSC_VER >= 1900)
-    return 14;
-#elif __cplusplus >= 201103L
-   return 11;
-#else
-  return 0;
-#endif
-  }
-__get_cxx_version ()
-      )";
-        auto cxx_version = Cpp::Evaluate(code);
-        return std::to_string(cxx_version);
+        std::string res = "14";
+        for (int i = 0; i < argc; ++i)
+        {
+            std::string arg(argv[i]);
+            auto pos = arg.find("-std=c++");
+            if (pos != std::string::npos)
+            {
+                res = arg.substr(pos + 8);
+                break;
+            }
+        }
+        return res;
     }
 
     interpreter::interpreter(int argc, const char* const* argv) :
@@ -109,7 +98,7 @@ __get_cxx_version ()
     {
         //NOLINTNEXTLINE (cppcoreguidelines-pro-bounds-pointer-arithmetic)
         createInterpreter(Args(argv ? argv + 1 : argv, argv + argc));
-        m_version = get_stdopt();
+        m_version = get_stdopt(argc, argv);
         redirect_output();
         init_preamble();
         init_magic();
diff --git a/test/test_interpreter.cpp b/test/test_interpreter.cpp
index 61d5f5d7..003d7024 100644
--- a/test/test_interpreter.cpp
+++ b/test/test_interpreter.cpp
@@ -254,7 +254,9 @@ TEST_SUITE("kernel_info_request")
 {
     TEST_CASE("good_status")
     {
-        std::vector<const char*> Args = {/*"-v", "resource-dir", "....."*/};
+        std::vector<const char*> Args = {
+            "-v", "-std=c++23"  // test input for get_stdopt
+        };
         xcpp::interpreter interpreter((int)Args.size(), Args.data());
 
         nl::json result = interpreter.kernel_info_request();
@@ -264,6 +266,7 @@ TEST_SUITE("kernel_info_request")
         REQUIRE(result["language_info"]["mimetype"] == "text/x-c++src");
         REQUIRE(result["language_info"]["codemirror_mode"] == "text/x-c++src");
         REQUIRE(result["language_info"]["file_extension"] == ".cpp");
+        REQUIRE(result["language_info"]["version"] == "23");
         REQUIRE(result["status"] == "ok");
     }