From patchwork Tue Oct 10 17:42:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 823949 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-463878-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="KdB74pg+"; 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 3yBPZn4HPLz9tYV for ; Wed, 11 Oct 2017 04:42:41 +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:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=BmBnw46bLobpJBeviAB2xsqPGqavWhvjEtXpPZEWhZZGNNkSeh zoWOEwJD6/IN8t7OZaX+VfL+46oI+etqDvoB4Jt+Dv8nIH/d/KZz3ix6tRnZ9we7 H2YgpN9ccKnuIhEpywG1qtPAPlSYY1bJm+b3AGThgUK0xP1MdMTBmTINY= 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:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=XaCtDJRHtWQ5a6AXks32OUgG218=; b=KdB74pg+2S2HOp9IHAXk Rh0JWD9YLIefuRH0XXxXQx5mygpFkUf8HXUKD0boBpaaxZryjfXdh1YxKjWMnXVA QsurdSiEX0oqW1uqX8xsO0O3eAjEEFXZgDXA4G49EDl+0qgMJgc/EByw4ZqzsNwO StqVPmwPJ3S0NZrWBK7LSLM= Received: (qmail 32588 invoked by alias); 10 Oct 2017 17:42:33 -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 32568 invoked by uid 89); 10 Oct 2017 17:42:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=displays, _, our X-Spam-User: qpsmtpd, 2 recipients X-HELO: cc-smtpout2.netcologne.de Received: from cc-smtpout2.netcologne.de (HELO cc-smtpout2.netcologne.de) (89.1.8.212) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 10 Oct 2017 17:42:31 +0000 Received: from cc-smtpin3.netcologne.de (cc-smtpin3.netcologne.de [89.1.8.203]) by cc-smtpout2.netcologne.de (Postfix) with ESMTP id 3693B128E5; Tue, 10 Oct 2017 19:42:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by cc-smtpin3.netcologne.de (Postfix) with ESMTP id 27FA511DBE; Tue, 10 Oct 2017 19:42:28 +0200 (CEST) Received: from [78.35.132.98] (helo=cc-smtpin3.netcologne.de) by localhost with ESMTP (eXpurgate 4.1.9) (envelope-from ) id 59dd0684-02b7-7f0000012729-7f000001b159-1 for ; Tue, 10 Oct 2017 19:42:28 +0200 Received: from [192.168.178.20] (xdsl-78-35-132-98.netcologne.de [78.35.132.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by cc-smtpin3.netcologne.de (Postfix) with ESMTPSA; Tue, 10 Oct 2017 19:42:26 +0200 (CEST) To: "fortran@gcc.gnu.org" , gcc-patches From: Thomas Koenig Subject: [patch, Fortran] Fix PR 82372 Message-ID: <8f13912c-0bf1-b570-cf72-a32b1bef2e26@netcologne.de> Date: Tue, 10 Oct 2017 19:42:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 Hello world, the attached patch displays an error for characters which are outside the normal Fortran character set, and includes a hex code when it is not printable. gfortran 4.9 did display unprintable characters in the file, so it might be argued that this bug is a regression. Regression-tested. OK for trunk? What do people feel about backporting? Regards Thomas 2017-10-10 Thomas Koenig PR fortran/82372 * fortran/scanner.c (valid_chars): String with all characters which could be valid in Fortran. (valid_table): Boolean table to select valid characters. (gfc_scanner_init_1): Set up valid_table from vaid_chars. (gfc_gooble_whitespace): If a character not in the Fortran character set appears, display error. 2017-10-10 Thomas Koenig PR fortran/82372 * gfortran.dg/illegal_char.f90: New test. Index: fortran/scanner.c =================================================================== --- fortran/scanner.c (Revision 253530) +++ fortran/scanner.c (Arbeitskopie) @@ -80,7 +80,14 @@ static struct gfc_file_change size_t file_changes_cur, file_changes_count; size_t file_changes_allocated; +char valid_chars[] = + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + "=+*-/^%[].,\n\t\r'\"();:<>_!$&0123456789"; +bool valid_table[256]; + +/* Lookup table to see which characters are valid. */ + /* Functions dealing with our wide characters (gfc_char_t) and sequences of such characters. */ @@ -261,6 +268,9 @@ gfc_wide_strncasecmp (const gfc_char_t *s1, const void gfc_scanner_init_1 (void) { + char *p; + int i; + file_head = NULL; line_head = NULL; line_tail = NULL; @@ -269,6 +279,12 @@ gfc_scanner_init_1 (void) continue_line = 0; end_flag = 0; + + for (p = valid_chars; *p; p++) + { + i = *p; + valid_table[i] = true; + } } @@ -1680,6 +1696,8 @@ gfc_gobble_whitespace (void) static int linenum = 0; locus old_loc; gfc_char_t c; + static gfc_char_t dummy; + static gfc_char_t *last_error_char = &dummy; do { @@ -1700,6 +1718,20 @@ gfc_gobble_whitespace (void) } while (gfc_is_whitespace (c)); + if ((c > 256 || !valid_table[c]) + && last_error_char != gfc_current_locus.nextc) + { + if (ISPRINT (c)) + gfc_error_now ("Invalid character '%c' at %C", c); + else + { + char buf[20]; + snprintf (buf, 20, "%2.2X", c); + gfc_error_now ("Invalid character 0x%s at %C", buf); + } + last_error_char = gfc_current_locus.nextc; + } + gfc_current_locus = old_loc; } Index: testsuite/gfortran.dg/goacc/parallel-kernels-clauses.f95 =================================================================== --- testsuite/gfortran.dg/goacc/parallel-kernels-clauses.f95 (Revision 253530) +++ testsuite/gfortran.dg/goacc/parallel-kernels-clauses.f95 (Arbeitskopie) @@ -37,11 +37,11 @@ program test !$acc kernels async() { dg-error "Invalid character" } !$acc parallel async() { dg-error "Invalid character" } - !$acc kernels async("a") { dg-error "Unclassifiable" } - !$acc parallel async("a") { dg-error "Unclassifiable" } + !$acc kernels async("a") ! { dg-error "Unclassifiable" } + !$acc parallel async("a") ! { dg-error "Unclassifiable" } - !$acc kernels async(.true.) { dg-error "Unclassifiable" } - !$acc parallel async(.true.) { dg-error "Unclassifiable" } + !$acc kernels async(.true.) ! { dg-error "Unclassifiable" } + !$acc parallel async(.true.) ! { dg-error "Unclassifiable" } ! default(none) !$acc kernels default(none) @@ -59,8 +59,8 @@ program test !$acc parallel default ( none ) !$acc end parallel - !$acc kernels default { dg-error "Unclassifiable" } - !$acc parallel default { dg-error "Unclassifiable" } + !$acc kernels default ! { dg-error "Unclassifiable" } + !$acc parallel default ! { dg-error "Unclassifiable" } !$acc kernels default() { dg-error "Unclassifiable" } !$acc parallel default() { dg-error "Unclassifiable" } Index: testsuite/gfortran.dg/typebound_proc_4.f03 =================================================================== --- testsuite/gfortran.dg/typebound_proc_4.f03 (Revision 253530) +++ testsuite/gfortran.dg/typebound_proc_4.f03 (Arbeitskopie) @@ -14,7 +14,7 @@ MODULE testmod PROCEDURE p1 => proc1 ! { dg-error "::" } PROCEDURE :: ! { dg-error "Expected binding name" } PROCEDURE ! { dg-error "Expected binding name" } - PROCEDURE ? ! { dg-error "Expected binding name" } + PROCEDURE ? ! { dg-error "Expected binding name|Invalid character" } PROCEDURE :: p2 => ! { dg-error "Expected binding target" } PROCEDURE :: p3 =>, ! { dg-error "Expected binding target" } PROCEDURE p4, ! { dg-error "Expected binding name" }