From patchwork Sun Aug 4 07:10:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Smith-Rowland <3dw4rd@verizon.net> X-Patchwork-Id: 264464 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 6A98A2C0091 for ; Sun, 4 Aug 2013 17:11:14 +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:content-type; q=dns; s=default; b=Kb8W4xrpbCRm6Itp9rRPSglvXur/LvkfJByyjW0ubFb qi7lCiYGZipNbgNn3gyOirVgb25r6DD+W/u8i8XCs1RK8CxxGJslEgWRzoBav1eh BwB+gRyEPIv7xDX3zN3Hjb0660CrkjfqfSJdHK9d9L8clAfOi0M7yAWj8gjNeboU = 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:content-type; s=default; bh=o7VztK9hKWKXurzzxsQgsPi6L6M=; b=Hk3b42eCK3jY32Cpq zwW8dUCLFuq1wofjDVA7E75kebUZBl0kKdtkF6IBmkVrEFyEhZ509uO3t4kBgJuX Gur3A3Z7/AsNGTGfBNJO9ojI1VA5ChCts7Ja8Qe3mKeoEh1NurS8T1x2h3WLqhTF 9qSIVrs8H7Tfl3luQTXzUVzdAA= Received: (qmail 18121 invoked by alias); 4 Aug 2013 07:11:04 -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 18081 invoked by uid 89); 4 Aug 2013 07:11:02 -0000 X-Spam-SWARE-Status: No, score=1.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_HOSTKARMA_YE, RDNS_NONE, SPF_PASS autolearn=no version=3.3.1 Received: from Unknown (HELO vms173003pub.verizon.net) (206.46.173.3) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Sun, 04 Aug 2013 07:11:02 +0000 Received: from [192.168.1.13] ([unknown] [96.244.82.207]) by vms173003.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MQZ002AOVY5CI90@vms173003.mailsrvcs.net> for gcc-patches@gcc.gnu.org; Sun, 04 Aug 2013 02:10:54 -0500 (CDT) Message-id: <51FDFE7E.9040104@verizon.net> Date: Sun, 04 Aug 2013 03:10:54 -0400 From: Ed Smith-Rowland <3dw4rd@verizon.net> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-version: 1.0 To: gcc-patches Cc: Jason Merrill Subject: [PR c++/58072][C++11] Content-type: multipart/mixed; boundary=------------020403090407040204000802 X-Virus-Found: No This was a bug concerning reporting of compiler errors involving user-defined literals. The error messages would appear with token names 'CPP_STRING_USERDEF', etc. This is very cryptic for the user. This patch just catches user-defined literal tokens in c-family/c-common.c/c_parse_error() and inserts useful phrases in the error messages. Built and tested on x86-64-linux. OK? Ed gcc/c-family: 2013-08-04 Ed Smith-Rowland <3dw4rd@verizon.net> PR c++/58072 * c-common.c (c_parse_error): Catch user-defined literal tokens and provide useful error strings. gcc/testsuite: PR c++/58072 * g++.dg/cpp0x/pr58072.C: New. Index: c-family/c-common.c =================================================================== --- c-family/c-common.c (revision 201466) +++ c-family/c-common.c (working copy) @@ -9352,6 +9352,18 @@ free (message); message = NULL; } + else if (token_type == CPP_CHAR_USERDEF + || token_type == CPP_WCHAR_USERDEF + || token_type == CPP_CHAR16_USERDEF + || token_type == CPP_CHAR32_USERDEF) + message = catenate_messages (gmsgid, + " before user-defined character literal"); + else if (token_type == CPP_STRING_USERDEF + || token_type == CPP_WSTRING_USERDEF + || token_type == CPP_STRING16_USERDEF + || token_type == CPP_STRING32_USERDEF + || token_type == CPP_UTF8STRING_USERDEF) + message = catenate_messages (gmsgid, " before user-defined string literal"); else if (token_type == CPP_STRING || token_type == CPP_WSTRING || token_type == CPP_STRING16 Index: testsuite/g++.dg/cpp0x/pr58072.C =================================================================== --- testsuite/g++.dg/cpp0x/pr58072.C (revision 0) +++ testsuite/g++.dg/cpp0x/pr58072.C (working copy) @@ -0,0 +1,18 @@ +// { dg-do compile } +// { dg-options "-std=c++11" } + +// PR c++/58072 + +extern 'c'void*blah(void*); // { dg-error "expected unqualified-id before user-defined character literal" } +extern L'c'void*Lblah(void*); // { dg-error "expected unqualified-id before user-defined character literal" } +extern u'c'void*ublah(void*); // { dg-error "expected unqualified-id before user-defined character literal" } +extern U'c'void*Ublah(void*); // { dg-error "expected unqualified-id before user-defined character literal" } + +extern "c"void*strblah(void*); // { dg-error "expected unqualified-id before user-defined string literal" } +extern L"c"void*Lstrblah(void*); // { dg-error "expected unqualified-id before user-defined string literal" } +extern u"c"void*ustrblah(void*); // { dg-error "expected unqualified-id before user-defined string literal" } +extern U"c"void*Ustrblah(void*); // { dg-error "expected unqualified-id before user-defined string literal" } +extern u8"c"void*u8strblah(void*); // { dg-error "expected unqualified-id before user-defined string literal" } + +extern 123void*ULLblah(void*); // { dg-error "expected unqualified-id before numeric constant" } +extern 123.456void*Ldblblah(void*); // { dg-error "expected unqualified-id before numeric constant" }