Switch Ptr to a C++ pointer using the nonnull attribute (#831)

The advantage is a C++ pointer is special, and this approach eliminates the Ptr class type that was causing problems in conversions. Attribute suggestion was courtesy of chandlerc. We're sticking with the Ptr name because it's shorter than Nonnull, and we're likely to keep this in lots of places.
This commit is contained in:
Jon Meow authored and GitHub committed 2021-09-16 13:05:25 -07:00
1 parent 395a331cde
commit ff319d311a
6 files changed
+28 -62

No files matched your search

+8 -8
View File
@@ -38,7 +38,7 @@ TEST_F(PatternTest, EmptyAsPattern) {
ParenContents<Pattern> contents = {.elements = {},
.has_trailing_comma = false};
Ptr<const Pattern> pattern =
PatternFromParenContents(PtrTo(arena), FakeSourceLoc(1), contents);
PatternFromParenContents(&arena, FakeSourceLoc(1), contents);
EXPECT_EQ(pattern->SourceLoc(), FakeSourceLoc(1));
ASSERT_TRUE(isa<TuplePattern>(*pattern));
EXPECT_THAT(cast<TuplePattern>(*pattern).Fields(), IsEmpty());
@@ -48,7 +48,7 @@ TEST_F(PatternTest, EmptyAsTuplePattern) {
ParenContents<Pattern> contents = {.elements = {},
.has_trailing_comma = false};
Ptr<const TuplePattern> tuple =
TuplePatternFromParenContents(PtrTo(arena), FakeSourceLoc(1), contents);
TuplePatternFromParenContents(&arena, FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
EXPECT_THAT(tuple->Fields(), IsEmpty());
}
@@ -66,7 +66,7 @@ TEST_F(PatternTest, UnaryNoCommaAsPattern) {
.has_trailing_comma = false};
Ptr<const Pattern> pattern =
PatternFromParenContents(PtrTo(arena), FakeSourceLoc(1), contents);
PatternFromParenContents(&arena, FakeSourceLoc(1), contents);
EXPECT_EQ(pattern->SourceLoc(), FakeSourceLoc(2));
ASSERT_TRUE(isa<AutoPattern>(*pattern));
}
@@ -78,7 +78,7 @@ TEST_F(PatternTest, UnaryNoCommaAsTuplePattern) {
.has_trailing_comma = false};
Ptr<const TuplePattern> tuple =
TuplePatternFromParenContents(PtrTo(arena), FakeSourceLoc(1), contents);
TuplePatternFromParenContents(&arena, FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
EXPECT_THAT(tuple->Fields(), ElementsAre(AutoFieldNamed("0")));
}
@@ -90,7 +90,7 @@ TEST_F(PatternTest, UnaryWithCommaAsPattern) {
.has_trailing_comma = true};
Ptr<const Pattern> pattern =
PatternFromParenContents(PtrTo(arena), FakeSourceLoc(1), contents);
PatternFromParenContents(&arena, FakeSourceLoc(1), contents);
EXPECT_EQ(pattern->SourceLoc(), FakeSourceLoc(1));
ASSERT_TRUE(isa<TuplePattern>(*pattern));
EXPECT_THAT(cast<TuplePattern>(*pattern).Fields(),
@@ -104,7 +104,7 @@ TEST_F(PatternTest, UnaryWithCommaAsTuplePattern) {
.has_trailing_comma = true};
Ptr<const TuplePattern> tuple =
TuplePatternFromParenContents(PtrTo(arena), FakeSourceLoc(1), contents);
TuplePatternFromParenContents(&arena, FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
EXPECT_THAT(tuple->Fields(), ElementsAre(AutoFieldNamed("0")));
}
@@ -118,7 +118,7 @@ TEST_F(PatternTest, BinaryAsPattern) {
.has_trailing_comma = true};
Ptr<const Pattern> pattern =
PatternFromParenContents(PtrTo(arena), FakeSourceLoc(1), contents);
PatternFromParenContents(&arena, FakeSourceLoc(1), contents);
EXPECT_EQ(pattern->SourceLoc(), FakeSourceLoc(1));
ASSERT_TRUE(isa<TuplePattern>(*pattern));
EXPECT_THAT(cast<TuplePattern>(*pattern).Fields(),
@@ -134,7 +134,7 @@ TEST_F(PatternTest, BinaryAsTuplePattern) {
.has_trailing_comma = true};
Ptr<const TuplePattern> tuple =
TuplePatternFromParenContents(PtrTo(arena), FakeSourceLoc(1), contents);
TuplePatternFromParenContents(&arena, FakeSourceLoc(1), contents);
EXPECT_EQ(tuple->SourceLoc(), FakeSourceLoc(1));
EXPECT_THAT(tuple->Fields(),
ElementsAre(AutoFieldNamed("0"), AutoFieldNamed("1")));