From d6f3bfccb4524f90cd30ec085f45be2329e7fc39 Mon Sep 17 00:00:00 2001 From: Daniel Kroening Date: Wed, 9 Apr 2025 14:07:10 -0400 Subject: [PATCH] Visual Studio recognises __nullptr in C++ mode Visual Studio C++ recognises __nullptr. https://learn.microsoft.com/en-us/cpp/extensions/nullptr-cpp-component-extensions?view=msvc-170 Fixes #8308 --- src/ansi-c/scanner.l | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ansi-c/scanner.l b/src/ansi-c/scanner.l index 5d8e176a776..fb029bda822 100644 --- a/src/ansi-c/scanner.l +++ b/src/ansi-c/scanner.l @@ -1012,11 +1012,12 @@ enable_or_disable ("enable"|"disable") TOK_CHAR16_T); } -"__nullptr" { // GNU extension +"__nullptr" { // GNU, clang, VS extension return conditional_keyword( PARSER.cpp98 && (PARSER.mode==configt::ansi_ct::flavourt::GCC || - PARSER.mode==configt::ansi_ct::flavourt::CLANG), + PARSER.mode==configt::ansi_ct::flavourt::CLANG || + PARSER.mode==configt::ansi_ct::flavourt::VISUAL_STUDIO), TOK_NULLPTR); }