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

Add stringification for nodes. (#2704)

Browse Source 
This is used to make error messages more readable. It'll be particularly important as more complex types are added.
This commit is contained in:
Jon Ross-Perkins
2023-03-22 14:55:53 -07:00
committed by GitHub
parent e0c90767be
commit c615d76196
12 changed files with 95 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_parse_tree_handler.cpp
+13 -10
View File
@@ -168,9 +168,10 @@ auto SemanticsParseTreeHandler::TryTypeConversion(ParseTree::Node parse_node,
}
// TODO: This should use type names instead of nodes.
CARBON_DIAGNOSTIC(TypeMismatch, Error,
"Type mismatch: lhs is {0}, rhs is {1}", SemanticsNodeId,
SemanticsNodeId);
emitter_->Emit(parse_node, TypeMismatch, lhs_type, rhs_type);
"Type mismatch: lhs is {0}, rhs is {1}", std::string,
std::string);
emitter_->Emit(parse_node, TypeMismatch, semantics_->StringifyNode(lhs_type),
semantics_->StringifyNode(rhs_type));
return SemanticsNodeId::BuiltinInvalidType;
}
@@ -217,10 +218,11 @@ auto SemanticsParseTreeHandler::TryTypeConversionOnArgs(
CARBON_DIAGNOSTIC(
CallArgTypeMismatch, Note,
"Type mismatch: cannot convert argument {0} from {1} to {2}.", size_t,
SemanticsNodeId, SemanticsNodeId);
std::string, std::string);
emitter_->Build(arg_parse_node, NoMatchingCall)
.Note(param_parse_node, CallArgTypeMismatch, i, arg_ref_type,
param_ref_type)
.Note(param_parse_node, CallArgTypeMismatch, i,
semantics_->StringifyNode(arg_ref_type),
semantics_->StringifyNode(param_ref_type))
.Emit();
return false;
}
@@ -892,11 +894,12 @@ auto SemanticsParseTreeHandler::HandleReturnStatement(
// TODO: Stringify types, add a note pointing at the return
// type's parse node.
CARBON_DIAGNOSTIC(ReturnStatementTypeMismatch, Error,
"Cannot convert {0} to {1}.", SemanticsNodeId,
SemanticsNodeId);
"Cannot convert {0} to {1}.", std::string,
std::string);
emitter_
->Build(parse_node, ReturnStatementTypeMismatch, arg_type,
callable.return_type_id)
->Build(parse_node, ReturnStatementTypeMismatch,
semantics_->StringifyNode(arg_type),
semantics_->StringifyNode(callable.return_type_id))
.Emit();
}
arg_type = new_type;