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
@@ -4,34 +4,33 @@
|
||||
|
||||
#include "toolchain/parser/parser_context.h"
|
||||
|
||||
namespace Carbon {
|
||||
namespace Carbon::Parse {
|
||||
|
||||
// Handles PatternAs(DeducedParameter|FunctionParameter|Variable).
|
||||
static auto ParserHandlePattern(ParserContext& context,
|
||||
ParserContext::PatternKind pattern_kind)
|
||||
static auto HandlePattern(Context& context, Context::PatternKind pattern_kind)
|
||||
-> void {
|
||||
auto state = context.PopState();
|
||||
|
||||
// Parameters may have keywords prefixing the pattern. They become the parent
|
||||
// for the full PatternBinding.
|
||||
if (pattern_kind != ParserContext::PatternKind::Variable) {
|
||||
context.ConsumeIfPatternKeyword(
|
||||
TokenKind::Template, ParserState::PatternTemplate, state.subtree_start);
|
||||
context.ConsumeIfPatternKeyword(
|
||||
TokenKind::Addr, ParserState::PatternAddress, state.subtree_start);
|
||||
if (pattern_kind != Context::PatternKind::Variable) {
|
||||
context.ConsumeIfPatternKeyword(TokenKind::Template, State::PatternTemplate,
|
||||
state.subtree_start);
|
||||
context.ConsumeIfPatternKeyword(TokenKind::Addr, State::PatternAddress,
|
||||
state.subtree_start);
|
||||
}
|
||||
|
||||
// ParserHandle an invalid pattern introducer for parameters and variables.
|
||||
// Handle an invalid pattern introducer for parameters and variables.
|
||||
auto on_error = [&]() {
|
||||
switch (pattern_kind) {
|
||||
case ParserContext::PatternKind::DeducedParameter:
|
||||
case ParserContext::PatternKind::Parameter: {
|
||||
case Context::PatternKind::DeducedParameter:
|
||||
case Context::PatternKind::Parameter: {
|
||||
CARBON_DIAGNOSTIC(ExpectedParameterName, Error,
|
||||
"Expected parameter declaration.");
|
||||
context.emitter().Emit(*context.position(), ExpectedParameterName);
|
||||
break;
|
||||
}
|
||||
case ParserContext::PatternKind::Variable: {
|
||||
case Context::PatternKind::Variable: {
|
||||
CARBON_DIAGNOSTIC(ExpectedVariableName, Error,
|
||||
"Expected pattern in `var` declaration.");
|
||||
context.emitter().Emit(*context.position(), ExpectedVariableName);
|
||||
@@ -39,9 +38,9 @@ static auto ParserHandlePattern(ParserContext& context,
|
||||
}
|
||||
}
|
||||
// Add a placeholder for the type.
|
||||
context.AddLeafNode(ParseNodeKind::InvalidParse, *context.position(),
|
||||
context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
|
||||
/*has_error=*/true);
|
||||
state.state = ParserState::PatternFinishAsRegular;
|
||||
state.state = State::PatternFinishAsRegular;
|
||||
state.has_error = true;
|
||||
context.PushState(state);
|
||||
};
|
||||
@@ -49,17 +48,17 @@ static auto ParserHandlePattern(ParserContext& context,
|
||||
// The first item should be an identifier or, for deduced parameters, `self`.
|
||||
bool has_name = false;
|
||||
if (auto identifier = context.ConsumeIf(TokenKind::Identifier)) {
|
||||
context.AddLeafNode(ParseNodeKind::Name, *identifier);
|
||||
context.AddLeafNode(NodeKind::Name, *identifier);
|
||||
has_name = true;
|
||||
} else if (pattern_kind == ParserContext::PatternKind::DeducedParameter) {
|
||||
} else if (pattern_kind == Context::PatternKind::DeducedParameter) {
|
||||
if (auto self = context.ConsumeIf(TokenKind::SelfValueIdentifier)) {
|
||||
context.AddLeafNode(ParseNodeKind::SelfValueName, *self);
|
||||
context.AddLeafNode(NodeKind::SelfValueName, *self);
|
||||
has_name = true;
|
||||
}
|
||||
}
|
||||
if (!has_name) {
|
||||
// Add a placeholder for the name.
|
||||
context.AddLeafNode(ParseNodeKind::Name, *context.position(),
|
||||
context.AddLeafNode(NodeKind::Name, *context.position(),
|
||||
/*has_error=*/true);
|
||||
on_error();
|
||||
return;
|
||||
@@ -67,9 +66,8 @@ static auto ParserHandlePattern(ParserContext& context,
|
||||
|
||||
if (auto kind = context.PositionKind();
|
||||
kind == TokenKind::Colon || kind == TokenKind::ColonExclaim) {
|
||||
state.state = kind == TokenKind::Colon
|
||||
? ParserState::PatternFinishAsRegular
|
||||
: ParserState::PatternFinishAsGeneric;
|
||||
state.state = kind == TokenKind::Colon ? State::PatternFinishAsRegular
|
||||
: State::PatternFinishAsGeneric;
|
||||
// Use the `:` or `:!` for the root node.
|
||||
state.token = context.Consume();
|
||||
context.PushState(state);
|
||||
@@ -80,21 +78,20 @@ static auto ParserHandlePattern(ParserContext& context,
|
||||
}
|
||||
}
|
||||
|
||||
auto ParserHandlePatternAsDeducedParameter(ParserContext& context) -> void {
|
||||
ParserHandlePattern(context, ParserContext::PatternKind::DeducedParameter);
|
||||
auto HandlePatternAsDeducedParameter(Context& context) -> void {
|
||||
HandlePattern(context, Context::PatternKind::DeducedParameter);
|
||||
}
|
||||
|
||||
auto ParserHandlePatternAsParameter(ParserContext& context) -> void {
|
||||
ParserHandlePattern(context, ParserContext::PatternKind::Parameter);
|
||||
auto HandlePatternAsParameter(Context& context) -> void {
|
||||
HandlePattern(context, Context::PatternKind::Parameter);
|
||||
}
|
||||
|
||||
auto ParserHandlePatternAsVariable(ParserContext& context) -> void {
|
||||
ParserHandlePattern(context, ParserContext::PatternKind::Variable);
|
||||
auto HandlePatternAsVariable(Context& context) -> void {
|
||||
HandlePattern(context, Context::PatternKind::Variable);
|
||||
}
|
||||
|
||||
// Handles PatternFinishAs(Generic|Regular).
|
||||
static auto ParserHandlePatternFinish(ParserContext& context,
|
||||
ParseNodeKind node_kind) -> void {
|
||||
static auto HandlePatternFinish(Context& context, NodeKind node_kind) -> void {
|
||||
auto state = context.PopState();
|
||||
|
||||
context.AddNode(node_kind, state.token, state.subtree_start, state.has_error);
|
||||
@@ -106,18 +103,18 @@ static auto ParserHandlePatternFinish(ParserContext& context,
|
||||
}
|
||||
}
|
||||
|
||||
auto ParserHandlePatternFinishAsGeneric(ParserContext& context) -> void {
|
||||
ParserHandlePatternFinish(context, ParseNodeKind::GenericPatternBinding);
|
||||
auto HandlePatternFinishAsGeneric(Context& context) -> void {
|
||||
HandlePatternFinish(context, NodeKind::GenericPatternBinding);
|
||||
}
|
||||
|
||||
auto ParserHandlePatternFinishAsRegular(ParserContext& context) -> void {
|
||||
ParserHandlePatternFinish(context, ParseNodeKind::PatternBinding);
|
||||
auto HandlePatternFinishAsRegular(Context& context) -> void {
|
||||
HandlePatternFinish(context, NodeKind::PatternBinding);
|
||||
}
|
||||
|
||||
auto ParserHandlePatternAddress(ParserContext& context) -> void {
|
||||
auto HandlePatternAddress(Context& context) -> void {
|
||||
auto state = context.PopState();
|
||||
|
||||
context.AddNode(ParseNodeKind::Address, state.token, state.subtree_start,
|
||||
context.AddNode(NodeKind::Address, state.token, state.subtree_start,
|
||||
state.has_error);
|
||||
|
||||
// If an error was encountered, propagate it while adding a node.
|
||||
@@ -126,10 +123,10 @@ auto ParserHandlePatternAddress(ParserContext& context) -> void {
|
||||
}
|
||||
}
|
||||
|
||||
auto ParserHandlePatternTemplate(ParserContext& context) -> void {
|
||||
auto HandlePatternTemplate(Context& context) -> void {
|
||||
auto state = context.PopState();
|
||||
|
||||
context.AddNode(ParseNodeKind::Template, state.token, state.subtree_start,
|
||||
context.AddNode(NodeKind::Template, state.token, state.subtree_start,
|
||||
state.has_error);
|
||||
|
||||
// If an error was encountered, propagate it while adding a node.
|
||||
@@ -138,4 +135,4 @@ auto ParserHandlePatternTemplate(ParserContext& context) -> void {
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Carbon
|
||||
} // namespace Carbon::Parse
|
||||
Reference in new issue
Block a user