Merge pull request #8624 from diffblue/vs-nullptr

tautschnig · web-flow · commit 3b5e60849d2f · 2025-04-09T21:09:19.000+02:00
Visual Studio recognises `__nullptr` in C++ mode
diff --git 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);
                  }
 

Original file line number	Diff line number	Diff line change
`@@ -1012,11 +1012,12 @@ enable_or_disable ("enable"\|"disable")`
`1012`	`1012`	`TOK_CHAR16_T);`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`		`-"__nullptr" { // GNU extension`
	`1015`	`+"__nullptr" { // GNU, clang, VS extension`
`1016`	`1016`	`return conditional_keyword(`
`1017`	`1017`	`PARSER.cpp98 &&`
`1018`	`1018`	`(PARSER.mode==configt::ansi_ct::flavourt::GCC \|\|`
`1019`		`- PARSER.mode==configt::ansi_ct::flavourt::CLANG),`
	`1019`	`+ PARSER.mode==configt::ansi_ct::flavourt::CLANG \|\|`
	`1020`	`+ PARSER.mode==configt::ansi_ct::flavourt::VISUAL_STUDIO),`
`1020`	`1021`	`TOK_NULLPTR);`
`1021`	`1022`	`}`
`1022`	`1023`