carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 12:21:06 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Start refactoring type handling to track which types are in-use. (#2848)

Browse Source 
This is the first step to refactoring types into a SemanticsTypeId. This only tracks what's in-use, but as a consequence starts funneling type information through in ways similar to how I'd want it to do SemanticsTypeId.
This commit is contained in:
Jon Ross-Perkins
2023-05-26 10:16:38 -07:00
committed by GitHub
parent 527f314a2b
commit 1d56e165ef
67 changed files with 335 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_handle_struct.cpp
+11 -6
View File
@@ -28,8 +28,7 @@ auto SemanticsHandleStructFieldDesignator(SemanticsContext& context,
auto SemanticsHandleStructFieldType(SemanticsContext& context,
ParseTree::Node parse_node) -> bool {
auto [type_node, type_id] = context.node_stack().PopForParseNodeAndNodeId();
SemanticsNodeId cast_type_id = context.ImplicitAsRequired(
type_node, type_id, SemanticsNodeId::BuiltinTypeType);
SemanticsNodeId cast_type_id = context.ExpressionAsType(type_node, type_id);
auto [name_node, name_id] = context.node_stack().PopForParseNodeAndNameId(
ParseNodeKind::DesignatedName);
@@ -82,9 +81,14 @@ auto SemanticsHandleStructLiteral(SemanticsContext& context,
}
// Construct a type for the literal.
// TODO: This should try to canonicalize the struct form before adding the
// node.
auto refs = context.semantics().GetNodeBlock(refs_id);
auto type_id = context.AddNode(
SemanticsNode::StructType::Make(parse_node, type_block_id));
auto type_id =
context.CanonicalizeType(context.AddNode(SemanticsNode::StructType::Make(
parse_node,
context.CanonicalizeType(SemanticsNodeId::BuiltinTypeType),
type_block_id)));
auto value_id = context.AddNode(
SemanticsNode::StructValue::Make(parse_node, type_id, refs_id));
@@ -118,8 +122,9 @@ auto SemanticsHandleStructTypeLiteral(SemanticsContext& context,
CARBON_CHECK(refs_id != SemanticsNodeBlockId::Empty)
<< "{} is handled by StructLiteral.";
auto type_id =
context.AddNode(SemanticsNode::StructType::Make(parse_node, refs_id));
auto type_id = context.AddNode(SemanticsNode::StructType::Make(
parse_node, context.CanonicalizeType(SemanticsNodeId::BuiltinTypeType),
refs_id));
context.node_stack().Push(parse_node, type_id);
return true;
}