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

Clean up a few missed stringification comments and one diagnostic. (#2718)

Browse Source
This commit is contained in:
Jon Ross-Perkins
2023-03-30 10:26:03 -07:00
committed by GitHub
parent 2eef8c751b
commit 0925176da1
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_parse_tree_handler.cpp
+4 -8
View File
@@ -167,7 +167,6 @@ auto SemanticsParseTreeHandler::TryTypeConversion(ParseTree::Node parse_node,
if (type.is_valid()) {
return type;
}
// TODO: This should use type names instead of nodes.
CARBON_DIAGNOSTIC(TypeMismatch, Error,
"Type mismatch: lhs is {0}, rhs is {1}", std::string,
std::string);
@@ -215,7 +214,6 @@ auto SemanticsParseTreeHandler::TryTypeConversionOnArgs(
auto result_type = CanTypeConvert(arg_ref_type, param_ref_type);
if (!result_type.is_valid()) {
// TODO: This should use type names instead of nodes.
CARBON_DIAGNOSTIC(
CallArgTypeMismatch, Note,
"Type mismatch: cannot convert argument {0} from {1} to {2}.", size_t,
@@ -924,13 +922,12 @@ auto SemanticsParseTreeHandler::HandleReturnStatement(
node_stack_.PopAndDiscardSoloParseNode(ParseNodeKind::ReturnStatementStart);
if (callable.return_type_id.is_valid()) {
// TODO: Stringify types, add a note pointing at the return
// type's parse node.
// TODO: Add a note pointing at the return type's parse node.
CARBON_DIAGNOSTIC(ReturnStatementMissingExpression, Error,
"Must return a {0}.", SemanticsNodeId);
"Must return a {0}.", std::string);
emitter_
->Build(parse_node, ReturnStatementMissingExpression,
callable.return_type_id)
semantics_->StringifyNode(callable.return_type_id))
.Emit();
}
@@ -952,8 +949,7 @@ auto SemanticsParseTreeHandler::HandleReturnStatement(
} else {
const auto new_type = CanTypeConvert(arg_type, callable.return_type_id);
if (!new_type.is_valid()) {
// TODO: Stringify types, add a note pointing at the return
// type's parse node.
// TODO: Add a note pointing at the return type's parse node.
CARBON_DIAGNOSTIC(ReturnStatementTypeMismatch, Error,
"Cannot convert {0} to {1}.", std::string,
std::string);