mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-27 10:20:11 +01:00
Jon Ross-Perkins
b2084ea15d
This PR renames parse nodes on a Name/NameExpression taxonomy. NameExpressions occur in a name context. The difference is that in non-expression contexts it's useful to return the identifier / string ID for adding to name lookup, whereas in expression contexts it's useful to return the resolved node ID for consistency with other expressions. In the code, I do note SelfValueName is returned in the expression context: I'd expect this to change, as `self` in `[self: Self]` versus `self.Foo()` will probably be best handled similarly to the above. That means that, in the proposed taxonomy, both `SelfValueName` and `SelfValueNameExpression` will exist in order to assist semantics. To contrast choices: Original | Current | [zygoloid suggestion](https://discord.com/channels/655572317891461132/655578254970716160/1121581663399464970) | [This PR](https://discord.com/channels/655572317891461132/655578254970716160/1121814551789318215) --- | --- | --- | --- DeclaredName/DesignatedName | Identifier | NameComponent | Name NameReference | NameReference | NameReference | NameExpression SelfValueIdentifier | SelfValueIdentifier | SelfValueReference | SelfValueName SelfTypeIdentifier | SelfTypeIdentiifer | SelfTypeReference | SelfTypeNameExpression
120 lines
4.4 KiB
C++
120 lines
4.4 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 "toolchain/semantics/semantics_context.h"
|
|
|
|
namespace Carbon {
|
|
|
|
auto SemanticsHandleStructComma(SemanticsContext& context,
|
|
ParseTree::Node /*parse_node*/) -> bool {
|
|
context.ParamOrArgComma(
|
|
/*for_args=*/context.parse_tree().node_kind(
|
|
context.node_stack().PeekParseNode()) !=
|
|
ParseNodeKind::StructFieldType);
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleStructFieldDesignator(SemanticsContext& context,
|
|
ParseTree::Node /*parse_node*/)
|
|
-> bool {
|
|
// This leaves the designated name on top because the `.` isn't interesting.
|
|
CARBON_CHECK(
|
|
context.parse_tree().node_kind(context.node_stack().PeekParseNode()) ==
|
|
ParseNodeKind::Name);
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleStructFieldType(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
auto [type_node, type_id] =
|
|
context.node_stack().PopWithParseNode<SemanticsNodeId>();
|
|
SemanticsTypeId cast_type_id = context.ExpressionAsType(type_node, type_id);
|
|
|
|
auto [name_node, name_id] =
|
|
context.node_stack().PopWithParseNode<SemanticsStringId>(
|
|
ParseNodeKind::Name);
|
|
|
|
context.AddNode(
|
|
SemanticsNode::StructTypeField::Make(name_node, cast_type_id, name_id));
|
|
context.node_stack().Push(parse_node);
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleStructFieldUnknown(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
return context.TODO(parse_node, "HandleStructFieldUnknown");
|
|
}
|
|
|
|
auto SemanticsHandleStructFieldValue(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
auto [value_parse_node, value_node_id] =
|
|
context.node_stack().PopWithParseNode<SemanticsNodeId>();
|
|
auto name_id =
|
|
context.node_stack().Pop<SemanticsStringId>(ParseNodeKind::Name);
|
|
|
|
// Store the name for the type.
|
|
auto type_block_id = context.args_type_info_stack().PeekForAdd();
|
|
context.semantics_ir().AddNode(
|
|
type_block_id,
|
|
SemanticsNode::StructTypeField::Make(
|
|
parse_node, context.semantics_ir().GetNode(value_node_id).type_id(),
|
|
name_id));
|
|
|
|
// Push the value back on the stack as an argument.
|
|
context.node_stack().Push(parse_node, value_node_id);
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleStructLiteral(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
auto refs_id = context.ParamOrArgEnd(
|
|
/*for_args=*/true, ParseNodeKind::StructLiteralOrStructTypeLiteralStart);
|
|
|
|
context.PopScope();
|
|
context.node_stack().PopAndDiscardSoloParseNode(
|
|
ParseNodeKind::StructLiteralOrStructTypeLiteralStart);
|
|
auto type_block_id = context.args_type_info_stack().Pop();
|
|
|
|
auto type_id = context.CanonicalizeStructType(parse_node, type_block_id);
|
|
|
|
auto value_id = context.AddNode(
|
|
SemanticsNode::StructValue::Make(parse_node, type_id, refs_id));
|
|
context.node_stack().Push(parse_node, value_id);
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleStructLiteralOrStructTypeLiteralStart(
|
|
SemanticsContext& context, ParseTree::Node parse_node) -> bool {
|
|
context.PushScope();
|
|
context.node_stack().Push(parse_node);
|
|
// At this point we aren't sure whether this will be a value or type literal,
|
|
// so we push onto args irrespective. It just won't be used for a type
|
|
// literal.
|
|
context.args_type_info_stack().Push();
|
|
context.ParamOrArgStart();
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleStructTypeLiteral(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
auto refs_id = context.ParamOrArgEnd(
|
|
/*for_args=*/false, ParseNodeKind::StructLiteralOrStructTypeLiteralStart);
|
|
|
|
context.PopScope();
|
|
context.node_stack().PopAndDiscardSoloParseNode(
|
|
ParseNodeKind::StructLiteralOrStructTypeLiteralStart);
|
|
// This is only used for value literals.
|
|
context.args_type_info_stack().Pop();
|
|
|
|
CARBON_CHECK(refs_id != SemanticsNodeBlockId::Empty)
|
|
<< "{} is handled by StructLiteral.";
|
|
|
|
auto type_id = context.CanonicalizeStructType(parse_node, refs_id);
|
|
context.node_stack().Push(parse_node,
|
|
context.semantics_ir().GetType(type_id));
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon
|