mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-Perkins
acbe6530c3
What this really does is avoids shadowing names, so that we can comfortable have things like `Check::DiagnosticEmitter` or `Check::DiagnosticLoc` without shadowing being a concern. Note, down this path I'm also thinking about: - Renaming misc DiagnosticConsumer/DiagnosticEmitter classes, possibly just to DiagnosticConsumer/DiagnosticEmitter (so `Check::DiagnosticEmitter` instead of `SemIRLocDiagnosticEmitter`). - Dropping `Diagnostic` from `Emitter::DiagnosticBuilder`. - But not for `Check::DiagnosticBuilder`, because `Check::Builder` would be ambiguous. - Renaming diagnostics/diagnostic_* to drop "diagnostic". [Discussion about SemIRLoc -> DiagnosticLoc](https://discord.com/channels/655572317891461132/655578254970716160/1353771570463768698) reminded me of this (in particular the older [Check::DiagnosticBuilder discussion](https://discord.com/channels/655572317891461132/655578254970716160/1344363562608627763)), but I'd only do that rename if there's matching consensus about a path forward where we keep SemIRLoc, and in a way that it's only ever used for diagnostics (the divergence from which is at the root of current LocId discussion). I'm trying to keep that separate from a namespace addition for clarity.
58 lines
2.2 KiB
C++
58 lines
2.2 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/testing/compile_helper.h"
|
|
|
|
namespace Carbon::Testing {
|
|
|
|
auto CompileHelper::GetTokenizedBuffer(llvm::StringRef text,
|
|
Diagnostics::Consumer* consumer)
|
|
-> Lex::TokenizedBuffer& {
|
|
auto& source = GetSourceBuffer(text);
|
|
|
|
value_store_storage_.emplace_front();
|
|
token_storage_.push_front(Lex::Lex(value_store_storage_.front(), source,
|
|
consumer ? *consumer : consumer_));
|
|
return token_storage_.front();
|
|
}
|
|
|
|
auto CompileHelper::GetTokenizedBufferWithSharedValueStore(
|
|
llvm::StringRef text, Diagnostics::Consumer* consumer)
|
|
-> std::pair<Lex::TokenizedBuffer&, SharedValueStores&> {
|
|
auto& tokens = GetTokenizedBuffer(text, consumer);
|
|
return {tokens, value_store_storage_.front()};
|
|
}
|
|
|
|
auto CompileHelper::GetTree(llvm::StringRef text) -> Parse::Tree& {
|
|
auto& tokens = GetTokenizedBuffer(text);
|
|
tree_storage_.push_front(Parse::Parse(tokens, consumer_,
|
|
/*vlog_stream=*/nullptr));
|
|
return tree_storage_.front();
|
|
}
|
|
|
|
auto CompileHelper::GetTreeAndSubtrees(llvm::StringRef text)
|
|
-> Parse::TreeAndSubtrees& {
|
|
auto& tree = GetTree(text);
|
|
tree_and_subtrees_storage_.push_front(
|
|
Parse::TreeAndSubtrees(token_storage_.front(), tree));
|
|
return tree_and_subtrees_storage_.front();
|
|
}
|
|
|
|
auto CompileHelper::GetTokenizedBufferWithTreeAndSubtrees(llvm::StringRef text)
|
|
-> std::pair<Lex::TokenizedBuffer&, Parse::TreeAndSubtrees&> {
|
|
auto& tree_and_subtrees = GetTreeAndSubtrees(text);
|
|
return {token_storage_.front(), tree_and_subtrees};
|
|
}
|
|
|
|
auto CompileHelper::GetSourceBuffer(llvm::StringRef text) -> SourceBuffer& {
|
|
std::string filename = llvm::formatv("test{0}.carbon", ++file_index_);
|
|
CARBON_CHECK(fs_.addFile(filename, /*ModificationTime=*/0,
|
|
llvm::MemoryBuffer::getMemBuffer(text)));
|
|
source_storage_.push_front(
|
|
std::move(*SourceBuffer::MakeFromFile(fs_, filename, consumer_)));
|
|
return source_storage_.front();
|
|
}
|
|
|
|
} // namespace Carbon::Testing
|