mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 02:38:12 +00:00
Set up a 'Parse' namespace. (#3161)
Continuing on #3070. I moved ParseTree::Node to just Parse::Node, versus Parse::Tree::Node. Other name changes are just removing "Parse" or "Parser" prefixes. In EnumBase, I'm directly defining operator<< because the ostream.h approach just isn't working, not for either of Parse::State nor Parse::NodeKind. Errors look like: ```toolchain/parser/parser_context.cpp:449:34: error: invalid operands to binary expression ('llvm::raw_ostream' and 'const Carbon::Parse::State') output << "\t" << i << ".\t" << entry.state; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~ ``` The expected template in `Carbon::` is not in the error list; I only see the: ``` ./common/ostream.h:112:6: note: candidate template ignored: requirement 'std::is_base_of_v<std::ostream, llvm::raw_ostream>' was not satisfied [with S = llvm::raw_ostream, T = Carbon::Parse::State] auto operator<<(S& standard_out, const T& value) -> S& { ^ ``` I'm still prodding at this, but not seeing an obvious fix. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
1 parent
64687aa7d1
commit
7157445f97
75 files changed
+1181
-1277
No files matched your search
@@ -18,15 +18,15 @@ auto DeclarationNameStack::Push() -> void {
|
||||
auto DeclarationNameStack::Pop() -> NameContext {
|
||||
if (context_->parse_tree().node_kind(
|
||||
context_->node_stack().PeekParseNode()) ==
|
||||
ParseNodeKind::QualifiedDeclaration) {
|
||||
Parse::NodeKind::QualifiedDeclaration) {
|
||||
// Any parts from a QualifiedDeclaration will already have been processed
|
||||
// into the name.
|
||||
context_->node_stack()
|
||||
.PopAndDiscardSoloParseNode<ParseNodeKind::QualifiedDeclaration>();
|
||||
.PopAndDiscardSoloParseNode<Parse::NodeKind::QualifiedDeclaration>();
|
||||
} else {
|
||||
// The name had no qualifiers, so we need to process the node now.
|
||||
auto [parse_node, name_id] =
|
||||
context_->node_stack().PopWithParseNode<ParseNodeKind::Name>();
|
||||
context_->node_stack().PopWithParseNode<Parse::NodeKind::Name>();
|
||||
ApplyNameQualifier(parse_node, name_id);
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ auto DeclarationNameStack::AddNameToLookup(NameContext name_context,
|
||||
}
|
||||
}
|
||||
|
||||
auto DeclarationNameStack::ApplyExpressionQualifier(ParseTree::Node parse_node,
|
||||
auto DeclarationNameStack::ApplyExpressionQualifier(Parse::Node parse_node,
|
||||
SemIR::NodeId node_id)
|
||||
-> void {
|
||||
auto& name_context = declaration_name_stack_.back();
|
||||
@@ -88,7 +88,7 @@ auto DeclarationNameStack::ApplyExpressionQualifier(ParseTree::Node parse_node,
|
||||
}
|
||||
}
|
||||
|
||||
auto DeclarationNameStack::ApplyNameQualifier(ParseTree::Node parse_node,
|
||||
auto DeclarationNameStack::ApplyNameQualifier(Parse::Node parse_node,
|
||||
SemIR::StringId name_id) -> void {
|
||||
auto& name_context = declaration_name_stack_.back();
|
||||
if (CanResolveQualifier(name_context, parse_node)) {
|
||||
@@ -129,8 +129,7 @@ auto DeclarationNameStack::UpdateScopeIfNeeded(NameContext& name_context)
|
||||
}
|
||||
|
||||
auto DeclarationNameStack::CanResolveQualifier(NameContext& name_context,
|
||||
ParseTree::Node parse_node)
|
||||
-> bool {
|
||||
Parse::Node parse_node) -> bool {
|
||||
switch (name_context.state) {
|
||||
case NameContext::State::Error:
|
||||
// Already in an error state, so return without examining.
|
||||
|
||||
Reference in new issue
Block a user