carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +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.cpp
+18 -7
View File
@@ -223,7 +223,11 @@ auto SemanticsHandleLiteral(SemanticsContext& context,
auto id = context.semantics().AddIntegerLiteral(
context.tokens().GetIntegerLiteral(token));
context.AddNodeAndPush(
parse_node, SemanticsNode::IntegerLiteral::Make(parse_node, id));
parse_node,
SemanticsNode::IntegerLiteral::Make(
parse_node,
context.CanonicalizeType(SemanticsNodeId::BuiltinIntegerType),
id));
break;
}
case TokenKind::RealLiteral: {
@@ -233,14 +237,22 @@ auto SemanticsHandleLiteral(SemanticsContext& context,
.exponent = token_value.Exponent(),
.is_decimal = token_value.IsDecimal()});
context.AddNodeAndPush(parse_node,
SemanticsNode::RealLiteral::Make(parse_node, id));
SemanticsNode::RealLiteral::Make(
parse_node,
context.CanonicalizeType(
SemanticsNodeId::BuiltinFloatingPointType),
id));
break;
}
case TokenKind::StringLiteral: {
auto id = context.semantics().AddString(
context.tokens().GetStringLiteral(token));
context.AddNodeAndPush(
parse_node, SemanticsNode::StringLiteral::Make(parse_node, id));
parse_node,
SemanticsNode::StringLiteral::Make(
parse_node,
context.CanonicalizeType(SemanticsNodeId::BuiltinStringType),
id));
break;
}
case TokenKind::IntegerTypeLiteral: {
@@ -352,8 +364,8 @@ auto SemanticsHandlePatternBinding(SemanticsContext& context,
ParseTree::Node parse_node) -> bool {
auto [type_node, parsed_type_id] =
context.node_stack().PopForParseNodeAndNodeId();
SemanticsNodeId cast_type_id = context.ImplicitAsRequired(
type_node, parsed_type_id, SemanticsNodeId::BuiltinTypeType);
SemanticsNodeId cast_type_id =
context.ExpressionAsType(type_node, parsed_type_id);
// Get the name.
auto name_node = context.node_stack().PopForSoloParseNode();
@@ -447,8 +459,7 @@ auto SemanticsHandleReturnType(SemanticsContext& context,
// Propagate the type expression.
auto [type_parse_node, type_node_id] =
context.node_stack().PopForParseNodeAndNodeId();
auto cast_node_id = context.ImplicitAsRequired(
type_parse_node, type_node_id, SemanticsNodeId::BuiltinTypeType);
auto cast_node_id = context.ExpressionAsType(type_parse_node, type_node_id);
context.node_stack().Push(parse_node, cast_node_id);
return true;
}