Fix C++ ifndef_guard printer to also convert "-" to "_".

protobuf-github-bot · copybara-github · commit 7331b770978d · 2024-09-27T10:48:58.000-07:00
PiperOrigin-RevId: 679648401
diff --git a/src/google/protobuf/compiler/cpp/ifndef_guard.cc b/src/google/protobuf/compiler/cpp/ifndef_guard.cc
@@ -30,6 +30,7 @@ std::string MakeIfdefGuardIdentifier(const absl::string_view header_path) {
                                                                 {
                                                                     {"/", "_"},
                                                                     {".", "_"},
+                                                                    {"-", "_"},
                                                                 })),
                       "_");
 }
diff --git a/src/google/protobuf/compiler/cpp/ifndef_guard_unittest.cc b/src/google/protobuf/compiler/cpp/ifndef_guard_unittest.cc
@@ -36,7 +36,7 @@ TEST_F(IfnDefGuardTest, Basic) {
   {
     io::Printer printer(output(), '$');
 
-    const IfdefGuardPrinter ifdef_guard(&printer, "A/B/E/alpha");
+    const IfdefGuardPrinter ifdef_guard(&printer, "A/B-E.alpha");
 
     EXPECT_FALSE(printer.failed());
   }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ std::string MakeIfdefGuardIdentifier(const absl::string_view header_path) {`
`30`	`30`	`{`
`31`	`31`	`{"/", "_"},`
`32`	`32`	`{".", "_"},`
	`33`	`+ {"-", "_"},`
`33`	`34`	`})),`
`34`	`35`	`"_");`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ TEST_F(IfnDefGuardTest, Basic) {`
`36`	`36`	`{`
`37`	`37`	`io::Printer printer(output(), '$');`
`38`	`38`
`39`		`- const IfdefGuardPrinter ifdef_guard(&printer, "A/B/E/alpha");`
	`39`	`+ const IfdefGuardPrinter ifdef_guard(&printer, "A/B-E.alpha");`
`40`	`40`
`41`	`41`	`EXPECT_FALSE(printer.failed());`
`42`	`42`	`}`