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

Switch constexpr factory functions to constexpr values. (#2581)

Browse Source 
Using the same const/constexpr done in EnumBase, adds Invalid and Builtin* values to replace Make functions that produced the same. This should make it clearer at call sites what the cost actually is, and reduces the syntactic overhead for MakeBuiltinReference in particular.

Really, this is that MakeBuiltinReference has been feeling pretty verbose, so I did that, and then one MakeInvalid is right next to it, and then obviously I should replace the other MakeInvalid for consistency...
This commit is contained in:
Jon Ross-Perkins
2023-02-06 15:57:33 -08:00
committed by GitHub
parent 1a8a41a5a6
commit 5a0613283b
4 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_parse_tree_handler.cpp
+6 -9
View File
@@ -140,16 +140,15 @@ auto SemanticsParseTreeHandler::TryTypeConversion(ParseTree::Node parse_node,
// TODO: This should attempt a type conversion, but there's not enough
// implemented to do that right now.
if (lhs_type != rhs_type) {
auto invalid_type = SemanticsNodeId::MakeBuiltinReference(
SemanticsBuiltinKind::InvalidType);
if (lhs_type != invalid_type && rhs_type != invalid_type) {
if (lhs_type != SemanticsNodeId::BuiltinInvalidType &&
rhs_type != SemanticsNodeId::BuiltinInvalidType) {
// TODO: This is a poor diagnostic, and should be expanded.
CARBON_DIAGNOSTIC(TypeMismatch, Error,
"Type mismatch: lhs is {0}, rhs is {1}",
SemanticsNodeId, SemanticsNodeId);
emitter_->Emit(parse_node, TypeMismatch, lhs_type, rhs_type);
}
return invalid_type;
return SemanticsNodeId::BuiltinInvalidType;
}
return lhs_type;
}
@@ -332,7 +331,7 @@ auto SemanticsParseTreeHandler::HandleFunctionDefinitionStart(
auto decl_id =
AddNode(SemanticsNode::MakeFunctionDeclaration(fn_node, callable_id));
// TODO: Propagate the type of the function.
BindName(name_node, SemanticsNodeId::MakeInvalid(), decl_id);
BindName(name_node, SemanticsNodeId::Invalid, decl_id);
node_block_stack_.Push();
PushScope();
@@ -436,8 +435,7 @@ auto SemanticsParseTreeHandler::HandleLiteral(ParseTree::Node parse_node)
"Currently only i32 is allowed");
return false;
}
node_stack_.Push(parse_node, SemanticsNodeId::MakeBuiltinReference(
SemanticsBuiltinKind::IntegerType));
node_stack_.Push(parse_node, SemanticsNodeId::BuiltinIntegerType);
break;
}
default:
@@ -456,8 +454,7 @@ auto SemanticsParseTreeHandler::HandleNameReference(ParseTree::Node parse_node)
CARBON_DIAGNOSTIC(NameNotFound, Error, "Name {0} not found",
llvm::StringRef);
emitter_->Emit(parse_node, NameNotFound, name_str);
node_stack_.Push(parse_node, SemanticsNodeId::MakeBuiltinReference(
SemanticsBuiltinKind::InvalidType));
node_stack_.Push(parse_node, SemanticsNodeId::BuiltinInvalidType);
};
auto name_id = semantics_->GetString(name_str);