diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-07-31 14:58:59 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-07-31 14:58:59 +0200 |
| commit | 67b6938303c8792b10c00bec43987075c2066bf0 (patch) | |
| tree | adf775ba03e566fbb186b5760e23d3d242152469 /gcc | |
| parent | c1b37eda370a020e8ae8c5315b9b5a0e5347c0e1 (diff) | |
| download | gcc-67b6938303c8792b10c00bec43987075c2066bf0.zip gcc-67b6938303c8792b10c00bec43987075c2066bf0.tar.gz gcc-67b6938303c8792b10c00bec43987075c2066bf0.tar.bz2 | |
Minor reformatting.
From-SVN: r213357
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/exp_ch9.adb | 13 | ||||
| -rw-r--r-- | gcc/ada/g-exptty.adb | 16 |
2 files changed, 15 insertions, 14 deletions
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb index cbd522e..48044db 100644 --- a/gcc/ada/exp_ch9.adb +++ b/gcc/ada/exp_ch9.adb @@ -8914,15 +8914,14 @@ package body Exp_Ch9 is -- Discriminated_Size -- ------------------------ - function Discriminated_Size (Comp : Entity_Id) return Boolean - is + function Discriminated_Size (Comp : Entity_Id) return Boolean is Typ : constant Entity_Id := Etype (Comp); Index : Node_Id; function Non_Static_Bound (Bound : Node_Id) return Boolean; - -- Check whether the bound of an index is non-static and does - -- denote a discriminant, in which case any protected object of - -- the type will have a non-static size. + -- Check whether the bound of an index is non-static and does denote + -- a discriminant, in which case any protected object of the type + -- will have a non-static size. ---------------------- -- Non_Static_Bound -- @@ -8934,7 +8933,7 @@ package body Exp_Ch9 is return False; elsif Is_Entity_Name (Bound) - and then Present (Discriminal_Link (Entity (Bound))) + and then Present (Discriminal_Link (Entity (Bound))) then return False; @@ -8943,6 +8942,8 @@ package body Exp_Ch9 is end if; end Non_Static_Bound; + -- Start of processing for Discriminated_Size + begin if not Is_Array_Type (Typ) then return False; diff --git a/gcc/ada/g-exptty.adb b/gcc/ada/g-exptty.adb index 3e78193..8b7fd6e 100644 --- a/gcc/ada/g-exptty.adb +++ b/gcc/ada/g-exptty.adb @@ -66,14 +66,14 @@ package body GNAT.Expect.TTY is Status := -1; else - -- Send a Ctrl-C to the process first. This way, if the - -- launched process is a "sh" or "cmd", the child processes - -- will get terminated as well. Otherwise, terminating the - -- main process brutally will leave the children running. - -- - -- Note: special characters are sent to the terminal to generate - -- the signal, so this needs to be done while the file descriptors - -- are still open. + -- Send a Ctrl-C to the process first. This way, if the launched + -- process is a "sh" or "cmd", the child processes will get + -- terminated as well. Otherwise, terminating the main process + -- brutally will leave the children running. + + -- Note: special characters are sent to the terminal to generate the + -- signal, so this needs to be done while the file descriptors are + -- still open (it used to be after the closes and that was wrong). Interrupt (Descriptor); delay (0.05); |