From patchwork Tue Jan 10 06:47:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 135150 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]) by ozlabs.org (Postfix) with SMTP id 31BFBB6EEC for ; Tue, 10 Jan 2012 17:47:57 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1326782878; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=HRzNzD6 VsbvjdP5+ZhhVLpux+qA=; b=ocM9fZAS4EszNjrF5ONQ5TqyUPDRsg7LdKOMIiz bE+QJfRzSO1t9WKGP9XoGO5sprX3uObg+gGhoQ4ZlmjcjBz4NQ2zWaBPlmAfD5/B Es0PUeCMWHic8qK/zv7b/F9aygXIlrpTGu1AvLYDkJbM3yCkt/HWzKfiSjFTg1XA FHHE= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=QPMziCQCRjZUF2MMaTxXXY03t5LEVCsKsQXfCUJNm18NqdYN+ng/wwohe/+Wu3 vENoSD9tstREksO23b9otvpy4CEhUic9Lacv0ax1kkjwGNAecMT7EcH508mgZsNN I2ZHxbaZO/pR5qbcl5qfl+X9mbSB3nXSQyQi3JaHJzcew=; Received: (qmail 2547 invoked by alias); 10 Jan 2012 06:47:49 -0000 Received: (qmail 2528 invoked by uid 22791); 10 Jan 2012 06:47:48 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SARE_SUB_RAND_LETTRS4, TW_BG X-Spam-Check-By: sourceware.org Received: from mx01.qsc.de (HELO mx01.qsc.de) (213.148.129.14) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 10 Jan 2012 06:47:34 +0000 Received: from [192.168.178.22] (port-92-204-59-150.dynamic.qsc.de [92.204.59.150]) by mx01.qsc.de (Postfix) with ESMTP id 8B41A3CD7B; Tue, 10 Jan 2012 07:47:32 +0100 (CET) Message-ID: <4F0BDF03.3050509@net-b.de> Date: Tue, 10 Jan 2012 07:47:31 +0100 From: Tobias Burnus User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20111220 Thunderbird/9.0 MIME-Version: 1.0 To: gcc patches , gfortran Subject: [Patch, Fortran] Minor wording changed for gfc_error and polym. (intr.) assignment 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 Hi all, that's a follow up to my review comment for http://gcc.gnu.org/ml/fortran/2012-01/msg00077.html As stated, I think "in intrinsic assignment" makes the error message clearer and correcter. Build and regtested on x86-64-linux. OK for the trunk? Tobias PS: Other pending patches: * http://gcc.gnu.org/ml/fortran/2012-01/msg00080.html - libgfortran SIG* update * http://gcc.gnu.org/ml/fortran/2012-01/msg00059.html - allocate(character(len=...) ...) check 2012-01-09 Tobias Burnus * resolve.c (resolve_ordinary_assign): Improve error wording. 2012-01-09 Tobias Burnus * gfortran.dg/class_39.f03: Update dg-error string. Index: gcc/fortran/resolve.c =================================================================== --- gcc/fortran/resolve.c (Revision 183034) +++ gcc/fortran/resolve.c (Arbeitskopie) @@ -9208,8 +9223,8 @@ resolve_ordinary_assign (gfc_code *code, gfc_names and coindexed; cf. F2008, 7.2.1.2 and PR 43366. */ if (lhs->ts.type == BT_CLASS) { - gfc_error ("Variable must not be polymorphic in assignment at %L " - "- check that there is a matching specific subroutine " + gfc_error ("Variable must not be polymorphic in intrinsic assignment at " + "%L - check that there is a matching specific subroutine " "for '=' operator", &lhs->where); return false; } Index: gcc/testsuite/gfortran.dg/class_39.f03 =================================================================== --- gcc/testsuite/gfortran.dg/class_39.f03 (Revision 183034) +++ gcc/testsuite/gfortran.dg/class_39.f03 (Arbeitskopie) @@ -8,6 +8,6 @@ end type T contains class(T) function add() ! { dg-error "must be dummy, allocatable or pointer" } - add = 1 ! { dg-error "Variable must not be polymorphic in assignment" } + add = 1 ! { dg-error "Variable must not be polymorphic in intrinsic assignment" } end function end