From patchwork Fri Oct 13 21:03:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 1848540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=q8g2boM1; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S6fS03662z1yqj for ; Sat, 14 Oct 2023 08:15:44 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 414663858436 for ; Fri, 13 Oct 2023 21:15:42 +0000 (GMT) ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 414663858436 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=::1 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1697231742; cv=none; b=oqDT+IT9MLkos+9Dsh2AxLz+t+wQTTd52yu45SdqOA75RQom1zlNNz+5o2IN3RsFcEtK391O0aTU3h57i1iMB9yE3DQp6bPchf75Qi6E+tgT11/TaT3ysfj2OPuIiec5DId7ALOcmXNLnq6kqYu8ZTEE49nGWqxu/9FTYyZPga8= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1697231742; c=relaxed/simple; bh=AxWorVMJ/EpZ4bFRPdCYPi1po3ThSMkbY5o5R4P4Ji4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=q2fgX55rLaDTKsDNrpXUm8DmsYZX3CyDrt/LrTpKd+L6HKDrfzwEiTPI/RHxV9AouwQNqrIYCycjwQNekmt2dtZZdb1nhphtjeApbMrkFeR+/cDVklWADx14I/ePjU7ygjomReVcw0s3xbLaaczHE/2UrjKrlfDi7Tm6jE/KXis= ARC-Authentication-Results: i=2; server2.sourceware.org; arc=none smtp.remote-ip=205.220.165.146 DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 414663858436 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697231742; bh=jDz4w4W4aHRyxcWEICUIgo9E68tFnBWhhvCZM53xC2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=q8g2boM1C5TIKE17LBypbk82olRRKXc3oExIR9YnDbVBNtz4bWyJ2FzCuPUMeO3hQ /8bE7SWOulNtuABh2nU+24ZzY77OyRxPlqflpf2/9LIG0x63i0YCDnYTyIDmSFhAx4 2xnU/goUmRtsYV+zAUWQnCZY2u6FTGe+aQizV+HE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00641c01.pphosted.com (mx0a-00641c01.pphosted.com [205.220.165.146]) by sourceware.org (Postfix) with ESMTPS id 8FC7A385771C; Fri, 13 Oct 2023 21:15:13 +0000 (GMT) ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8FC7A385771C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.165.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697231715; cv=none; b=dW71abjcNt3GBCsxQgoCosIfqejSNqdosMu+xWrxeEdAiVngR+UDRTs7T1JF1vxjFeaj7Umhcd+m6fXZqnBrkI7Svey+qTXvLH7+DuNtgHO3VOCVpWJzJ35sPVe3cy2JpzILHWHdfXOOXBvH42zS8Tyn2iBu1Bb+qLGeBR8R6Gs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697231715; c=relaxed/simple; bh=AxWorVMJ/EpZ4bFRPdCYPi1po3ThSMkbY5o5R4P4Ji4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=dt/xSmFKXHr4Hq8XY784U05AYAOOinEYS68aBd4ftCAm6QkaXaICF2NLRv/Nx04kDK/dBi8p+armEmj6A+1twBpf4aSH8c6UNRAisEnC96F5uek3O46717RPmhSiPDdWAvo0OGq9Ovv0Qeh4k6CkHG/GPtZmHnhC09nSaN0Ox40= ARC-Authentication-Results: i=1; server2.sourceware.org DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8FC7A385771C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org Received: from pps.filterd (m0247474.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39DLEXZN010217; Fri, 13 Oct 2023 21:15:12 GMT Received: from mxout22.s.uw.edu (mxout22.s.uw.edu [128.95.242.222]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3tq3k055w2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Oct 2023 21:15:12 +0000 Received: from smtp.washington.edu (smtp.washington.edu [140.142.234.157]) by mxout22.s.uw.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 39DLF9q7029783 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Oct 2023 14:15:09 -0700 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.19.18.191]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 39DLC9c6009146 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Oct 2023 14:15:09 -0700 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Ken Matsui Subject: [PATCH v18 03/40] c++: Accept the use of non-function-like built-in trait identifiers Date: Fri, 13 Oct 2023 14:03:59 -0700 Message-ID: <20231013211206.1215663-4-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231013211206.1215663-1-kmatsui@gcc.gnu.org> References: <20231011215049.1052142-1-kmatsui@gcc.gnu.org> <20231013211206.1215663-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-GUID: NhfSz9b2YyXnbxg0vjmKCEKLeSb9JQPJ X-Proofpoint-ORIG-GUID: NhfSz9b2YyXnbxg0vjmKCEKLeSb9JQPJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-13_12,2023-10-12_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 adultscore=0 clxscore=1034 mlxscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310130184 X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org This patch accepts the use of non-function-like built-in trait identifiers. Specifically, we check if the subsequent token is '(' for ordinary built-in traits or is '<' only for the special __type_pack_element built-in trait. If the same identifiers are used in other cases, the parser treats them as normal identifiers. This allows us to accept code like: struct __is_pointer {}; gcc/cp/ChangeLog: * parser.cc (cp_lexer_lookup_trait): Rename to ... (cp_lexer_peek_trait): ... this. Handle a subsequent token for the corresponding built-in trait. (cp_lexer_lookup_trait_expr): Rename to ... (cp_lexer_peek_trait_expr): ... this. (cp_lexer_lookup_trait_type): Rename to ... (cp_lexer_peek_trait_type): ... this. (cp_lexer_next_token_is_decl_specifier_keyword): Call cp_lexer_peek_trait_type. (cp_parser_simple_type_specifier): Likewise. (cp_parser_primary_expression): Call cp_lexer_peek_trait_expr. Signed-off-by: Ken Matsui --- gcc/cp/parser.cc | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 39952893ffa..59015eac596 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -247,12 +247,12 @@ static void cp_lexer_start_debugging (cp_lexer *) ATTRIBUTE_UNUSED; static void cp_lexer_stop_debugging (cp_lexer *) ATTRIBUTE_UNUSED; -static const cp_trait *cp_lexer_lookup_trait - (const cp_token *); -static const cp_trait *cp_lexer_lookup_trait_expr - (const cp_token *); -static const cp_trait *cp_lexer_lookup_trait_type - (const cp_token *); +static const cp_trait *cp_lexer_peek_trait + (cp_lexer *lexer, const cp_token *); +static const cp_trait *cp_lexer_peek_trait_expr + (cp_lexer *lexer, const cp_token *); +static const cp_trait *cp_lexer_peek_trait_type + (cp_lexer *lexer, const cp_token *); static cp_token_cache *cp_token_cache_new (cp_token *, cp_token *); @@ -1183,21 +1183,33 @@ cp_keyword_starts_decl_specifier_p (enum rid keyword) } } -/* Look ups the corresponding built-in trait if a given token is +/* Peeks the corresponding built-in trait if a given token is a built-in trait. Otherwise, returns nullptr. */ static const cp_trait * -cp_lexer_lookup_trait (const cp_token *token) +cp_lexer_peek_trait (cp_lexer *lexer, const cp_token *token1) { - tree id = token->u.value; + tree id = token1->u.value; - if (token->type == CPP_NAME + if (token1->type == CPP_NAME && TREE_CODE (id) == IDENTIFIER_NODE && IDENTIFIER_TRAIT_P (id)) { const char *id_str = IDENTIFIER_POINTER (id); const int id_len = IDENTIFIER_LENGTH (id); - return cp_trait_lookup::find (id_str, id_len); + const cp_trait *trait = cp_trait_lookup::find (id_str, id_len); + + /* Check if the subsequent token is a `<' token to + __type_pack_element or is a `(' token to everything else. */ + const cp_token *token2 = cp_lexer_peek_nth_token (lexer, 2); + if (trait->kind == CPTK_TYPE_PACK_ELEMENT + && token2->type != CPP_LESS) + return nullptr; + if (trait->kind != CPTK_TYPE_PACK_ELEMENT + && token2->type != CPP_OPEN_PAREN) + return nullptr; + + return trait; } return nullptr; } @@ -1206,9 +1218,9 @@ cp_lexer_lookup_trait (const cp_token *token) built-in trait. */ static const cp_trait * -cp_lexer_lookup_trait_expr (const cp_token *token) +cp_lexer_peek_trait_expr (cp_lexer *lexer, const cp_token *token1) { - const cp_trait *trait = cp_lexer_lookup_trait (token); + const cp_trait *trait = cp_lexer_peek_trait (lexer, token1); if (trait && !trait->type) return trait; @@ -1219,9 +1231,9 @@ cp_lexer_lookup_trait_expr (const cp_token *token) built-in trait. */ static const cp_trait * -cp_lexer_lookup_trait_type (const cp_token *token) +cp_lexer_peek_trait_type (cp_lexer *lexer, const cp_token *token1) { - const cp_trait *trait = cp_lexer_lookup_trait (token); + const cp_trait *trait = cp_lexer_peek_trait (lexer, token1); if (trait && trait->type) return trait; @@ -1236,7 +1248,7 @@ cp_lexer_next_token_is_decl_specifier_keyword (cp_lexer *lexer) cp_token *token; token = cp_lexer_peek_token (lexer); - if (cp_lexer_lookup_trait_type (token)) + if (cp_lexer_peek_trait_type (lexer, token)) return true; return cp_keyword_starts_decl_specifier_p (token->keyword); } @@ -6108,7 +6120,7 @@ cp_parser_primary_expression (cp_parser *parser, keyword. */ case CPP_NAME: { - const cp_trait* trait = cp_lexer_lookup_trait_expr (token); + const cp_trait* trait = cp_lexer_peek_trait_expr (parser->lexer, token); if (trait) return cp_parser_trait (parser, trait); } @@ -20117,7 +20129,7 @@ cp_parser_simple_type_specifier (cp_parser* parser, } /* If token is a type-yielding built-in traits, parse it. */ - const cp_trait* trait = cp_lexer_lookup_trait_type (token); + const cp_trait* trait = cp_lexer_peek_trait_type (parser->lexer, token); if (trait) { type = cp_parser_trait (parser, trait);