carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Enable misc-non-private-member-variables-in-classes and adjust style to match (#4702)

Browse Source 
Pursuant to discussion regarding #4699, turn on
`misc-non-private-member-variables-in-classes` using the
`IgnoreClassesWithAllMemberVariablesBeingPublic` flag (the check treats
structs as classes, so we need this for structs with all-public
members). Updates the style guide notes to match, which should be pretty
minor due to the scoping of test fixtures.

Also fixes some underscore uses in test files on the way. Basically this
is keeping the style for [class data member
naming](https://google.github.io/styleguide/cppguide.html#Variable_Names)
even while making them public.
This commit is contained in:
Jon Ross-Perkins
2024-12-19 00:31:41 +00:00
committed by GitHub
parent f67a4a5bcb
commit cb4686bf21
11 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lex/string_literal_test.cpp
+18 -18
View File
@@ -15,8 +15,8 @@ namespace Carbon::Lex {
namespace {
class StringLiteralTest : public ::testing::Test {
protected:
StringLiteralTest() : error_tracker(ConsoleDiagnosticConsumer()) {}
public:
StringLiteralTest() : error_tracker_(ConsoleDiagnosticConsumer()) {}
auto Lex(llvm::StringRef text) -> StringLiteral {
std::optional<StringLiteral> result = StringLiteral::Lex(text);
@@ -28,12 +28,12 @@ class StringLiteralTest : public ::testing::Test {
auto Parse(llvm::StringRef text) -> llvm::StringRef {
StringLiteral token = Lex(text);
Testing::SingleTokenDiagnosticConverter converter(text);
DiagnosticEmitter<const char*> emitter(converter, error_tracker);
return token.ComputeValue(allocator, emitter);
DiagnosticEmitter<const char*> emitter(converter, error_tracker_);
return token.ComputeValue(allocator_, emitter);
}
llvm::BumpPtrAllocator allocator;
ErrorTrackingDiagnosticConsumer error_tracker;
llvm::BumpPtrAllocator allocator_;
ErrorTrackingDiagnosticConsumer error_tracker_;
};
TEST_F(StringLiteralTest, StringLiteralBounds) {
@@ -207,9 +207,9 @@ TEST_F(StringLiteralTest, StringLiteralContents) {
};
for (auto [test, expected] : testcases) {
error_tracker.Reset();
error_tracker_.Reset();
auto value = Parse(test.trim());
EXPECT_FALSE(error_tracker.seen_error()) << "`" << test << "`";
EXPECT_FALSE(error_tracker_.seen_error()) << "`" << test << "`";
EXPECT_EQ(value, expected);
}
}
@@ -238,9 +238,9 @@ TEST_F(StringLiteralTest, DoubleQuotedMultiLineLiteral) {
};
for (auto [test, contents] : testcases) {
error_tracker.Reset();
error_tracker_.Reset();
auto value = Parse(test.trim());
EXPECT_TRUE(error_tracker.seen_error()) << "`" << test << "`";
EXPECT_TRUE(error_tracker_.seen_error()) << "`" << test << "`";
EXPECT_EQ(value, contents);
}
}
@@ -262,9 +262,9 @@ TEST_F(StringLiteralTest, StringLiteralBadIndent) {
};
for (auto [test, contents] : testcases) {
error_tracker.Reset();
error_tracker_.Reset();
auto value = Parse(test);
EXPECT_TRUE(error_tracker.seen_error()) << "`" << test << "`";
EXPECT_TRUE(error_tracker_.seen_error()) << "`" << test << "`";
EXPECT_EQ(value, contents);
}
}
@@ -311,28 +311,28 @@ TEST_F(StringLiteralTest, StringLiteralBadEscapeSequence) {
};
for (llvm::StringLiteral test : testcases) {
error_tracker.Reset();
error_tracker_.Reset();
Parse(test);
EXPECT_TRUE(error_tracker.seen_error()) << "`" << test << "`";
EXPECT_TRUE(error_tracker_.seen_error()) << "`" << test << "`";
// TODO: Test value produced by error recovery.
}
}
TEST_F(StringLiteralTest, TabInString) {
auto value = Parse("\"x\ty\"");
EXPECT_TRUE(error_tracker.seen_error());
EXPECT_TRUE(error_tracker_.seen_error());
EXPECT_EQ(value, "x\ty");
}
TEST_F(StringLiteralTest, TabAtEndOfString) {
auto value = Parse("\"\t\t\t\"");
EXPECT_TRUE(error_tracker.seen_error());
EXPECT_TRUE(error_tracker_.seen_error());
EXPECT_EQ(value, "\t\t\t");
}
TEST_F(StringLiteralTest, TabInBlockString) {
auto value = Parse("'''\nx\ty\n'''");
EXPECT_TRUE(error_tracker.seen_error());
EXPECT_TRUE(error_tracker_.seen_error());
EXPECT_EQ(value, "x\ty\n");
}
@@ -341,7 +341,7 @@ TEST_F(StringLiteralTest, UnicodeTooManyDigits) {
text.append(10000, '9');
text.append("}");
auto value = Parse("\"\\" + text + "\"");
EXPECT_TRUE(error_tracker.seen_error());
EXPECT_TRUE(error_tracker_.seen_error());
EXPECT_EQ(value, text);
}