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,38 +4,38 @@
|
||||
|
||||
#include "toolchain/parser/parser_context.h"
|
||||
|
||||
namespace Carbon {
|
||||
namespace Carbon::Parse {
|
||||
|
||||
auto ParserHandleCodeBlock(ParserContext& context) -> void {
|
||||
auto HandleCodeBlock(Context& context) -> void {
|
||||
context.PopAndDiscardState();
|
||||
|
||||
context.PushState(ParserState::CodeBlockFinish);
|
||||
context.PushState(State::CodeBlockFinish);
|
||||
if (context.ConsumeAndAddLeafNodeIf(TokenKind::OpenCurlyBrace,
|
||||
ParseNodeKind::CodeBlockStart)) {
|
||||
context.PushState(ParserState::StatementScopeLoop);
|
||||
NodeKind::CodeBlockStart)) {
|
||||
context.PushState(State::StatementScopeLoop);
|
||||
} else {
|
||||
context.AddLeafNode(ParseNodeKind::CodeBlockStart, *context.position(),
|
||||
context.AddLeafNode(NodeKind::CodeBlockStart, *context.position(),
|
||||
/*has_error=*/true);
|
||||
|
||||
// Recover by parsing a single statement.
|
||||
CARBON_DIAGNOSTIC(ExpectedCodeBlock, Error, "Expected braced code block.");
|
||||
context.emitter().Emit(*context.position(), ExpectedCodeBlock);
|
||||
|
||||
context.PushState(ParserState::Statement);
|
||||
context.PushState(State::Statement);
|
||||
}
|
||||
}
|
||||
|
||||
auto ParserHandleCodeBlockFinish(ParserContext& context) -> void {
|
||||
auto HandleCodeBlockFinish(Context& context) -> void {
|
||||
auto state = context.PopState();
|
||||
|
||||
// If the block started with an open curly, this is a close curly.
|
||||
if (context.tokens().GetKind(state.token) == TokenKind::OpenCurlyBrace) {
|
||||
context.AddNode(ParseNodeKind::CodeBlock, context.Consume(),
|
||||
state.subtree_start, state.has_error);
|
||||
context.AddNode(NodeKind::CodeBlock, context.Consume(), state.subtree_start,
|
||||
state.has_error);
|
||||
} else {
|
||||
context.AddNode(ParseNodeKind::CodeBlock, state.token, state.subtree_start,
|
||||
context.AddNode(NodeKind::CodeBlock, state.token, state.subtree_start,
|
||||
/*has_error=*/true);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Carbon
|
||||
} // namespace Carbon::Parse
|
||||
Reference in new issue
Block a user