From 2558db6f93b7b5bf8c64dd83f77a18137538fc12 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet <charlet@gcc.gnu.org> Date: Mon, 30 Nov 2009 14:33:46 +0100 Subject: [PATCH] [multiple changes] 2009-11-30 Vincent Celier <celier@adacore.com> * osint.adb (Executable_Name): Test the name instead of the name buffer to check if there is a dot in the given name. 2009-11-30 Sergey Rybin <rybin@adacore.com> * gnat_ugn.texi: Update gnatcheck doc. From-SVN: r154796 --- gcc/ada/ChangeLog | 9 +++++++++ gcc/ada/gnat_ugn.texi | 5 ++--- gcc/ada/osint.adb | 8 ++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 9d9ddb8a214..6aa41d98aef 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2009-11-30 Vincent Celier <celier@adacore.com> + + * osint.adb (Executable_Name): Test the name instead of the name buffer + to check if there is a dot in the given name. + +2009-11-30 Sergey Rybin <rybin@adacore.com> + + * gnat_ugn.texi: Update gnatcheck doc. + 2009-11-30 Robert Dewar <dewar@adacore.com> * sem_ch3.adb, sem_disp.adb, usage.adb: Minor reformatting diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index c8b83101a9c..4f218579dc9 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -20874,14 +20874,13 @@ lines and end-of-line comments). There can be several rule options on a single line (separated by a space). A coding standard file may reference other coding standard files by including -other @option{-from=@var{rule_option_filename}} +more @option{-from=@var{rule_option_filename}} options, each such option being replaced with the content of the corresponding coding standard file during processing. In case a cycle is detected (that is, @file{@var{rule_file_1}} reads rule options from @file{@var{rule_file_2}}, and @file{@var{rule_file_2}} reads (directly or indirectly) rule options from @file{@var{rule_file_1}}), -the processing of coding standard files is interrupted and a part of their -content is ignored. +processing fails with an error message. @node Adding the Results of Compiler Checks to gnatcheck Output diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb index 1fcff593c25..fd4210744b2 100644 --- a/gcc/ada/osint.adb +++ b/gcc/ada/osint.adb @@ -893,13 +893,13 @@ package body Osint is Add_Suffix := True; if Only_If_No_Suffix then - for J in reverse 1 .. Name_Len loop - if Name_Buffer (J) = '.' then + for J in reverse Canonical_Name'Range loop + if Canonical_Name (J) = '.' then Add_Suffix := False; exit; - elsif Name_Buffer (J) = '/' or else - Name_Buffer (J) = Directory_Separator + elsif Canonical_Name (J) = '/' or else + Canonical_Name (J) = Directory_Separator then exit; end if;