From patchwork Thu Jan 11 09:03:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 858937 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-470783-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="MNYhN+SI"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zHKgD2vTrz9t3F for ; Thu, 11 Jan 2018 20:03:52 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=kiXuKtILD2kxj0/q03XrUn0z3YEr98j0zAS9i2pBermAfuWZE/ 3bRaS1sRxoI7kRl+/tB8ghb1+AanaNzHB+I39k6fis/SaN9of25CwZpvopByyPfZ oUtMh/OMLeU/86jImh9PfShrokcWEztRlgPuy/XugBHJkSh6C+ePNxZDU= 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:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=Dz5Wa5yL+9c/QBMvD/wt+/gjOJo=; b=MNYhN+SIaRayKXyICwoz xI1bJMREUVFVvbi+DZUfRNbpEm56V9Afg3Njj+39WDUukDln4r0jz+AzS3XfABVL DgbhoHhdnvdva8+SzeKc4oDeOeA0yHKo9P27g2wfOfUBV3C/vQpMosImKUVNB5A6 33d0csTHX8QcVnY1g+/chEI= Received: (qmail 92668 invoked by alias); 11 Jan 2018 09:03:40 -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 92531 invoked by uid 89); 11 Jan 2018 09:03:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Present, Increasing, justin, Justin X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 11 Jan 2018 09:03:38 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id EE9F7117BC0; Thu, 11 Jan 2018 04:03:36 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 44Quk8xYWKcj; Thu, 11 Jan 2018 04:03:36 -0500 (EST) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id DE22B117BBE; Thu, 11 Jan 2018 04:03:36 -0500 (EST) Received: by tron.gnat.com (Postfix, from userid 4862) id DCD6450B; Thu, 11 Jan 2018 04:03:36 -0500 (EST) Date: Thu, 11 Jan 2018 04:03:36 -0500 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Justin Squirek Subject: [Ada] Wrong column in sloc of "expect name" error for loop variant Message-ID: <20180111090336.GA102843@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes This patch corrects error messages printed when using the pragma Loop_Variant without a named argument from having an incorrect column number in some cases. Tested on x86_64-pc-linux-gnu, committed on trunk 2018-01-11 Justin Squirek gcc/ada/ * sem_prag.adb (Analyze_Pragma:Pragma_Loop_Variant): Modify error message to be printed on the pragma argument identifier. gcc/testsuite/ * gnat.dg/loopvar.adb: New testcase. --- gcc/ada/sem_prag.adb +++ gcc/ada/sem_prag.adb @@ -18297,7 +18297,7 @@ package body Sem_Prag is Variant := First (Pragma_Argument_Associations (N)); while Present (Variant) loop if Chars (Variant) = No_Name then - Error_Pragma_Arg ("expect name `Increases`", Variant); + Error_Pragma_Arg_Ident ("expect name `Increases`", Variant); elsif not Nam_In (Chars (Variant), Name_Decreases, Name_Increases)--- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/loopvar.adb @@ -0,0 +1,15 @@ +-- { dg-do compile } + +procedure Loopvar (S : String) is + J : Integer := S'First; +begin + while J < S'Last loop + pragma Loop_Variant (J); -- { dg-error "expect name \"Increases\"" } + pragma Loop_Variant (Increasing => J); -- { dg-error "expect name \"Increases\"" } + pragma Loop_Variant (J + 1); -- { dg-error "expect name \"Increases\"" } + pragma Loop_Variant (incr => -J + 1); -- { dg-error "expect name \"Increases\"" } + pragma Loop_Variant (decr => -J + 1); -- { dg-error "expect name \"Decreases\"" } + pragma Loop_Variant (foof => -J + 1); -- { dg-error "expect name \"Increases\" or \"Decreases\"" } + J := J + 2; + end loop; +end Loopvar;