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

Add a location translator for ParseTree::Node. (#2491)

Browse Source 
SemanticsIR emits in terms of parse tree nodes, doing this to echo TokenLocationTranslator.
This commit is contained in:
Jon Ross-Perkins
2022-12-27 08:43:33 -08:00
committed by GitHub
parent 60b45e3d30
commit 88905b99d8
6 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_parse_tree_handler.cpp
+4 -6
View File
@@ -108,7 +108,7 @@ auto SemanticsParseTreeHandler::BindName(ParseTree::Node name_node,
} else {
CARBON_DIAGNOSTIC(NameRedefined, Error, "Redefining {0} in the same scope.",
llvm::StringRef);
emitter_->Emit(parse_tree_->node_token(name_node), NameRedefined, name_str);
emitter_->Emit(name_node, NameRedefined, name_str);
// TODO: This should be a note and sorted with the above diagnostic.
// But that depends on more diagnostic support we currently don't have.
@@ -116,8 +116,7 @@ auto SemanticsParseTreeHandler::BindName(ParseTree::Node name_node,
auto prev_def = semantics_->GetNode(prev_def_id);
CARBON_DIAGNOSTIC(PreviousDefinition, Error,
"Previous definition is here.");
emitter_->Emit(parse_tree_->node_token(prev_def.parse_node()),
PreviousDefinition);
emitter_->Emit(prev_def.parse_node(), PreviousDefinition);
}
}
@@ -237,8 +236,7 @@ auto SemanticsParseTreeHandler::TryTypeConversion(ParseTree::Node parse_node,
CARBON_DIAGNOSTIC(TypeMismatch, Error,
"Type mismatch: lhs is {0}, rhs is {1}",
SemanticsNodeId, SemanticsNodeId);
emitter_->Emit(parse_tree_->node_token(parse_node), TypeMismatch,
lhs_type, rhs_type);
emitter_->Emit(parse_node, TypeMismatch, lhs_type, rhs_type);
}
return invalid_type;
}
@@ -492,7 +490,7 @@ auto SemanticsParseTreeHandler::HandleNameReference(ParseTree::Node parse_node)
auto name_not_found = [&] {
CARBON_DIAGNOSTIC(NameNotFound, Error, "Name {0} not found",
llvm::StringRef);
emitter_->Emit(parse_tree_->node_token(parse_node), NameNotFound, name_str);
emitter_->Emit(parse_node, NameNotFound, name_str);
Push(parse_node, SemanticsNodeId::MakeBuiltinReference(
SemanticsBuiltinKind::InvalidType()));
};