mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 10:30:17 +01:00
This does a mass rename of:
- `SourceLoc()` -> `source_loc()` for property naming
- `loc` -> `source_loc_` for underscore+consistency
- Generally changing function args to `source_loc` for consistency
- `Tag()` -> `kind()` for property naming and `Kind` parity
- `tag` -> `kind_` for underscore
Also renames `Pos` and `Results` on `Action`. These are a bit of an exception in that most base classes only have `Tag` and maybe `SourceLoc`, whereas `Action` has a little more. I felt okay having `source_loc()` and `kind()` on the base class where children do `Exp()` and the like, but it felt weird to me to mix it on the same class.
The reason for doing this cross-class in one PR is so that I can do it efficiently with a global replace in the codebase, rather than e.g. changing `Expression` but having to read through compiler errors to determine where it's calling `Expression`'s `Tag` versus a different `Tag`. The end result should be equivalent.
152 lines
5.5 KiB
C++
152 lines
5.5 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "executable_semantics/ast/expression.h"
|
|
|
|
#include <string>
|
|
|
|
#include "executable_semantics/ast/paren_contents.h"
|
|
#include "executable_semantics/common/arena.h"
|
|
#include "gmock/gmock.h"
|
|
#include "gtest/gtest.h"
|
|
#include "llvm/Support/Casting.h"
|
|
|
|
namespace Carbon {
|
|
namespace {
|
|
|
|
using llvm::cast;
|
|
using testing::ElementsAre;
|
|
using testing::IsEmpty;
|
|
|
|
// Matches a FieldInitializer named `name` whose `expression` is an
|
|
// `IntLiteral`
|
|
MATCHER_P(IntFieldNamed, name, "") {
|
|
return arg.name == std::string(name) &&
|
|
arg.expression->kind() == Expression::Kind::IntLiteral;
|
|
}
|
|
|
|
static auto FakeSourceLoc(int line_num) -> SourceLocation {
|
|
return SourceLocation("<test>", line_num);
|
|
}
|
|
|
|
class ExpressionTest : public ::testing::Test {
|
|
protected:
|
|
Arena arena;
|
|
};
|
|
|
|
TEST_F(ExpressionTest, EmptyAsExpression) {
|
|
ParenContents<Expression> contents = {.elements = {},
|
|
.has_trailing_comma = false};
|
|
Nonnull<const Expression*> expression =
|
|
ExpressionFromParenContents(&arena, FakeSourceLoc(1), contents);
|
|
EXPECT_EQ(expression->source_loc(), FakeSourceLoc(1));
|
|
ASSERT_EQ(expression->kind(), Expression::Kind::TupleLiteral);
|
|
EXPECT_THAT(cast<TupleLiteral>(*expression).Fields(), IsEmpty());
|
|
}
|
|
|
|
TEST_F(ExpressionTest, EmptyAsTuple) {
|
|
ParenContents<Expression> contents = {.elements = {},
|
|
.has_trailing_comma = false};
|
|
Nonnull<const Expression*> tuple =
|
|
TupleExpressionFromParenContents(&arena, FakeSourceLoc(1), contents);
|
|
EXPECT_EQ(tuple->source_loc(), FakeSourceLoc(1));
|
|
ASSERT_EQ(tuple->kind(), Expression::Kind::TupleLiteral);
|
|
EXPECT_THAT(cast<TupleLiteral>(*tuple).Fields(), IsEmpty());
|
|
}
|
|
|
|
TEST_F(ExpressionTest, UnaryNoCommaAsExpression) {
|
|
// Equivalent to a code fragment like
|
|
// ```
|
|
// (
|
|
// 42
|
|
// )
|
|
// ```
|
|
ParenContents<Expression> contents = {
|
|
.elements = {{.name = std::nullopt,
|
|
.term = arena.New<IntLiteral>(FakeSourceLoc(2), 42)}},
|
|
.has_trailing_comma = false};
|
|
|
|
Nonnull<const Expression*> expression =
|
|
ExpressionFromParenContents(&arena, FakeSourceLoc(1), contents);
|
|
EXPECT_EQ(expression->source_loc(), FakeSourceLoc(2));
|
|
ASSERT_EQ(expression->kind(), Expression::Kind::IntLiteral);
|
|
}
|
|
|
|
TEST_F(ExpressionTest, UnaryNoCommaAsTuple) {
|
|
ParenContents<Expression> contents = {
|
|
.elements = {{.name = std::nullopt,
|
|
.term = arena.New<IntLiteral>(FakeSourceLoc(2), 42)}},
|
|
.has_trailing_comma = false};
|
|
|
|
Nonnull<const Expression*> tuple =
|
|
TupleExpressionFromParenContents(&arena, FakeSourceLoc(1), contents);
|
|
EXPECT_EQ(tuple->source_loc(), FakeSourceLoc(1));
|
|
ASSERT_EQ(tuple->kind(), Expression::Kind::TupleLiteral);
|
|
EXPECT_THAT(cast<TupleLiteral>(*tuple).Fields(),
|
|
ElementsAre(IntFieldNamed("0")));
|
|
}
|
|
|
|
TEST_F(ExpressionTest, UnaryWithCommaAsExpression) {
|
|
ParenContents<Expression> contents = {
|
|
.elements = {{.name = std::nullopt,
|
|
.term = arena.New<IntLiteral>(FakeSourceLoc(2), 42)}},
|
|
.has_trailing_comma = true};
|
|
|
|
Nonnull<const Expression*> expression =
|
|
ExpressionFromParenContents(&arena, FakeSourceLoc(1), contents);
|
|
EXPECT_EQ(expression->source_loc(), FakeSourceLoc(1));
|
|
ASSERT_EQ(expression->kind(), Expression::Kind::TupleLiteral);
|
|
EXPECT_THAT(cast<TupleLiteral>(*expression).Fields(),
|
|
ElementsAre(IntFieldNamed("0")));
|
|
}
|
|
|
|
TEST_F(ExpressionTest, UnaryWithCommaAsTuple) {
|
|
ParenContents<Expression> contents = {
|
|
.elements = {{.name = std::nullopt,
|
|
.term = arena.New<IntLiteral>(FakeSourceLoc(2), 42)}},
|
|
.has_trailing_comma = true};
|
|
|
|
Nonnull<const Expression*> tuple =
|
|
TupleExpressionFromParenContents(&arena, FakeSourceLoc(1), contents);
|
|
EXPECT_EQ(tuple->source_loc(), FakeSourceLoc(1));
|
|
ASSERT_EQ(tuple->kind(), Expression::Kind::TupleLiteral);
|
|
EXPECT_THAT(cast<TupleLiteral>(*tuple).Fields(),
|
|
ElementsAre(IntFieldNamed("0")));
|
|
}
|
|
|
|
TEST_F(ExpressionTest, BinaryAsExpression) {
|
|
ParenContents<Expression> contents = {
|
|
.elements = {{.name = std::nullopt,
|
|
.term = arena.New<IntLiteral>(FakeSourceLoc(2), 42)},
|
|
{.name = std::nullopt,
|
|
.term = arena.New<IntLiteral>(FakeSourceLoc(3), 42)}},
|
|
.has_trailing_comma = true};
|
|
|
|
Nonnull<const Expression*> expression =
|
|
ExpressionFromParenContents(&arena, FakeSourceLoc(1), contents);
|
|
EXPECT_EQ(expression->source_loc(), FakeSourceLoc(1));
|
|
ASSERT_EQ(expression->kind(), Expression::Kind::TupleLiteral);
|
|
EXPECT_THAT(cast<TupleLiteral>(*expression).Fields(),
|
|
ElementsAre(IntFieldNamed("0"), IntFieldNamed("1")));
|
|
}
|
|
|
|
TEST_F(ExpressionTest, BinaryAsTuple) {
|
|
ParenContents<Expression> contents = {
|
|
.elements = {{.name = std::nullopt,
|
|
.term = arena.New<IntLiteral>(FakeSourceLoc(2), 42)},
|
|
{.name = std::nullopt,
|
|
.term = arena.New<IntLiteral>(FakeSourceLoc(3), 42)}},
|
|
.has_trailing_comma = true};
|
|
|
|
Nonnull<const Expression*> tuple =
|
|
TupleExpressionFromParenContents(&arena, FakeSourceLoc(1), contents);
|
|
EXPECT_EQ(tuple->source_loc(), FakeSourceLoc(1));
|
|
ASSERT_EQ(tuple->kind(), Expression::Kind::TupleLiteral);
|
|
EXPECT_THAT(cast<TupleLiteral>(*tuple).Fields(),
|
|
ElementsAre(IntFieldNamed("0"), IntFieldNamed("1")));
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace Carbon
|