carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Start adding builtins to SemanticsIR (#2356)

Browse Source 
This starts adding builtins with TypeType and IntegerLiteralType. Note, structurally that's all they are, and not directly accessible in any way.

Adds a type field to SemanticsNode. Now, IntegerLiteralType can be identified as having type=TypeType, and IntegerLiteral as type=IntegerLiteralType. The current iteration doesn't do anything for type propagation, because I wanted to avoid making this too big.

This also switches the Identifier IR to instead BindName, with some side-effects. I'd been trying to think how to provide a name for TypeType, and switching around how things worked seemed like a better approach. And while I think it's the right direction (e.g., alias should just be a BindName), I also realized I don't need to name TypeType: there's probably a keyword to refer to the builtin, so it shouldn't use regular name lookup.
This commit is contained in:
Jon Ross-Perkins
2022-10-28 14:16:51 -07:00
committed by GitHub
parent 0219218b01
commit 57090142e8
18 changed files with 410 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_parse_tree_handler.cpp
+12 -11
View File
@@ -19,10 +19,6 @@ auto SemanticsParseTreeHandler::Build() -> void {
for (auto it = range.begin();; ++it) {
auto parse_node = *it;
switch (auto parse_kind = parse_tree_->node_kind(parse_node)) {
case ParseNodeKind::DeclaredName(): {
HandleDeclaredName(parse_node);
break;
}
case ParseNodeKind::FunctionDefinition(): {
HandleFunctionDefinition(parse_node);
break;
@@ -55,6 +51,7 @@ auto SemanticsParseTreeHandler::Build() -> void {
HandleReturnStatement(parse_node);
break;
}
case ParseNodeKind::DeclaredName():
case ParseNodeKind::FunctionIntroducer():
case ParseNodeKind::ParameterListEnd():
case ParseNodeKind::StatementEnd(): {
@@ -112,11 +109,13 @@ auto SemanticsParseTreeHandler::PopWithResult(ParseNodeKind pop_parse_kind)
return node_id;
}
auto SemanticsParseTreeHandler::HandleDeclaredName(ParseTree::Node parse_node)
-> void {
auto text = parse_tree_->GetNodeText(parse_node);
auto identifier_id = semantics_->AddIdentifier(text);
Push(parse_node, SemanticsNode::MakeIdentifier(identifier_id));
auto SemanticsParseTreeHandler::AddIdentifier(ParseTree::Node decl_node)
-> SemanticsIdentifierId {
CARBON_CHECK(parse_tree_->node_kind(decl_node) ==
ParseNodeKind::DeclaredName())
<< parse_tree_->node_kind(decl_node);
auto text = parse_tree_->GetNodeText(decl_node);
return semantics_->AddIdentifier(text);
}
auto SemanticsParseTreeHandler::HandleFunctionDefinition(
@@ -134,10 +133,12 @@ auto SemanticsParseTreeHandler::HandleFunctionDefinition(
auto SemanticsParseTreeHandler::HandleFunctionDefinitionStart(
ParseTree::Node parse_node) -> void {
Pop(ParseNodeKind::ParameterList());
auto name_node_id = PopWithResult(ParseNodeKind::DeclaredName());
auto name = AddIdentifier(node_stack_.back().parse_node);
node_stack_.pop_back();
Pop(ParseNodeKind::FunctionIntroducer());
auto decl_id = AddNode(SemanticsNode::MakeFunctionDeclaration(name_node_id));
auto decl_id = AddNode(SemanticsNode::MakeFunctionDeclaration());
AddNode(SemanticsNode::MakeBindName(name, decl_id));
auto block_id = semantics_->AddNodeBlock();
AddNode(SemanticsNode::MakeFunctionDefinition(decl_id, block_id));
node_block_stack_.push_back(block_id);