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

Remove obsolete '...' hints on node kind macros (#4958)

Browse Source 
We used to have more arguments, but they've mostly been removed now.
This commit is contained in:
Jon Ross-Perkins
2025-02-15 01:36:46 +00:00
committed by GitHub
parent e3764ff6f3
commit 9cd3f0aa3d
6 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_modifier.cpp
+2 -2
View File
@@ -95,8 +95,8 @@ static auto HandleModifier(Context& context, Parse::NodeId node_id,
return true;
}
#define CARBON_PARSE_NODE_KIND(...)
#define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name, ...) \
#define CARBON_PARSE_NODE_KIND(Name)
#define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name) \
auto HandleParseNode(Context& context, Parse::Name##ModifierId node_id) \
-> bool { \
HandleModifier(context, node_id, KeywordModifierSet::Name); \
toolchain/parse/handle_decl_scope_loop.cpp
+4 -5
View File
@@ -184,9 +184,8 @@ static auto ResolveAmbiguousTokenAsDeclaration(Context& context,
case Lex::TokenKind::Library:
case Lex::TokenKind::Namespace:
case Lex::TokenKind::Var:
#define CARBON_PARSE_NODE_KIND(...)
#define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name, ...) \
case Lex::TokenKind::Name:
#define CARBON_PARSE_NODE_KIND(Name)
#define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name) case Lex::TokenKind::Name:
#include "toolchain/parse/node_kind.def"
return false;
@@ -214,8 +213,8 @@ static auto TryHandleAsModifier(Context& context) -> bool {
}
switch (position_kind) {
#define CARBON_PARSE_NODE_KIND(...)
#define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name, ...) \
#define CARBON_PARSE_NODE_KIND(Name)
#define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name) \
case Lex::TokenKind::Name: \
context.AddLeafNode(NodeKind::Name##Modifier, context.Consume()); \
return true;
toolchain/parse/handle_expr.cpp
+8 -8
View File
@@ -355,10 +355,10 @@ auto HandleExprLoop(Context& context) -> void {
} else {
NodeKind node_kind;
switch (operator_kind) {
#define CARBON_PARSE_NODE_KIND(...)
#define CARBON_PARSE_NODE_KIND_POSTFIX_OPERATOR(Name, ...) \
case Lex::TokenKind::Name: \
node_kind = NodeKind::PostfixOperator##Name; \
#define CARBON_PARSE_NODE_KIND(Name)
#define CARBON_PARSE_NODE_KIND_POSTFIX_OPERATOR(Name) \
case Lex::TokenKind::Name: \
node_kind = NodeKind::PostfixOperator##Name; \
break;
#include "toolchain/parse/node_kind.def"
@@ -386,8 +386,8 @@ auto HandleExprLoopForInfixOperator(Context& context) -> void {
auto state = context.PopState();
switch (auto token_kind = context.tokens().GetKind(state.token)) {
#define CARBON_PARSE_NODE_KIND(...)
#define CARBON_PARSE_NODE_KIND_INFIX_OPERATOR(Name, ...) \
#define CARBON_PARSE_NODE_KIND(Name)
#define CARBON_PARSE_NODE_KIND_INFIX_OPERATOR(Name) \
case Lex::TokenKind::Name: \
HandleExprLoopForOperator(context, state, NodeKind::InfixOperator##Name); \
break;
@@ -402,8 +402,8 @@ auto HandleExprLoopForPrefixOperator(Context& context) -> void {
auto state = context.PopState();
switch (auto token_kind = context.tokens().GetKind(state.token)) {
#define CARBON_PARSE_NODE_KIND(...)
#define CARBON_PARSE_NODE_KIND_PREFIX_OPERATOR(Name, ...) \
#define CARBON_PARSE_NODE_KIND(Name)
#define CARBON_PARSE_NODE_KIND_PREFIX_OPERATOR(Name) \
case Lex::TokenKind::Name: \
HandleExprLoopForOperator(context, state, NodeKind::PrefixOperator##Name); \
break;
toolchain/parse/handle_statement.cpp
+2 -3
View File
@@ -48,9 +48,8 @@ auto HandleStatement(Context& context) -> void {
context.PushState(State::MatchIntroducer);
break;
}
#define CARBON_PARSE_NODE_KIND(...)
#define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name, ...) \
case Lex::TokenKind::Name:
#define CARBON_PARSE_NODE_KIND(Name)
#define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name) case Lex::TokenKind::Name:
#include "toolchain/parse/node_kind.def"
case Lex::TokenKind::Adapt:
case Lex::TokenKind::Alias:
toolchain/parse/node_kind.def
+12 -12
View File
@@ -19,7 +19,7 @@
// Defines a parse node for a postfix operator, with the Name as token.
// - CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(Name, LexTokenKind)
// Defines a parse node that corresponds to a token that is a single-token
// literal. The token is wrapped for LexTokenKinds.
// literal.
// - CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name)
// A token-based modifier. The Name is the TokenKind, and will be appended
// with "Modifier" for the parse kind.
@@ -37,8 +37,8 @@
// This is expected to be used with something like:
//
// // Use x-macros to handle modifier cases.
// #define CARBON_PARSE_NODE_KIND(...)
// #define CARBON_PARSE_NODE_KIND_PREFIX_OPERATOR(Name, ...) <code>
// #define CARBON_PARSE_NODE_KIND(Name)
// #define CARBON_PARSE_NODE_KIND_PREFIX_OPERATOR(Name) <code>
#ifndef CARBON_PARSE_NODE_KIND_PREFIX_OPERATOR
#define CARBON_PARSE_NODE_KIND_PREFIX_OPERATOR(Name) \
CARBON_PARSE_NODE_KIND(PrefixOperator##Name)
@@ -47,8 +47,8 @@
// This is expected to be used with something like:
//
// // Use x-macros to handle modifier cases.
// #define CARBON_PARSE_NODE_KIND(...)
// #define CARBON_PARSE_NODE_KIND_INFIX_OPERATOR(Name, ...) <code>
// #define CARBON_PARSE_NODE_KIND(Name)
// #define CARBON_PARSE_NODE_KIND_INFIX_OPERATOR(Name) <code>
#ifndef CARBON_PARSE_NODE_KIND_INFIX_OPERATOR
#define CARBON_PARSE_NODE_KIND_INFIX_OPERATOR(Name) \
CARBON_PARSE_NODE_KIND(InfixOperator##Name)
@@ -57,8 +57,8 @@
// This is expected to be used with something like:
//
// // Use x-macros to handle modifier cases.
// #define CARBON_PARSE_NODE_KIND(...)
// #define CARBON_PARSE_NODE_KIND_POSTFIX_OPERATOR(Name, ...) <code>
// #define CARBON_PARSE_NODE_KIND(Name)
// #define CARBON_PARSE_NODE_KIND_POSTFIX_OPERATOR(Name) <code>
#ifndef CARBON_PARSE_NODE_KIND_POSTFIX_OPERATOR
#define CARBON_PARSE_NODE_KIND_POSTFIX_OPERATOR(Name) \
CARBON_PARSE_NODE_KIND(PostfixOperator##Name)
@@ -67,18 +67,18 @@
// This is expected to be used with something like:
//
// // Use x-macros to handle literal cases.
// #define CARBON_PARSE_NODE_KIND(...)
// #define CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(Name, ...) <code>
// #define CARBON_PARSE_NODE_KIND(Name)
// #define CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(Name, LexTokenKind) <code>
#ifndef CARBON_PARSE_NODE_KIND_TOKEN_LITERAL
#define CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(Name, LexTokenKinds) \
#define CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(Name, LexTokenKind) \
CARBON_PARSE_NODE_KIND(Name)
#endif
// This is expected to be used with something like:
//
// // Use x-macros to handle modifier cases.
// #define CARBON_PARSE_NODE_KIND(...)
// #define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name, ...) <code>
// #define CARBON_PARSE_NODE_KIND(Name)
// #define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name) <code>
#ifndef CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER
#define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name) \
CARBON_PARSE_NODE_KIND(Name##Modifier)
toolchain/parse/typed_nodes.h
+1 -1
View File
@@ -945,7 +945,7 @@ struct PostfixOperator {
// Literals, operators, and modifiers
#define CARBON_PARSE_NODE_KIND(...)
#define CARBON_PARSE_NODE_KIND(Name)
#define CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(Name, LexTokenKind) \
using Name = LeafNode<NodeKind::Name, Lex::LexTokenKind##TokenIndex, \
NodeCategory::Expr>;