mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-17 17:20:38 +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
@@ -7,22 +7,22 @@
|
||||
|
||||
namespace Carbon::Check {
|
||||
|
||||
auto HandleVariableDeclaration(Context& context, ParseTree::Node parse_node)
|
||||
auto HandleVariableDeclaration(Context& context, Parse::Node parse_node)
|
||||
-> bool {
|
||||
// Handle the optional initializer.
|
||||
auto expr_node_id = SemIR::NodeId::Invalid;
|
||||
bool has_init =
|
||||
context.parse_tree().node_kind(context.node_stack().PeekParseNode()) !=
|
||||
ParseNodeKind::PatternBinding;
|
||||
Parse::NodeKind::PatternBinding;
|
||||
if (has_init) {
|
||||
expr_node_id = context.node_stack().PopExpression();
|
||||
context.node_stack()
|
||||
.PopAndDiscardSoloParseNode<ParseNodeKind::VariableInitializer>();
|
||||
.PopAndDiscardSoloParseNode<Parse::NodeKind::VariableInitializer>();
|
||||
}
|
||||
|
||||
// Get the storage and add it to name lookup.
|
||||
SemIR::NodeId var_id =
|
||||
context.node_stack().Pop<ParseNodeKind::PatternBinding>();
|
||||
context.node_stack().Pop<Parse::NodeKind::PatternBinding>();
|
||||
auto var = context.semantics_ir().GetNode(var_id);
|
||||
auto name_id = var.GetAsVarStorage();
|
||||
context.AddNameToLookup(var.parse_node(), name_id, var_id);
|
||||
@@ -32,19 +32,19 @@ auto HandleVariableDeclaration(Context& context, ParseTree::Node parse_node)
|
||||
}
|
||||
|
||||
context.node_stack()
|
||||
.PopAndDiscardSoloParseNode<ParseNodeKind::VariableIntroducer>();
|
||||
.PopAndDiscardSoloParseNode<Parse::NodeKind::VariableIntroducer>();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
auto HandleVariableIntroducer(Context& context, ParseTree::Node parse_node)
|
||||
auto HandleVariableIntroducer(Context& context, Parse::Node parse_node)
|
||||
-> bool {
|
||||
// No action, just a bracketing node.
|
||||
context.node_stack().Push(parse_node);
|
||||
return true;
|
||||
}
|
||||
|
||||
auto HandleVariableInitializer(Context& context, ParseTree::Node parse_node)
|
||||
auto HandleVariableInitializer(Context& context, Parse::Node parse_node)
|
||||
-> bool {
|
||||
// No action, just a bracketing node.
|
||||
context.node_stack().Push(parse_node);
|
||||
|
||||
Reference in new issue
Block a user