carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Validate parse nodes correspond to expected tokens (#3295)

Browse Source 
Can specify which tokens are allowed generally, and any additional
tokens that only occur when the parse node has an error.

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
josh11b
2023-10-13 21:44:51 +00:00
committed by GitHub
co-authored by Richard Smith
parent 95a1cc8cba
commit a112f2e802
16 changed files with 312 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/node_kind.cpp
+46 -2
View File
@@ -26,7 +26,8 @@ auto NodeKind::bracket() const -> NodeKind {
// Nodes are never self-bracketed, so we use that for nodes that instead set
// child_count.
static constexpr NodeKind Bracket[] = {
#define CARBON_PARSE_NODE_KIND_BRACKET(Name, BracketName) NodeKind::BracketName,
#define CARBON_PARSE_NODE_KIND_BRACKET(Name, BracketName, ...) \
NodeKind::BracketName,
#define CARBON_PARSE_NODE_KIND_CHILD_COUNT(Name, ...) NodeKind::Name,
#include "toolchain/parse/node_kind.def"
};
@@ -38,7 +39,7 @@ auto NodeKind::bracket() const -> NodeKind {
auto NodeKind::child_count() const -> int32_t {
static constexpr int32_t ChildCount[] = {
#define CARBON_PARSE_NODE_KIND_BRACKET(...) -1,
#define CARBON_PARSE_NODE_KIND_CHILD_COUNT(Name, Size) Size,
#define CARBON_PARSE_NODE_KIND_CHILD_COUNT(Name, Size, ...) Size,
#include "toolchain/parse/node_kind.def"
};
auto child_count = ChildCount[AsInt()];
@@ -46,4 +47,47 @@ auto NodeKind::child_count() const -> int32_t {
return child_count;
}
void CheckNodeMatchesLexerToken(NodeKind node_kind, Lex::TokenKind token_kind,
bool has_error) {
switch (node_kind) {
// Use `CARBON_LOG CARBON_ANY_TOKEN` to discover which combinations happen
// in practice.
#define CARBON_LOG \
llvm::errs() << "ZZZ: Created parse node with NodeKind " << node_kind \
<< " and has_error " << has_error << " for lexical token " \
<< token_kind << "\n";
#define CARBON_ANY_TOKEN return;
#define CARBON_TOKEN(Expected) \
if (token_kind == Lex::TokenKind::Expected) { \
return; \
}
#define CARBON_IF_ERROR(MatchActions) \
if (has_error) { \
MatchActions \
}
#define CARBON_CASE(Name, MatchActions) \
case NodeKind::Name: \
MatchActions; \
break;
#define CARBON_PARSE_NODE_KIND_BRACKET(Name, BracketName, MatchActions) \
CARBON_CASE(Name, MatchActions)
#define CARBON_PARSE_NODE_KIND_CHILD_COUNT(Name, Size, MatchActions) \
CARBON_CASE(Name, MatchActions)
#include "toolchain/parse/node_kind.def"
#undef CARBON_LOG
#undef CARBON_CASE
}
CARBON_FATAL() << "Created parse node with NodeKind " << node_kind
<< " and has_error " << has_error
<< " for unexpected lexical token " << token_kind;
}
} // namespace Carbon::Parse