From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2108) id 2DD5B3858C51; Fri, 1 Jul 2022 21:33:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2DD5B3858C51 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Lewis Hyatt To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1399] c++: Minor cleanup in parser.cc X-Act-Checkin: gcc X-Git-Author: Lewis Hyatt X-Git-Refname: refs/heads/master X-Git-Oldrev: 1f76941c09f6f62f4cbf7a9f531ec95268dd2c0a X-Git-Newrev: ff64a8c951995cb1214b4d2864a4bd553b60f249 Message-Id: <20220701213351.2DD5B3858C51@sourceware.org> Date: Fri, 1 Jul 2022 21:33:51 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jul 2022 21:33:51 -0000 https://gcc.gnu.org/g:ff64a8c951995cb1214b4d2864a4bd553b60f249 commit r13-1399-gff64a8c951995cb1214b4d2864a4bd553b60f249 Author: Lewis Hyatt Date: Fri Jul 1 13:53:34 2022 -0400 c++: Minor cleanup in parser.cc The code to determine whether a given token starts a module directive is currently repeated in 4 places in parser.cc. I am about to submit a patch that needs to add it in a 5th place, so since the code is not completely trivial (needing to check for 3 different token types), it seems worthwhile to factor this logic into its own function. gcc/cp/ChangeLog: * parser.cc (cp_token_is_module_directive): New function refactoring common code. (cp_parser_skip_to_closing_parenthesis_1): Use the new function. (cp_parser_skip_to_end_of_statement): Likewise. (cp_parser_skip_to_end_of_block_or_statement): Likewise. (cp_parser_declaration): Likewise. Diff: --- gcc/cp/parser.cc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 212ed1445d5..6b3763bca53 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -629,6 +629,16 @@ cp_lexer_alloc (void) return lexer; } +/* Return TRUE if token is the start of a module declaration that will be + terminated by a CPP_PRAGMA_EOL token. */ +static inline bool +cp_token_is_module_directive (cp_token *token) +{ + return token->keyword == RID__EXPORT + || token->keyword == RID__MODULE + || token->keyword == RID__IMPORT; +} + /* Create a new main C++ lexer, the lexer that gets tokens from the preprocessor. */ @@ -3833,9 +3843,7 @@ cp_parser_skip_to_closing_parenthesis_1 (cp_parser *parser, break; case CPP_KEYWORD: - if (token->keyword != RID__EXPORT - && token->keyword != RID__MODULE - && token->keyword != RID__IMPORT) + if (!cp_token_is_module_directive (token)) break; /* FALLTHROUGH */ @@ -3936,9 +3944,7 @@ cp_parser_skip_to_end_of_statement (cp_parser* parser) break; case CPP_KEYWORD: - if (token->keyword != RID__EXPORT - && token->keyword != RID__MODULE - && token->keyword != RID__IMPORT) + if (!cp_token_is_module_directive (token)) break; /* FALLTHROUGH */ @@ -4025,9 +4031,7 @@ cp_parser_skip_to_end_of_block_or_statement (cp_parser* parser) break; case CPP_KEYWORD: - if (token->keyword != RID__EXPORT - && token->keyword != RID__MODULE - && token->keyword != RID__IMPORT) + if (!cp_token_is_module_directive (token)) break; /* FALLTHROUGH */ @@ -14958,9 +14962,7 @@ cp_parser_declaration (cp_parser* parser, tree prefix_attrs) else cp_parser_module_export (parser); } - else if (token1->keyword == RID__EXPORT - || token1->keyword == RID__IMPORT - || token1->keyword == RID__MODULE) + else if (cp_token_is_module_directive (token1)) { bool exporting = token1->keyword == RID__EXPORT; cp_token *next = exporting ? token2 : token1;