From patchwork Wed Jan 10 23:13:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 858632 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-470758-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="JSUMWMht"; 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 3zH4cM5VmJz9s7c for ; Thu, 11 Jan 2018 10:15:30 +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:from :to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=IbN3IBOskY6t/yW7 2XV7VfIu5XDJBBqq+U7SPdAqDHYwEboBoJR15TxnHpBB4ZHfLzdRaqvKrqkoL87b jC86SJuPed/GkIFyxhMag1gmuauEpJ8YhY7num7elc30aRVPSjPYWYElgLV5i0kB 1V10Za849yLFzKzyDWc1cC9ryjk= 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:from :to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=default; bh=7K9lidbzwWufHonBpyqmf8 0+bUA=; b=JSUMWMhtas5MkevmwbJ8S8zizqvI8E1rxFTyocsq9eBtDHfVHSMRFb F/CRZGSHYygmwgElMaB8X81wTwIfbNvUmLnlDi2FZvbzlRaQeMHq9X5TuZkifcGw eFOvOyIy7yPth+Z/VGFFtqrI/Qhv+EWhirI/IkalqAGADra9Tvv7A= Received: (qmail 103767 invoked by alias); 10 Jan 2018 23:15:08 -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 103736 invoked by uid 89); 10 Jan 2018 23:15:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.0 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= X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 10 Jan 2018 23:15:04 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id E60A1822AA for ; Thu, 11 Jan 2018 00:15:01 +0100 (CET) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CcKLtl4c29oC for ; Thu, 11 Jan 2018 00:15:01 +0100 (CET) Received: from polaris.localnet (bon31-6-88-161-99-133.fbx.proxad.net [88.161.99.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id C253D82284 for ; Thu, 11 Jan 2018 00:15:01 +0100 (CET) From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: Fix couple of -fdump-ada-spec issues on preprocessor macros Date: Thu, 11 Jan 2018 00:13:14 +0100 Message-ID: <2067079.3P1WMtWg9q@polaris> MIME-Version: 1.0 The -fdump-ada-spec currently generates invalid Ada for preprocessor macros containing floating-point constants and string concatenations. Tested on x86-64/Linux, applied on the mainline. 2018-01-10 Eric Botcazou c-family/ * c-ada-spec.c (dump_number): Add FLOAT_P parameter. Skip 'f' and 'F' characters if it is true. (store_ada_macro): Minor tweak. (dump_ada_macros) : Likewise. : Likewise. : Output '&' in the buffer if not the first string. : Adjust calls to dump_number. Index: c-ada-spec.c =================================================================== --- c-ada-spec.c (revision 256275) +++ c-ada-spec.c (working copy) @@ -113,14 +113,15 @@ macro_length (const cpp_macro *macro, in } /* Dump all digits/hex chars from NUMBER to BUFFER and return a pointer - to the character after the last character written. */ + to the character after the last character written. If FLOAT_P is true, + this is a floating-point number. */ static unsigned char * -dump_number (unsigned char *number, unsigned char *buffer) +dump_number (unsigned char *number, unsigned char *buffer, bool float_p) { while (*number != '\0' - && *number != 'U' - && *number != 'u' + && *number != (float_p ? 'F' : 'U') + && *number != (float_p ? 'f' : 'u') && *number != 'l' && *number != 'L') *buffer++ = *number++; @@ -192,7 +193,8 @@ store_ada_macro (cpp_reader *pfile ATTRI { const cpp_macro *macro = node->value.macro; - if (node->type == NT_MACRO && !(node->flags & NODE_BUILTIN) + if (node->type == NT_MACRO + && !(node->flags & NODE_BUILTIN) && macro->count && *NODE_NAME (node) != '_' && LOCATION_FILE (macro->line) == macro_source_file) @@ -345,7 +347,8 @@ dump_ada_macros (pretty_printer *pp, con is_one = prev_is_one; break; - case CPP_COMMENT: break; + case CPP_COMMENT: + break; case CPP_WSTRING: case CPP_STRING16: @@ -359,11 +362,18 @@ dump_ada_macros (pretty_printer *pp, con if (!macro->fun_like) supported = 0; else - buffer = cpp_spell_token (parse_in, token, buffer, false); + buffer + = cpp_spell_token (parse_in, token, buffer, false); break; case CPP_STRING: - is_string = 1; + if (is_string) + { + *buffer++ = '&'; + *buffer++ = ' '; + } + else + is_string = 1; { const unsigned char *s = token->val.str.text; @@ -428,7 +438,7 @@ dump_ada_macros (pretty_printer *pp, con *buffer++ = '1'; *buffer++ = '6'; *buffer++ = '#'; - buffer = dump_number (tmp + 2, buffer); + buffer = dump_number (tmp + 2, buffer, false); *buffer++ = '#'; break; @@ -436,19 +446,20 @@ dump_ada_macros (pretty_printer *pp, con case 'B': *buffer++ = '2'; *buffer++ = '#'; - buffer = dump_number (tmp + 2, buffer); + buffer = dump_number (tmp + 2, buffer, false); *buffer++ = '#'; break; default: - /* Dump floating constants unmodified. */ + /* Dump floating-point constant unmodified. */ if (strchr ((const char *)tmp, '.')) - buffer = dump_number (tmp, buffer); + buffer = dump_number (tmp, buffer, true); else { *buffer++ = '8'; *buffer++ = '#'; - buffer = dump_number (tmp + 1, buffer); + buffer + = dump_number (tmp + 1, buffer, false); *buffer++ = '#'; } break; @@ -456,19 +467,23 @@ dump_ada_macros (pretty_printer *pp, con break; case '1': - if (tmp[1] == '\0' || tmp[1] == 'l' || tmp[1] == 'u' - || tmp[1] == 'L' || tmp[1] == 'U') + if (tmp[1] == '\0' + || tmp[1] == 'u' + || tmp[1] == 'U' + || tmp[1] == 'l' + || tmp[1] == 'L') { is_one = 1; char_one = buffer; *buffer++ = '1'; + break; } - else - buffer = dump_number (tmp, buffer); - break; + /* fallthrough */ default: - buffer = dump_number (tmp, buffer); + buffer + = dump_number (tmp, buffer, + strchr ((const char *)tmp, '.')); break; } break;