From patchwork Fri Oct 13 22:37:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 152794 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp2191719vqb; Fri, 13 Oct 2023 15:42:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxTXay+JuSywsrlrufxhfERtkfCDB1MI0daT0Jv8fhk6dMGCn0+2TO6a9AKRBVYFagU5y+ X-Received: by 2002:ac8:7dd3:0:b0:418:1289:87a7 with SMTP id c19-20020ac87dd3000000b00418128987a7mr38158398qte.56.1697236977799; Fri, 13 Oct 2023 15:42:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697236977; cv=pass; d=google.com; s=arc-20160816; b=VLRoPSELFAy+ZVbXELxpERdggsPnwub3IU6DsdOn/MEVSqT4JHy+52xQAZIziym2H4 EI975qM/wP3u56orKdIDszLF9yaVAmpncFhehXeJOxXoCDj8hAEDqCZjblhX3kcAGhHC cN+tD3btQ3xOrdjpoSrWYvH520pMVMsSN4wYtFjjxqyTfnEfkYpI6PssgoRHHF4uS1qQ k3ZDTDnctuGGyu9oj1Gx+UkHoQDbHJ5QqfIDYdorIGjtZmEUpXuqZkQCOSMHPfdt6MIi 8nevNQqL6dN/bsk1MCj4Djl3vla329+DeMPnl+lgh+9nyV+ROHyuqn5itgvAVV0fY4Vd 5n3g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dmarc-filter:arc-filter:delivered-to:dkim-signature :dkim-filter; bh=QVChz69Gyt60mbU9bGpz82rR2gXDD0jcc7ySui8Wybg=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=OJPwVyN+YUkUVB2woafQRG06uEW9qnDWHjM5qzA55Ws0wdZo/MnMrXNxywyxkkqVUT 9+0DjwmK5Y0wvCTztKvccUClKW86rZpaQrTG2rUe/rHxnah4/QvN/GsmpjJKyjoToo6v H35s9+klS9Yb4x1Y6jePoEzSkwbGZob+j/ApysTo50wKIYlxV4cseFmEcy2dZdtxljzy pPJLg/KwOhh8ucd3Xk0sNk/DSC3126EBp2k+u+Ck+8lStp8AanCIebEroREwg4NXoHNZ XK23Yup4eOn888TrgsORIVWUuW4jiZMvkrz9bGaT9+yBrRYKl2SzZOvKS4Or2V7T6OFx 4EJA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=mw6rd+dB; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id d3-20020ac85ac3000000b00403cecf35bfsi1960393qtd.297.2023.10.13.15.42.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 15:42:57 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=mw6rd+dB; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 819483857725 for ; Fri, 13 Oct 2023 22:42:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 819483857725 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697236977; bh=QVChz69Gyt60mbU9bGpz82rR2gXDD0jcc7ySui8Wybg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=mw6rd+dBqzTsB7u5v+2LCYH9RYpNrIZwJyD7TAevSDqO/QheQ9hrNz8CzrLhD8iF/ I2AmafKbYbQzpqLyVpJm4w2bU1yOz27VO5aArrMebjJQNQFnTHPFJbTBkYhFKoQ14n wTN94zTs67Jo7nqGif9qJ2FDm16Tr9aj8qd7tQL4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-00641c01.pphosted.com (mx0b-00641c01.pphosted.com [205.220.177.146]) by sourceware.org (Postfix) with ESMTPS id 16A813857033; Fri, 13 Oct 2023 22:41:39 +0000 (GMT) ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 16A813857033 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.177.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697236900; cv=none; b=eqDis7QAVjfvaEBON7+iKbe2x02M9XpoDmJFJ8cQZWVdfWvpJUd7iLOmAYVjQxsdsCQO41v3+YXMyYTiBYq0NYui2vKo2gfFQNQUbb5qrjx1nKb9EvhaWHCT5ixDwvAIY16mpMP80cwA3TvrX+HP6IZMpElhbLdR0A2hgxsy3rs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697236900; c=relaxed/simple; bh=2JyjEv3NKZpiwAUHDLDUZlXV/snu6Qd2uC3fAj1M/GQ=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=uuQSAKtQXmLNqIQ0HS7q9Cq1Wq0yQZxT+LeWMN+6YxIULgb31I0qymm7Y8j60wi6IJj0Idpfbg96JpKR3QDGeWsNCvxWilfue5couT5aaDccZiVMkV5gEypBBpbqqTwlMK36ky8GudTcl0yYbVKJeRp3plRfSgvwJ7nPq+oo5DQ= ARC-Authentication-Results: i=1; server2.sourceware.org DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 16A813857033 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 (m0247478.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39DMX5Q4030783; Fri, 13 Oct 2023 22:41:38 GMT Received: from mxout24.cac.washington.edu (mxout24.cac.washington.edu [140.142.234.158]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3tqdeu8tjr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Oct 2023 22:41:38 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.54]) by mxout24.cac.washington.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 39DMfOs8001159 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Oct 2023 15:41:24 -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 39DMdx1G016619 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Oct 2023 15:41:24 -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 v19 03/40] c++: Accept the use of built-in trait identifiers Date: Fri, 13 Oct 2023 15:37:17 -0700 Message-ID: <20231013223957.1634024-4-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231013223957.1634024-1-kmatsui@gcc.gnu.org> References: <20231013211206.1215663-1-kmatsui@gcc.gnu.org> <20231013223957.1634024-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-GUID: W-RuDFrCOM4egB9w5acXla-3_02YK_Ds X-Proofpoint-ORIG-GUID: W-RuDFrCOM4egB9w5acXla-3_02YK_Ds 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 mlxscore=0 spamscore=0 adultscore=0 bulkscore=0 mlxlogscore=991 impostorscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 clxscore=1034 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310130197 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779681961607250764 X-GMAIL-MSGID: 1779681961607250764 This patch accepts the use of built-in trait identifiers when they are actually not used as traits. 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 those identifiers are used differently, 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);