From patchwork Wed Oct 12 16:39:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Vehreschild X-Patchwork-Id: 681362 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3svKMn6fy4z9s9Y for ; Thu, 13 Oct 2016 03:39:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Ecvhw7xi; dkim-atps=neutral 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:subject:message-id:mime-version:content-type; q=dns; s= default; b=ohZuonMCm9kneDq+LzrtQCogU3fZu8EVgfI/56oHqb/jq20O83NT7 Oh3X10P0iLwM6STPhsSKqnZjS9Xa3k6MyO8vwmEAUFaIg4tyomYXnRcmcSV5zri5 X1oWoMm7MPpcIwrsfCQFi7cKXpvDRr7dSNTkWAtrDdNor9BjnSdhAo= 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:subject:message-id:mime-version:content-type; s= default; bh=+DifjT2VpktniQ5hIUqyQR/hjXk=; b=Ecvhw7xiwFgjk6f2bCT3 fYFF+/tQETT0pKlHSvKmkxm8qTAF8ysLauS8mdoObbw4ilvLT7jkgJm7DXqOofbt fVeeJqcKW5Wwuv4SLK+dGijYT7KaueYoyUxMb/Vgidu8W0pgrgeg/MCMD1UXgv60 nbzvHvcSL64T9GB8M7Ppdok= Received: (qmail 39683 invoked by alias); 12 Oct 2016 16:39: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 39659 invoked by uid 89); 12 Oct 2016 16:39:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 spammy=1, 11, Cover, vehregccgnuorg, vehre@gcc.gnu.org X-Spam-User: qpsmtpd, 2 recipients X-HELO: mout.gmx.net Received: from mout.gmx.net (HELO mout.gmx.net) (212.227.17.22) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 12 Oct 2016 16:39:29 +0000 Received: from vepi2 ([84.63.206.51]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0MLA45-1budXo3s13-000KT4; Wed, 12 Oct 2016 18:39:26 +0200 Date: Wed, 12 Oct 2016 18:39:25 +0200 From: Andre Vehreschild To: GCC-Patches-ML , GCC-Fortran-ML Subject: [Fortran, Patch, cosmetics] Fix some indentation and typos in comments. Message-ID: <20161012183925.557255eb@vepi2> MIME-Version: 1.0 X-UI-Out-Filterresults: notjunk:1; V01:K0:cBwp5uIT0YU=:KiOGrmJF9y2cOg3yoL4zYJ X/qGwyr5JjJpFHCFA+Bsj3jh52Cxy9F42d2qPt2sg2f0g1CcR/Hq85NIW7r2GQ6kICSf0ijXa SL7A5hYVeKRunAMFp25TnPto2OUUqESz2xeXXo3M4poBZZdlarx66jkTPR1uQLHuuUltm6uuT dgCsveupOBXHKusXHkcJWZDfMGBEzjhkCLNSqA99CcU/55VV2+CkxzN4isY6HZgnnsMtRju+n qNqOpjTpY3pXHrh/9DzUlwSRofdUlGCRG2HTvEeOQn4ZWq1c/jOgIfuE+e5lIMDr1w6wKc1Rh xetyTwG4uoXzOl0rKXk5bL6pGDhvZkHjqrEh0vUxa2SF8voREDSMS8TfzVoftJdGi/eTH4Os3 oVxR80dXpWfHksMR/U8XIbawBZU4JLN4kMjl+FJ8OpRbKMjKyCvfqzoVyFZbJ/4HCTMqKVOLJ q+BTIDjOIAzvr0IzKZI083GomlWofwghJ5VireKNx/ADI8Z3se8jEflzDmrIXHPcFfO4EbAH+ 2vOaUr5w6rVqCqdGHWxjqIoebWv24giWBH9z6mFyr4PFvfkYtiOzNcoGks/gUgxEBGcdzD6lX PsIqwP7Zdx24HImbKU19eHT6dQg3BUSbJv7Vqq/CmBalCO06KsfATDzAuvTosJPqzEmQXOWRy k7bx6hx6FRdnIMxUPvcMcLWSPS5X0N9s2SEjvWZEyOVn2EX9jQ9oRK/H360V00AkHwxas0boX SYNMMrKBLUkoTvx/dCCi56kaE3YlvNzm8HFlssILHwxu90MJYaP9R8wR+Qw= Hi all, I have committed attached patch as obvious as r241071, because it just corrects some indentation issues and a typo in a comment. Bootstrapped and regtested ok on x86_64-linux/f23. Regards, Andre Index: gcc/fortran/ChangeLog =================================================================== --- gcc/fortran/ChangeLog (Revision 241033) +++ gcc/fortran/ChangeLog (Arbeitskopie) @@ -1,3 +1,11 @@ +2016-10-12 Andre Vehreschild + + * trans-expr.c (gfc_find_and_cut_at_last_class_ref): Fixed style. + (gfc_trans_class_init_assign): Same. + (gfc_conv_procedure_call): Same. + (gfc_trans_assignment_1): Same. + * trans-stmt.c (gfc_trans_allocate): Same. + 2016-10-11 Jakub Jelinek * iresolve.c (is_trig_resolved, resolve_trig_call): Formatting fixes. Index: gcc/fortran/trans-expr.c =================================================================== --- gcc/fortran/trans-expr.c (Revision 241033) +++ gcc/fortran/trans-expr.c (Arbeitskopie) @@ -357,8 +357,7 @@ array_ref = NULL; for (ref = e->ref; ref; ref = ref->next) { - if (ref->type == REF_ARRAY - && ref->u.ar.type != AR_ELEMENT) + if (ref->type == REF_ARRAY && ref->u.ar.type != AR_ELEMENT) array_ref = ref; if (ref->type == REF_COMPONENT @@ -367,11 +366,10 @@ /* Component to the right of a part reference with nonzero rank must not have the ALLOCATABLE attribute. If attempts are made to reference such a component reference, an error results - followed by anICE. */ - if (array_ref - && CLASS_DATA (ref->u.c.component)->attr.allocatable) + followed by an ICE. */ + if (array_ref && CLASS_DATA (ref->u.c.component)->attr.allocatable) return NULL; - class_ref = ref; + class_ref = ref; } if (ref->next == NULL) @@ -1428,7 +1426,7 @@ rhs->rank = 0; if (code->expr1->ts.type == BT_CLASS - && CLASS_DATA (code->expr1)->attr.dimension) + && CLASS_DATA (code->expr1)->attr.dimension) tmp = gfc_trans_class_array_init_assign (rhs, lhs, code->expr1); else { @@ -5880,7 +5878,7 @@ if (comp) ts = comp->ts; else - ts = sym->ts; + ts = sym->ts; if (ts.type == BT_CHARACTER && sym->attr.is_bind_c) se->string_length = build_int_cst (gfc_charlen_type_node, 1); @@ -9549,9 +9547,9 @@ nullification occurs before the call to the finalizer. In the case of a scalar to array assignment, this is done in gfc_trans_scalar_assign as part of the deep copy. */ - if (!scalar_to_array && (expr1->ts.type == BT_DERIVED) - && (gfc_is_alloc_class_array_function (expr2) - || gfc_is_alloc_class_scalar_function (expr2))) + if (!scalar_to_array && expr1->ts.type == BT_DERIVED + && (gfc_is_alloc_class_array_function (expr2) + || gfc_is_alloc_class_scalar_function (expr2))) { tmp = rse.expr; tmp = gfc_nullify_alloc_comp (expr1->ts.u.derived, rse.expr, 0); Index: gcc/fortran/trans-stmt.c =================================================================== --- gcc/fortran/trans-stmt.c (Revision 241033) +++ gcc/fortran/trans-stmt.c (Arbeitskopie) @@ -5928,7 +5928,7 @@ al_len_needs_set = false; } else if (expr->ts.type == BT_CHARACTER && al_len != NULL_TREE - && code->ext.alloc.ts.u.cl->length) + && code->ext.alloc.ts.u.cl->length) { /* Cover the cases where a string length is explicitly specified by a type spec for deferred length character @@ -6015,7 +6015,7 @@ expr3_len = NULL_TREE; } else if (code->ext.alloc.ts.type == BT_CHARACTER - && code->ext.alloc.ts.u.cl->length) + && code->ext.alloc.ts.u.cl->length) { /* Cover the cases where a string length is explicitly specified by a type spec for deferred length character