mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +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
95 lines
3.5 KiB
C++
95 lines
3.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 "toolchain/semantics/semantics_context.h"
|
|
|
|
namespace Carbon {
|
|
|
|
auto SemanticsHandleFunctionDeclaration(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
return context.TODO(parse_node, "HandleFunctionDeclaration");
|
|
}
|
|
|
|
auto SemanticsHandleFunctionDefinition(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
auto function_id = context.node_stack().Pop<SemanticsFunctionId>(
|
|
ParseNodeKind::FunctionDefinitionStart);
|
|
|
|
// If the `}` of the function is reachable, reject if we need a return value
|
|
// and otherwise add an implicit `return;`.
|
|
if (context.is_current_position_reachable()) {
|
|
if (context.semantics_ir()
|
|
.GetFunction(function_id)
|
|
.return_type_id.is_valid()) {
|
|
CARBON_DIAGNOSTIC(
|
|
MissingReturnStatement, Error,
|
|
"Missing `return` at end of function with declared return type.");
|
|
context.emitter().Emit(parse_node, MissingReturnStatement);
|
|
} else {
|
|
context.AddNode(SemanticsNode::Return::Make(parse_node));
|
|
}
|
|
}
|
|
|
|
context.return_scope_stack().pop_back();
|
|
context.PopScope();
|
|
context.node_block_stack().Pop();
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleFunctionDefinitionStart(SemanticsContext& context,
|
|
ParseTree::Node parse_node)
|
|
-> bool {
|
|
SemanticsTypeId return_type_id = SemanticsTypeId::Invalid;
|
|
if (context.parse_tree().node_kind(context.node_stack().PeekParseNode()) ==
|
|
ParseNodeKind::ReturnType) {
|
|
return_type_id =
|
|
context.node_stack().Pop<SemanticsTypeId>(ParseNodeKind::ReturnType);
|
|
} else {
|
|
// Canonicalize the empty tuple for the implicit return.
|
|
context.CanonicalizeType(SemanticsNodeId::BuiltinEmptyTupleType);
|
|
}
|
|
auto param_refs_id = context.node_stack().Pop<SemanticsNodeBlockId>(
|
|
ParseNodeKind::ParameterList);
|
|
auto [name_node, name_id] =
|
|
context.node_stack().PopWithParseNode<SemanticsStringId>(
|
|
ParseNodeKind::Name);
|
|
auto fn_node = context.node_stack().PopForSoloParseNode(
|
|
ParseNodeKind::FunctionIntroducer);
|
|
|
|
// Create the entry block.
|
|
auto outer_block = context.node_block_stack().PeekForAdd();
|
|
context.node_block_stack().Push();
|
|
|
|
// Add the callable.
|
|
auto function_id = context.semantics_ir().AddFunction(
|
|
{.name_id = name_id,
|
|
.param_refs_id = param_refs_id,
|
|
.return_type_id = return_type_id,
|
|
.body_block_ids = {context.node_block_stack().PeekForAdd()}});
|
|
auto decl_id = context.AddNodeToBlock(
|
|
outer_block,
|
|
SemanticsNode::FunctionDeclaration::Make(fn_node, function_id));
|
|
context.AddNameToLookup(name_node, name_id, decl_id);
|
|
|
|
context.PushScope();
|
|
for (auto ref_id : context.semantics_ir().GetNodeBlock(param_refs_id)) {
|
|
auto ref = context.semantics_ir().GetNode(ref_id);
|
|
auto [name_id, target_id] = ref.GetAsBindName();
|
|
context.AddNameToLookup(ref.parse_node(), name_id, target_id);
|
|
}
|
|
context.return_scope_stack().push_back(decl_id);
|
|
context.node_stack().Push(parse_node, function_id);
|
|
|
|
return true;
|
|
}
|
|
|
|
auto SemanticsHandleFunctionIntroducer(SemanticsContext& context,
|
|
ParseTree::Node parse_node) -> bool {
|
|
// No action, just a bracketing node.
|
|
context.node_stack().Push(parse_node);
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon
|