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:
Jon Ross-Perkins
2023-08-23 22:51:23 +00:00
committed by GitHub
parent b2db2ca7cf
commit 67da700dd5
53 changed files with 1337 additions and 1466 deletions
@@ -5,10 +5,9 @@
#include "toolchain/semantics/semantics_context.h"
#include "toolchain/semantics/semantics_node.h"
namespace Carbon {
namespace Carbon::Check {
auto SemanticsHandleExpressionStatement(SemanticsContext& context,
ParseTree::Node /*parse_node*/)
auto HandleExpressionStatement(Context& context, ParseTree::Node /*parse_node*/)
-> bool {
// Pop the expression without investigating its contents.
// TODO: This will probably eventually need to do some "do not discard"
@@ -17,8 +16,8 @@ auto SemanticsHandleExpressionStatement(SemanticsContext& context,
return true;
}
auto SemanticsHandleReturnStatement(SemanticsContext& context,
ParseTree::Node parse_node) -> bool {
auto HandleReturnStatement(Context& context, ParseTree::Node parse_node)
-> bool {
CARBON_CHECK(!context.return_scope_stack().empty());
const auto& fn_node =
context.semantics_ir().GetNode(context.return_scope_stack().back());
@@ -40,7 +39,7 @@ auto SemanticsHandleReturnStatement(SemanticsContext& context,
.Emit();
}
context.AddNode(SemanticsNode::Return::Make(parse_node));
context.AddNode(SemIR::Node::Return::Make(parse_node));
} else {
auto arg = context.node_stack().PopExpression();
context.node_stack()
@@ -61,7 +60,7 @@ auto SemanticsHandleReturnStatement(SemanticsContext& context,
context.ImplicitAsRequired(parse_node, arg, callable.return_type_id);
}
context.AddNode(SemanticsNode::ReturnExpression::Make(parse_node, arg));
context.AddNode(SemIR::Node::ReturnExpression::Make(parse_node, arg));
}
// Switch to a new, unreachable, empty node block. This typically won't
@@ -72,11 +71,11 @@ auto SemanticsHandleReturnStatement(SemanticsContext& context,
return true;
}
auto SemanticsHandleReturnStatementStart(SemanticsContext& context,
ParseTree::Node parse_node) -> bool {
auto HandleReturnStatementStart(Context& context, ParseTree::Node parse_node)
-> bool {
// No action, just a bracketing node.
context.node_stack().Push(parse_node);
return true;
}
} // namespace Carbon
} // namespace Carbon::Check