From patchwork Mon Nov 21 10:13:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 60907 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3B0EA382FC99 for ; Mon, 21 Nov 2022 10:14:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B0EA382FC99 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669025650; bh=HrB/ot1nyuSVbnrGFFotJlhPEnPAd5RDwidXDFD+qJM=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=QIBCz0YnnQ5f3OYo3JjH2zfCugQRqjOjAQEKP3MTrtIGLxhyvHJbCr2o0pf2RNlpi M2UnxVTNu08FIua7jhIvzQbBFmnE1C5wdjNINPE/xIcGrbrDZV680Q2/jfiASWvwv/ 0PFCLdiNUqQPWTTex7m0sZeC9wcPmVqr49ddTDh8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id 1EA33384F4A6 for ; Mon, 21 Nov 2022 10:13:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1EA33384F4A6 Received: by mail-wm1-x335.google.com with SMTP id j5-20020a05600c410500b003cfa9c0ea76so8635416wmi.3 for ; Mon, 21 Nov 2022 02:13:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HrB/ot1nyuSVbnrGFFotJlhPEnPAd5RDwidXDFD+qJM=; b=by/R0uQjKDnSpAS1LjoK6VE6Iyn9DPM83SgBXLFHnvlgbsiQkrcR5Frlls5UVaetTX EHDs64KcG15bAB9jFlaJ+8wFkxh0wex0JmDvNPOZkEg1HUTRqVQ0i4co/E1/hXlgolwn SBQw23BrDt0HkaCRYTVBV8gAZNF0Ch+opFYWxTUZvGyfYCNj3hbFyQocwTJWXOm46CH/ 6skWxdKZVY4kSsiaIFSQM/Fl6ahpPreNqSLI2HEJ8wJs5rpMthcIXCh3rblqfl8Or4ff h/RIuaIN/R9dRKrjFZ9PHIutlB1TJrOSoN1zruFFQM7uW8sxpgfI3QU54axBPJdeztDu RibA== X-Gm-Message-State: ANoB5pnJ6tTDwbZc+wHxxvejFf5nHJxUDwPmdlsQpnhV8Yz3VtGFOuer ZRgcQAmFpWHzYOGKGgig4h4T+9e4sq1huA== X-Google-Smtp-Source: AA0mqf5bCCYi7sKy1DHj/0D8kvN9Q9DBnqVzjmq8OLXghWc5r0sOp6IRJ9eRtCsNAWaOrz9mS6whWg== X-Received: by 2002:a05:600c:430c:b0:3cf:8ed7:7124 with SMTP id p12-20020a05600c430c00b003cf8ed77124mr14818170wme.140.1669025620793; Mon, 21 Nov 2022 02:13:40 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id p12-20020adff20c000000b00241b5af8697sm10792563wro.85.2022.11.21.02.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Nov 2022 02:13:40 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Ronan Desplanques Subject: [COMMITTED] ada: Fix gnatmake's parsing of adc files Date: Mon, 21 Nov 2022 11:13:38 +0100 Message-Id: <20221121101338.259014-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Ronan Desplanques Before this patch, gnatmake's parser for adc files failed to ignore semicolons located inside comments. This patch fixes that behavior. gcc/ada/ * sfn_scan.adb (Scan_SFN_Pragmas): Improve handling of comments. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sfn_scan.adb | 1 + 1 file changed, 1 insertion(+) diff --git a/gcc/ada/sfn_scan.adb b/gcc/ada/sfn_scan.adb index b428ed7f0cf..8ee9a0968f3 100644 --- a/gcc/ada/sfn_scan.adb +++ b/gcc/ada/sfn_scan.adb @@ -583,6 +583,7 @@ package body SFN_Scan is else Skip_Loop : loop + Skip_WS; exit Main_Scan_Loop when At_EOF; exit Skip_Loop when S (P) = ';';