From patchwork Thu Jul 25 02:44:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 261578 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id B59BF2C00E6 for ; Thu, 25 Jul 2013 12:45:01 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=jc5vdHWfPKX9Es2py OmggHiX1VBbqp9iNbD5AYMG1IDSHKYlrmRjN2yeDVXcEGsC5Qz4Mi/J9EL3HVTq0 jR2V7D3+fM8euYu1MAkiuRM93aOJ2F5WRvoI/ba8QOIIoAX2jnVSX+lCYOxgl7D8 XLfg1WhbxW5j0k7npcjThqAkmw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=GcYAi6Nyk1BGS3TQI4JIEiw 2GXQ=; b=iW7Ml+obCF6AzHy/fhd9fe67aoyWPbUxM9hib7/Xu9aSO2QndoGCAFR eAN+hU8UwprsfzFTVnZb81ZzON5PRdkVL0cPCm0GkJDw7Ql9LSyyBFLznAxxXKlb NasE9shE4LzQKoS/RfIHsKQbkP+uM0ehaAA1yx+0VNHFVE2E2dE8= Received: (qmail 7532 invoked by alias); 25 Jul 2013 02:44:54 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 7505 invoked by uid 89); 25 Jul 2013 02:44:54 -0000 X-Spam-SWARE-Status: No, score=-5.7 required=5.0 tests=AWL, BAYES_00, FSL_NEW_HELO_USER, KHOP_THREADED, RCVD_IN_DNSWL_MED, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_W, RDNS_NONE, SPF_PASS, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from Unknown (HELO userp1040.oracle.com) (156.151.31.81) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 25 Jul 2013 02:44:53 +0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r6P2ii45002061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 25 Jul 2013 02:44:45 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r6P2ig34008374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 25 Jul 2013 02:44:43 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r6P2igcc025996; Thu, 25 Jul 2013 02:44:42 GMT Received: from poldo4.casa (/79.52.192.15) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 24 Jul 2013 19:44:42 -0700 Message-ID: <51F09118.5030701@oracle.com> Date: Thu, 25 Jul 2013 04:44:40 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: Jason Merrill CC: "gcc-patches@gcc.gnu.org" Subject: Re: [C++ Patch] PR 57880 References: <51F054FE.2020901@oracle.com> <51F080E7.3090502@redhat.com> In-Reply-To: <51F080E7.3090502@redhat.com> X-Virus-Found: No On 07/25/2013 03:35 AM, Jason Merrill wrote: > You need to have tests for the other string prefixes, since you're > changing the code for them. Oh yes, something like this? (believe me, I had it, but then the last minute I simplified the testcase because the last lines didn't seem to exercise any additional code path in the new code. But I agree it may be useful if we do change the code) Thanks, Paolo. ////////////////// Index: cp/parser.c =================================================================== --- cp/parser.c (revision 201233) +++ cp/parser.c (working copy) @@ -12261,7 +12261,6 @@ cp_parser_operator (cp_parser* parser) tree id = NULL_TREE; cp_token *token; bool bad_encoding_prefix = false; - int string_len = 2; /* Peek at the next token. */ token = cp_lexer_peek_token (parser->lexer); @@ -12462,20 +12461,22 @@ cp_parser_operator (cp_parser* parser) return ansi_opname (ARRAY_REF); case CPP_WSTRING: - string_len = 3; case CPP_STRING16: case CPP_STRING32: - string_len = 5; case CPP_UTF8STRING: - string_len = 4; - bad_encoding_prefix = true; + bad_encoding_prefix = true; + /* Fall through. */ + case CPP_STRING: if (cxx_dialect == cxx98) maybe_warn_cpp0x (CPP0X_USER_DEFINED_LITERALS); if (bad_encoding_prefix) - error ("invalid encoding prefix in literal operator"); - if (TREE_STRING_LENGTH (token->u.value) > string_len) { + error ("invalid encoding prefix in literal operator"); + return error_mark_node; + } + if (TREE_STRING_LENGTH (token->u.value) > 2) + { error ("expected empty string after % keyword"); return error_mark_node; } @@ -12505,21 +12506,23 @@ cp_parser_operator (cp_parser* parser) } case CPP_WSTRING_USERDEF: - string_len = 3; case CPP_STRING16_USERDEF: case CPP_STRING32_USERDEF: - string_len = 5; case CPP_UTF8STRING_USERDEF: - string_len = 4; bad_encoding_prefix = true; + /* Fall through. */ + case CPP_STRING_USERDEF: if (cxx_dialect == cxx98) maybe_warn_cpp0x (CPP0X_USER_DEFINED_LITERALS); if (bad_encoding_prefix) - error ("invalid encoding prefix in literal operator"); + { + error ("invalid encoding prefix in literal operator"); + return error_mark_node; + } { tree string_tree = USERDEF_LITERAL_VALUE (token->u.value); - if (TREE_STRING_LENGTH (string_tree) > string_len) + if (TREE_STRING_LENGTH (string_tree) > 2) { error ("expected empty string after % keyword"); return error_mark_node; Index: testsuite/g++.dg/cpp1y/udlit-empty-string-neg.C =================================================================== --- testsuite/g++.dg/cpp1y/udlit-empty-string-neg.C (revision 0) +++ testsuite/g++.dg/cpp1y/udlit-empty-string-neg.C (working copy) @@ -0,0 +1,21 @@ +// { dg-options -std=c++1y } + +int +operator "*"_s(unsigned long long) // { dg-error "expected empty string after 'operator'" } +{ return 0; } + +int +operator L"*"_Ls(unsigned long long) // { dg-error "invalid encoding prefix in literal operator" } +{ return 0; } + +int +operator u"*"_s16(unsigned long long) // { dg-error "invalid encoding prefix in literal operator" } +{ return 0; } + +int +operator U"*"_s32(unsigned long long) // { dg-error "invalid encoding prefix in literal operator" } +{ return 0; } + +int +operator u8"*"_u8s(unsigned long long) // { dg-error "invalid encoding prefix in literal operator" } +{ return 0; }