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,11 +4,10 @@
|
||||
|
||||
#include "toolchain/parser/parser_context.h"
|
||||
|
||||
namespace Carbon {
|
||||
namespace Carbon::Parse {
|
||||
|
||||
// Handles an unrecognized declaration, adding an error node.
|
||||
static auto ParserHandleUnrecognizedDeclaration(ParserContext& context)
|
||||
-> void {
|
||||
static auto HandleUnrecognizedDeclaration(Context& context) -> void {
|
||||
CARBON_DIAGNOSTIC(UnrecognizedDeclaration, Error,
|
||||
"Unrecognized declaration introducer.");
|
||||
context.emitter().Emit(*context.position(), UnrecognizedDeclaration);
|
||||
@@ -16,11 +15,11 @@ static auto ParserHandleUnrecognizedDeclaration(ParserContext& context)
|
||||
auto semi = context.SkipPastLikelyEnd(cursor);
|
||||
// Locate the EmptyDeclaration at the semi when found, but use the
|
||||
// original cursor location for an error when not.
|
||||
context.AddLeafNode(ParseNodeKind::EmptyDeclaration, semi ? *semi : cursor,
|
||||
context.AddLeafNode(NodeKind::EmptyDeclaration, semi ? *semi : cursor,
|
||||
/*has_error=*/true);
|
||||
}
|
||||
|
||||
auto ParserHandleDeclarationScopeLoop(ParserContext& context) -> void {
|
||||
auto HandleDeclarationScopeLoop(Context& context) -> void {
|
||||
// This maintains the current state unless we're at the end of the scope.
|
||||
|
||||
switch (context.PositionKind()) {
|
||||
@@ -31,38 +30,38 @@ auto ParserHandleDeclarationScopeLoop(ParserContext& context) -> void {
|
||||
break;
|
||||
}
|
||||
case TokenKind::Class: {
|
||||
context.PushState(ParserState::TypeIntroducerAsClass);
|
||||
context.PushState(State::TypeIntroducerAsClass);
|
||||
break;
|
||||
}
|
||||
case TokenKind::Constraint: {
|
||||
context.PushState(ParserState::TypeIntroducerAsNamedConstraint);
|
||||
context.PushState(State::TypeIntroducerAsNamedConstraint);
|
||||
break;
|
||||
}
|
||||
case TokenKind::Fn: {
|
||||
context.PushState(ParserState::FunctionIntroducer);
|
||||
context.PushState(State::FunctionIntroducer);
|
||||
break;
|
||||
}
|
||||
case TokenKind::Interface: {
|
||||
context.PushState(ParserState::TypeIntroducerAsInterface);
|
||||
context.PushState(State::TypeIntroducerAsInterface);
|
||||
break;
|
||||
}
|
||||
case TokenKind::Namespace: {
|
||||
context.PushState(ParserState::Namespace);
|
||||
context.PushState(State::Namespace);
|
||||
break;
|
||||
}
|
||||
case TokenKind::Semi: {
|
||||
context.AddLeafNode(ParseNodeKind::EmptyDeclaration, context.Consume());
|
||||
context.AddLeafNode(NodeKind::EmptyDeclaration, context.Consume());
|
||||
break;
|
||||
}
|
||||
case TokenKind::Var: {
|
||||
context.PushState(ParserState::VarAsSemicolon);
|
||||
context.PushState(State::VarAsSemicolon);
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
ParserHandleUnrecognizedDeclaration(context);
|
||||
HandleUnrecognizedDeclaration(context);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Carbon
|
||||
} // namespace Carbon::Parse
|
||||
Reference in new issue
Block a user