mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 12:58:11 +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,34 +7,33 @@
|
||||
|
||||
namespace Carbon::Check {
|
||||
|
||||
auto HandleAddress(Context& context, ParseTree::Node parse_node) -> bool {
|
||||
auto HandleAddress(Context& context, Parse::Node parse_node) -> bool {
|
||||
return context.TODO(parse_node, "HandleAddress");
|
||||
}
|
||||
|
||||
auto HandleGenericPatternBinding(Context& context, ParseTree::Node parse_node)
|
||||
auto HandleGenericPatternBinding(Context& context, Parse::Node parse_node)
|
||||
-> bool {
|
||||
return context.TODO(parse_node, "GenericPatternBinding");
|
||||
}
|
||||
|
||||
auto HandlePatternBinding(Context& context, ParseTree::Node parse_node)
|
||||
-> bool {
|
||||
auto HandlePatternBinding(Context& context, Parse::Node parse_node) -> bool {
|
||||
auto [type_node, parsed_type_id] =
|
||||
context.node_stack().PopExpressionWithParseNode();
|
||||
auto cast_type_id = context.ExpressionAsType(type_node, parsed_type_id);
|
||||
|
||||
// Get the name.
|
||||
auto [name_node, name_id] =
|
||||
context.node_stack().PopWithParseNode<ParseNodeKind::Name>();
|
||||
context.node_stack().PopWithParseNode<Parse::NodeKind::Name>();
|
||||
|
||||
// Allocate a node of the appropriate kind, linked to the name for error
|
||||
// locations.
|
||||
switch (auto context_parse_node_kind = context.parse_tree().node_kind(
|
||||
context.node_stack().PeekParseNode())) {
|
||||
case ParseNodeKind::VariableIntroducer:
|
||||
case Parse::NodeKind::VariableIntroducer:
|
||||
context.AddNodeAndPush(parse_node, SemIR::Node::VarStorage::Make(
|
||||
name_node, cast_type_id, name_id));
|
||||
break;
|
||||
case ParseNodeKind::ParameterListStart:
|
||||
case Parse::NodeKind::ParameterListStart:
|
||||
context.AddNodeAndPush(parse_node, SemIR::Node::Parameter::Make(
|
||||
name_node, cast_type_id, name_id));
|
||||
break;
|
||||
@@ -45,7 +44,7 @@ auto HandlePatternBinding(Context& context, ParseTree::Node parse_node)
|
||||
return true;
|
||||
}
|
||||
|
||||
auto HandleTemplate(Context& context, ParseTree::Node parse_node) -> bool {
|
||||
auto HandleTemplate(Context& context, Parse::Node parse_node) -> bool {
|
||||
return context.TODO(parse_node, "HandleTemplate");
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user