mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-28 13:10:12 +01:00
Split Semantics into Check and SemIR namespaces (#3138)
Splits IR files into SemIR, and logic files into Check. These will be split into separate directories as part of a later move; the namespaces are being done first in order to vet the switch, and hopefully make conflicts a little easier to manage due to the substantial renames. A lot of this is just automated removal of Semantics prefixes from names, adding namespace references where needed. A few special-cases are: - SemanticsIR -> SemIR::File - A few things were discussed, like Unit, CompileUnit, or CompiledUnit. Unit was too vague for chandlerc, and I thought CompileUnit might lead to incorrect inferences (CompilationUnit would be more precise, but typically written as SemIR::CompilationUnit which is pretty long). File seemed to be a short name that we could agree on. - SemanticsIRFormatter -> SemIR::Formatter - FormatSemanticsIR -> SemIR::FormatFile - SemanticsFileTest -> CheckFileTest - It remains in the Testing namespace, where just "FileTest" might be too broad a name. - SemanticsDeclarationNameStack::Context -> Check::DeclarationNameStack::NameContext - This avoids a Check::Context name shadowing. Changes check_internal.h to include ostream.h to improve finding of Print/operator<< (otherwise it didn't compile). This is part of #3070
This commit is contained in:
@@ -8,16 +8,16 @@
|
||||
#include "llvm/ADT/STLExtras.h"
|
||||
#include "toolchain/semantics/semantics_node.h"
|
||||
|
||||
namespace Carbon {
|
||||
namespace Carbon::Check {
|
||||
|
||||
auto SemanticsNodeBlockStack::Push(SemanticsNodeBlockId id) -> void {
|
||||
auto NodeBlockStack::Push(SemIR::NodeBlockId id) -> void {
|
||||
CARBON_VLOG() << name_ << " Push " << stack_.size() << "\n";
|
||||
CARBON_CHECK(stack_.size() < (1 << 20))
|
||||
<< "Excessive stack size: likely infinite loop";
|
||||
stack_.push_back(id);
|
||||
}
|
||||
|
||||
auto SemanticsNodeBlockStack::PeekForAdd() -> SemanticsNodeBlockId {
|
||||
auto NodeBlockStack::PeekForAdd() -> SemIR::NodeBlockId {
|
||||
CARBON_CHECK(!stack_.empty()) << "no current block";
|
||||
auto& back = stack_.back();
|
||||
if (!back.is_valid()) {
|
||||
@@ -28,17 +28,17 @@ auto SemanticsNodeBlockStack::PeekForAdd() -> SemanticsNodeBlockId {
|
||||
return back;
|
||||
}
|
||||
|
||||
auto SemanticsNodeBlockStack::Pop() -> SemanticsNodeBlockId {
|
||||
auto NodeBlockStack::Pop() -> SemIR::NodeBlockId {
|
||||
CARBON_CHECK(!stack_.empty()) << "no current block";
|
||||
auto back = stack_.pop_back_val();
|
||||
CARBON_VLOG() << name_ << " Pop " << stack_.size() << ": " << back << "\n";
|
||||
if (!back.is_valid()) {
|
||||
return SemanticsNodeBlockId::Empty;
|
||||
return SemIR::NodeBlockId::Empty;
|
||||
}
|
||||
return back;
|
||||
}
|
||||
|
||||
auto SemanticsNodeBlockStack::PrintForStackDump(llvm::raw_ostream& output) const
|
||||
auto NodeBlockStack::PrintForStackDump(llvm::raw_ostream& output) const
|
||||
-> void {
|
||||
output << name_ << ":\n";
|
||||
for (auto [i, entry] : llvm::enumerate(stack_)) {
|
||||
@@ -46,4 +46,4 @@ auto SemanticsNodeBlockStack::PrintForStackDump(llvm::raw_ostream& output) const
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Carbon
|
||||
} // namespace Carbon::Check
|
||||
|
||||
Reference in New Issue
Block a user