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

Add value store to be shared across compile stages. (#3311)

Browse Source 
This updates lexing to use the data. I'll do checking separately, just
to split changes.

Note the ValueStore structure is also set up such that SemIR::File can
use it for other fields.

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Jon Ross-Perkins
2023-10-20 15:00:53 +00:00
committed by GitHub
co-authored by Richard Smith
parent 629c63c7d1
commit d13f76e001
26 changed files with 389 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/tree_test.cpp
+21 -19
View File
@@ -10,6 +10,7 @@
#include <forward_list>
#include "testing/base/test_raw_ostream.h"
#include "toolchain/base/value_store.h"
#include "toolchain/diagnostics/diagnostic_emitter.h"
#include "toolchain/diagnostics/mocks.h"
#include "toolchain/lex/tokenized_buffer.h"
@@ -27,34 +28,35 @@ namespace Yaml = ::Carbon::Testing::Yaml;
class TreeTest : public ::testing::Test {
protected:
auto GetSourceBuffer(llvm::StringRef t) -> SourceBuffer& {
CARBON_CHECK(fs.addFile("test.carbon", /*ModificationTime=*/0,
llvm::MemoryBuffer::getMemBuffer(t)));
source_storage.push_front(
std::move(*SourceBuffer::CreateFromFile(fs, "test.carbon", consumer)));
return source_storage.front();
CARBON_CHECK(fs_.addFile("test.carbon", /*ModificationTime=*/0,
llvm::MemoryBuffer::getMemBuffer(t)));
source_storage_.push_front(std::move(
*SourceBuffer::CreateFromFile(fs_, "test.carbon", consumer_)));
return source_storage_.front();
}
auto GetTokenizedBuffer(llvm::StringRef t) -> Lex::TokenizedBuffer& {
token_storage.push_front(
Lex::TokenizedBuffer::Lex(GetSourceBuffer(t), consumer));
return token_storage.front();
token_storage_.push_front(Lex::TokenizedBuffer::Lex(
value_stores_, GetSourceBuffer(t), consumer_));
return token_storage_.front();
}
llvm::vfs::InMemoryFileSystem fs;
std::forward_list<SourceBuffer> source_storage;
std::forward_list<Lex::TokenizedBuffer> token_storage;
DiagnosticConsumer& consumer = ConsoleDiagnosticConsumer();
SharedValueStores value_stores_;
llvm::vfs::InMemoryFileSystem fs_;
std::forward_list<SourceBuffer> source_storage_;
std::forward_list<Lex::TokenizedBuffer> token_storage_;
DiagnosticConsumer& consumer_ = ConsoleDiagnosticConsumer();
};
TEST_F(TreeTest, IsValid) {
Lex::TokenizedBuffer tokens = GetTokenizedBuffer("");
Tree tree = Tree::Parse(tokens, consumer, /*vlog_stream=*/nullptr);
Lex::TokenizedBuffer& tokens = GetTokenizedBuffer("");
Tree tree = Tree::Parse(tokens, consumer_, /*vlog_stream=*/nullptr);
EXPECT_TRUE((*tree.postorder().begin()).is_valid());
}
TEST_F(TreeTest, PrintPostorderAsYAML) {
Lex::TokenizedBuffer tokens = GetTokenizedBuffer("fn F();");
Tree tree = Tree::Parse(tokens, consumer, /*vlog_stream=*/nullptr);
Lex::TokenizedBuffer& tokens = GetTokenizedBuffer("fn F();");
Tree tree = Tree::Parse(tokens, consumer_, /*vlog_stream=*/nullptr);
EXPECT_FALSE(tree.has_errors());
TestRawOstream print_stream;
tree.Print(print_stream);
@@ -80,8 +82,8 @@ TEST_F(TreeTest, PrintPostorderAsYAML) {
}
TEST_F(TreeTest, PrintPreorderAsYAML) {
Lex::TokenizedBuffer tokens = GetTokenizedBuffer("fn F();");
Tree tree = Tree::Parse(tokens, consumer, /*vlog_stream=*/nullptr);
Lex::TokenizedBuffer& tokens = GetTokenizedBuffer("fn F();");
Tree tree = Tree::Parse(tokens, consumer_, /*vlog_stream=*/nullptr);
EXPECT_FALSE(tree.has_errors());
TestRawOstream print_stream;
tree.Print(print_stream, /*preorder=*/true);
@@ -123,7 +125,7 @@ TEST_F(TreeTest, HighRecursion) {
code.append(10000, '(');
code.append(10000, ')');
code += "; }";
Lex::TokenizedBuffer tokens = GetTokenizedBuffer(code);
Lex::TokenizedBuffer& tokens = GetTokenizedBuffer(code);
ASSERT_FALSE(tokens.has_errors());
Testing::MockDiagnosticConsumer consumer;
Tree tree = Tree::Parse(tokens, consumer, /*vlog_stream=*/nullptr);