mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-14 14:08:50 +00:00
Lexer diagnostics used a single `const char*` as their source location, which only allowed pointing at a single character rather than a run of characters. This limited the underlining of unrecognized tokens, and also made escape sequence diagnostics particularly strange by stopping at whatever point the lexer discovered the error and pointing only at that location. For example: `"\w"` was reported at the `w`, and `"\x"` at the closing `"`. This change tries to always keep the primary location of a diagnostic the point at which typing (inserting or deleting) might fix the error. So for `"\x"`, `\x` is underlined, but the position is at the `"` as that's where you would type a hex code. The lexer's emitter now takes a special lexing source location that represents either a single position _between_ two characters, a single character, or a range of the source buffer. The lexer diagnostics are updated to construct these for the character range as appropriate. Parser diagnostics for a missing token were located at the _next_ token, which is particularly confusing for terminators like missing `;`s. Now they are located at a position after the previous token, with or without a space depending on the token, but typically on the same line. Diagnostics still sort by how far the parser has read. The parser diagnostics for unclosed groups also now attaches a label to the opening token when it is on a separate line. And the diagnostics for mismatched indent in a multi-line string attaches a label to the closing `'''` that establishes that indent. There are likely more location improvements we should do here, but this seemed like a reasonable incremental improvement and is what Claude found when doing an initial audit. One example where I think we should make further improvements is around suggesting raw identifiers when we find an unexpected `Cpp` or `Core` or `base`. We do this consistently now, but raw identifiers should be rare. A TODO is added for these cases. Assisted-by: Claude Code --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
340 lines
11 KiB
C++
340 lines
11 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/parse/tree_and_subtrees.h"
|
|
|
|
#include <tuple>
|
|
#include <utility>
|
|
|
|
#include "toolchain/base/fixed_size_value_store.h"
|
|
#include "toolchain/lex/token_index.h"
|
|
#include "toolchain/parse/typed_nodes.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
TreeAndSubtrees::TreeAndSubtrees(const Lex::TokenizedBuffer& tokens,
|
|
const Tree& tree)
|
|
: tokens_(&tokens),
|
|
tree_(&tree),
|
|
subtree_sizes_(
|
|
SubtreeSizeStore::MakeForOverwriteWithExplicitSize(tree_->size())) {
|
|
// A stack of nodes which haven't yet been used as children.
|
|
llvm::SmallVector<NodeId> size_stack;
|
|
for (auto n : tree.postorder()) {
|
|
// Nodes always include themselves.
|
|
int32_t size = 1;
|
|
auto kind = tree.node_kind(n);
|
|
if (kind.has_child_count()) {
|
|
// When the child count is set, remove the specific number from the stack.
|
|
CARBON_CHECK(
|
|
static_cast<int32_t>(size_stack.size()) >= kind.child_count(),
|
|
"Need {0} children for {1}, have {2} available", kind.child_count(),
|
|
kind, size_stack.size());
|
|
for (auto i : llvm::seq(kind.child_count())) {
|
|
auto child = size_stack.pop_back_val();
|
|
CARBON_CHECK(static_cast<size_t>(child.index) < subtree_sizes_.size());
|
|
size += subtree_sizes_.Get(child);
|
|
if (kind.has_bracket() && i == kind.child_count() - 1) {
|
|
CARBON_CHECK(
|
|
kind.bracket() == tree.node_kind(child),
|
|
"NodeId {0} ({1}) with child count {2} needs bracket {3}, found "
|
|
"wrong bracket {4}",
|
|
n, kind, kind.child_count(), kind.bracket(),
|
|
tree.node_kind(child));
|
|
}
|
|
}
|
|
} else {
|
|
while (true) {
|
|
CARBON_CHECK(!size_stack.empty(),
|
|
"NodeId {0} ({1}) is missing bracket {2}", kind, n,
|
|
kind.bracket());
|
|
auto child = size_stack.pop_back_val();
|
|
size += subtree_sizes_.Get(child);
|
|
if (kind.bracket() == tree.node_kind(child)) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
size_stack.push_back(n);
|
|
subtree_sizes_.Set(n, size);
|
|
}
|
|
|
|
// Remaining nodes should all be roots in the tree; make sure they line up.
|
|
CARBON_CHECK(
|
|
size_stack.back().index == static_cast<int32_t>(tree_->size()) - 1,
|
|
"{0} {1}", size_stack.back(), tree_->size() - 1);
|
|
int prev_index = -1;
|
|
for (const auto& n : size_stack) {
|
|
CARBON_CHECK(n.index - subtree_sizes_.Get(n) == prev_index,
|
|
"NodeId {0} is a root {1} with subtree_size {2}, but previous "
|
|
"root was at {3}.",
|
|
n, tree_->node_kind(n), subtree_sizes_.Get(n), prev_index);
|
|
prev_index = n.index;
|
|
}
|
|
}
|
|
|
|
auto TreeAndSubtrees::VerifyExtract(NodeId node_id, NodeKind kind,
|
|
ErrorBuilder* trace) const -> bool {
|
|
switch (kind) {
|
|
#define CARBON_PARSE_NODE_KIND(Name) \
|
|
case NodeKind::Name: \
|
|
return VerifyExtractAs<Name>(node_id, trace).has_value();
|
|
#include "toolchain/parse/node_kind.def"
|
|
}
|
|
}
|
|
|
|
auto TreeAndSubtrees::Verify() const -> ErrorOr<Success> {
|
|
// Validate that each node extracts successfully when not marked as having an
|
|
// error.
|
|
//
|
|
// Without this code, a 10 mloc test case of lex & parse takes 4.129 s ± 0.041
|
|
// s. With this additional verification, it takes 5.768 s ± 0.036 s.
|
|
for (NodeId n : tree_->postorder()) {
|
|
if (tree_->node_has_error(n)) {
|
|
continue;
|
|
}
|
|
|
|
auto node_kind = tree_->node_kind(n);
|
|
if (!VerifyExtract(n, node_kind, nullptr)) {
|
|
ErrorBuilder trace;
|
|
trace << llvm::formatv(
|
|
"NodeId #{0} couldn't be extracted as a {1}. Trace:\n", n, node_kind);
|
|
VerifyExtract(n, node_kind, &trace);
|
|
return trace;
|
|
}
|
|
}
|
|
|
|
// Validate the roots. Also ensures Tree::ExtractFile() doesn't error.
|
|
if (!TryExtractNodeFromChildren<File>(NodeId::None, roots(), nullptr)) {
|
|
ErrorBuilder trace;
|
|
trace << "Roots of tree couldn't be extracted as a `File`. Trace:\n";
|
|
TryExtractNodeFromChildren<File>(NodeId::None, roots(), &trace);
|
|
return trace;
|
|
}
|
|
|
|
return Success();
|
|
}
|
|
|
|
auto TreeAndSubtrees::postorder(NodeId n) const
|
|
-> llvm::iterator_range<Tree::PostorderIterator> {
|
|
// The postorder ends after this node, the root, and begins at the begin of
|
|
// its subtree.
|
|
int begin_index = n.index - subtree_sizes_.Get(n) + 1;
|
|
return Tree::PostorderIterator::MakeRange(NodeId(begin_index), n);
|
|
}
|
|
|
|
auto TreeAndSubtrees::children(NodeId n) const
|
|
-> llvm::iterator_range<SiblingIterator> {
|
|
CARBON_CHECK(n.has_value());
|
|
int end_index = n.index - subtree_sizes_.Get(n);
|
|
return llvm::iterator_range<SiblingIterator>(
|
|
SiblingIterator(*this, NodeId(n.index - 1)),
|
|
SiblingIterator(*this, NodeId(end_index)));
|
|
}
|
|
|
|
auto TreeAndSubtrees::roots() const -> llvm::iterator_range<SiblingIterator> {
|
|
return llvm::iterator_range<SiblingIterator>(
|
|
SiblingIterator(*this,
|
|
NodeId(static_cast<int>(subtree_sizes_.size()) - 1)),
|
|
SiblingIterator(*this, NodeId(-1)));
|
|
}
|
|
|
|
auto TreeAndSubtrees::YamlPrintNode(llvm::raw_ostream& output, NodeId n,
|
|
int depth, bool preorder) const -> bool {
|
|
output.indent(2 * (depth + 2));
|
|
output << "{";
|
|
// If children are being added, include node_index in order to disambiguate
|
|
// nodes.
|
|
if (preorder) {
|
|
output << "node_index: " << n.index << ", ";
|
|
}
|
|
output << "kind: '" << tree_->node_kind(n) << "', text: '"
|
|
<< tokens_->GetTokenText(tree_->node_token(n)) << "'";
|
|
|
|
if (tree_->node_has_error(n)) {
|
|
output << ", has_error: yes";
|
|
}
|
|
|
|
if (subtree_sizes_.Get(n) > 1) {
|
|
output << ", subtree_size: " << subtree_sizes_.Get(n);
|
|
if (preorder) {
|
|
output << ", children: [\n";
|
|
return true;
|
|
}
|
|
}
|
|
output << "}";
|
|
return false;
|
|
}
|
|
|
|
auto TreeAndSubtrees::PrettyPrintNode(llvm::raw_ostream& output, NodeId n,
|
|
int depth,
|
|
llvm::BitVector& pending_parents) const
|
|
-> void {
|
|
output.indent(2);
|
|
// In this mode we treat all nodes as nested under the parse tree root.
|
|
++depth;
|
|
CARBON_CHECK(pending_parents.find_last() <= depth,
|
|
"Node interleaved between a non-ancestor and its child");
|
|
pending_parents.resize(depth);
|
|
|
|
for (int i = 0; i < depth; ++i) {
|
|
if (i == depth - 1) {
|
|
if (pending_parents.test(i)) {
|
|
output << "├─";
|
|
} else {
|
|
output << "╭─";
|
|
pending_parents.set(i);
|
|
}
|
|
} else {
|
|
if (pending_parents.test(i)) {
|
|
output << "│ ";
|
|
} else {
|
|
output << " ";
|
|
}
|
|
}
|
|
}
|
|
output << tree_->node_kind(n) << " '"
|
|
<< tokens_->GetTokenText(tree_->node_token(n)) << "'";
|
|
|
|
if (tree_->node_has_error(n)) {
|
|
output << " has_error";
|
|
}
|
|
}
|
|
|
|
auto TreeAndSubtrees::PrintYamlPostorder(llvm::raw_ostream& output) const
|
|
-> void {
|
|
PrintPostorder(output, /*yaml=*/true);
|
|
}
|
|
|
|
auto TreeAndSubtrees::PrettyPrint(llvm::raw_ostream& output) const -> void {
|
|
PrintPostorder(output, /*yaml=*/false);
|
|
}
|
|
|
|
auto TreeAndSubtrees::PrintPostorder(llvm::raw_ostream& output, bool yaml) const
|
|
-> void {
|
|
output << "- filename: " << tokens_->source().filename() << "\n";
|
|
if (yaml) {
|
|
output << " parse_tree: [\n";
|
|
}
|
|
|
|
// Walk the tree in reverse, just to calculate depths for each node.
|
|
llvm::SmallVector<int> depths(tree_->size(), 0);
|
|
for (auto [n, depth] :
|
|
llvm::reverse(llvm::zip_equal(tree_->postorder(), depths))) {
|
|
for (auto child : children(n)) {
|
|
depths[child.index] = depth + 1;
|
|
}
|
|
}
|
|
|
|
llvm::BitVector pending_parents;
|
|
for (auto [n, depth] : llvm::zip_equal(tree_->postorder(), depths)) {
|
|
if (yaml) {
|
|
YamlPrintNode(output, n, depth, /*preorder=*/false);
|
|
output << ",\n";
|
|
} else {
|
|
PrettyPrintNode(output, n, depth, pending_parents);
|
|
output << "\n";
|
|
}
|
|
}
|
|
if (yaml) {
|
|
output << " ]\n";
|
|
} else {
|
|
output << " (root)\n";
|
|
}
|
|
}
|
|
|
|
auto TreeAndSubtrees::PrintYamlPreorder(llvm::raw_ostream& output) const
|
|
-> void {
|
|
output << "- filename: " << tokens_->source().filename() << "\n"
|
|
<< " parse_tree: [\n";
|
|
|
|
// The parse tree is stored in postorder. The preorder can be constructed
|
|
// by reversing the order of each level of siblings within an RPO. The
|
|
// sibling iterators are directly built around RPO and so can be used with a
|
|
// stack to produce preorder.
|
|
|
|
// The roots, like siblings, are in RPO (so reversed), but we add them in
|
|
// order here because we'll pop off the stack effectively reversing then.
|
|
llvm::SmallVector<std::pair<NodeId, int>, 16> node_stack;
|
|
for (NodeId n : roots()) {
|
|
node_stack.push_back({n, 0});
|
|
}
|
|
|
|
while (!node_stack.empty()) {
|
|
NodeId n = NodeId::None;
|
|
int depth;
|
|
std::tie(n, depth) = node_stack.pop_back_val();
|
|
|
|
if (YamlPrintNode(output, n, depth, /*preorder=*/true)) {
|
|
// Has children, so we descend. We append the children in order here as
|
|
// well because they will get reversed when popped off the stack.
|
|
for (NodeId sibling_n : children(n)) {
|
|
node_stack.push_back({sibling_n, depth + 1});
|
|
}
|
|
continue;
|
|
}
|
|
|
|
int next_depth = node_stack.empty() ? 0 : node_stack.back().second;
|
|
CARBON_CHECK(next_depth <= depth, "Cannot have the next depth increase!");
|
|
for ([[maybe_unused]] auto _ : llvm::seq(depth - next_depth)) {
|
|
output << "]}";
|
|
}
|
|
|
|
// We always end with a comma and a new line as we'll move to the next
|
|
// node at whatever the current level ends up being.
|
|
output << ",\n";
|
|
}
|
|
output << " ]\n";
|
|
}
|
|
|
|
auto TreeAndSubtrees::CollectMemUsage(MemUsage& mem_usage,
|
|
llvm::StringRef label) const -> void {
|
|
mem_usage.Collect(MemUsage::ConcatLabel(label, "subtree_sizes_"),
|
|
subtree_sizes_);
|
|
}
|
|
|
|
auto TreeAndSubtrees::GetSubtreeTokenRange(NodeId node_id) const
|
|
-> Lex::InclusiveTokenRange {
|
|
Lex::InclusiveTokenRange range = {.begin = tree_->node_token(node_id),
|
|
.end = Lex::TokenIndex::None};
|
|
range.end = range.begin;
|
|
for (NodeId desc : postorder(node_id)) {
|
|
Lex::TokenIndex desc_token = tree_->node_token(desc);
|
|
if (!desc_token.has_value()) {
|
|
continue;
|
|
}
|
|
if (desc_token < range.begin) {
|
|
range.begin = desc_token;
|
|
} else if (desc_token > range.end) {
|
|
range.end = desc_token;
|
|
}
|
|
}
|
|
return range;
|
|
}
|
|
|
|
auto TreeAndSubtrees::NodeToDiagnosticLoc(NodeId node_id, bool token_only) const
|
|
-> Diagnostics::ConvertedLoc {
|
|
// Support the invalid token as a way to emit only the filename, when there
|
|
// is no line association.
|
|
if (!node_id.has_value()) {
|
|
return {{.filename = tree_->tokens().source().filename()}, -1};
|
|
}
|
|
|
|
if (token_only) {
|
|
return tree_->tokens().TokenToDiagnosticLoc(tree_->node_token(node_id));
|
|
}
|
|
|
|
// Construct a location that encompasses all tokens that descend from this
|
|
// node (including the root).
|
|
return tree_->tokens().TokenRangeToDiagnosticLoc(
|
|
GetSubtreeTokenRange(node_id));
|
|
}
|
|
|
|
auto TreeAndSubtrees::SiblingIterator::Print(llvm::raw_ostream& output) const
|
|
-> void {
|
|
output << node_;
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|