mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 02:08:12 +00:00
Continuing on #3070. I moved ParseTree::Node to just Parse::Node, versus Parse::Tree::Node. Other name changes are just removing "Parse" or "Parser" prefixes. In EnumBase, I'm directly defining operator<< because the ostream.h approach just isn't working, not for either of Parse::State nor Parse::NodeKind. Errors look like: ```toolchain/parser/parser_context.cpp:449:34: error: invalid operands to binary expression ('llvm::raw_ostream' and 'const Carbon::Parse::State') output << "\t" << i << ".\t" << entry.state; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~ ``` The expected template in `Carbon::` is not in the error list; I only see the: ``` ./common/ostream.h:112:6: note: candidate template ignored: requirement 'std::is_base_of_v<std::ostream, llvm::raw_ostream>' was not satisfied [with S = llvm::raw_ostream, T = Carbon::Parse::State] auto operator<<(S& standard_out, const T& value) -> S& { ^ ``` I'm still prodding at this, but not seeing an obvious fix. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
75 lines
2.6 KiB
C++
75 lines
2.6 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 <utility>
|
|
|
|
#include "toolchain/semantics/semantics_context.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto HandleParenExpression(Context& context, Parse::Node parse_node) -> bool {
|
|
auto value_id = context.node_stack().PopExpression();
|
|
// ParamOrArgStart was called for tuple handling; clean up the ParamOrArg
|
|
// support for non-tuple cases.
|
|
context.ParamOrArgEnd(
|
|
/*for_args=*/true, Parse::NodeKind::ParenExpressionOrTupleLiteralStart);
|
|
context.node_stack()
|
|
.PopAndDiscardSoloParseNode<
|
|
Parse::NodeKind::ParenExpressionOrTupleLiteralStart>();
|
|
context.node_stack().Push(parse_node, value_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleParenExpressionOrTupleLiteralStart(Context& context,
|
|
Parse::Node parse_node) -> bool {
|
|
context.node_stack().Push(parse_node);
|
|
context.ParamOrArgStart();
|
|
return true;
|
|
}
|
|
|
|
static auto HandleTupleLiteralElement(Context& context) -> void {
|
|
// Convert the operand to a value.
|
|
// TODO: We need to decide how tuple literals interact with expression
|
|
// categories.
|
|
auto [value_node, value_id] =
|
|
context.node_stack().PopExpressionWithParseNode();
|
|
value_id = context.ConvertToValueExpression(value_id);
|
|
context.node_stack().Push(value_node, value_id);
|
|
}
|
|
|
|
auto HandleTupleLiteralComma(Context& context, Parse::Node /*parse_node*/)
|
|
-> bool {
|
|
HandleTupleLiteralElement(context);
|
|
context.ParamOrArgComma(/*for_args=*/true);
|
|
return true;
|
|
}
|
|
|
|
auto HandleTupleLiteral(Context& context, Parse::Node parse_node) -> bool {
|
|
if (context.parse_tree().node_kind(context.node_stack().PeekParseNode()) !=
|
|
Parse::NodeKind::ParenExpressionOrTupleLiteralStart) {
|
|
HandleTupleLiteralElement(context);
|
|
}
|
|
|
|
auto refs_id = context.ParamOrArgEnd(
|
|
/*for_args=*/true, Parse::NodeKind::ParenExpressionOrTupleLiteralStart);
|
|
|
|
context.node_stack()
|
|
.PopAndDiscardSoloParseNode<
|
|
Parse::NodeKind::ParenExpressionOrTupleLiteralStart>();
|
|
const auto& node_block = context.semantics_ir().GetNodeBlock(refs_id);
|
|
llvm::SmallVector<SemIR::TypeId> type_ids;
|
|
type_ids.reserve(node_block.size());
|
|
for (auto node : node_block) {
|
|
type_ids.push_back(context.semantics_ir().GetNode(node).type_id());
|
|
}
|
|
auto type_id = context.CanonicalizeTupleType(parse_node, std::move(type_ids));
|
|
|
|
auto value_id = context.AddNode(
|
|
SemIR::Node::TupleValue::Make(parse_node, type_id, refs_id));
|
|
context.node_stack().Push(parse_node, value_id);
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|