aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2010-10-26 14:30:25 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2010-10-26 14:30:25 +0200
commitf7950055b6cb29d22fe2d7c7d7d0fe359a2e474b (patch)
tree880e452ba4fc9d9927e8b3a5134e2eaa012ff953
parent1c1289e7fb2fe9b3b3912c7effa1ce46c66160ad (diff)
downloadgcc-f7950055b6cb29d22fe2d7c7d7d0fe359a2e474b.zip
gcc-f7950055b6cb29d22fe2d7c7d7d0fe359a2e474b.tar.gz
gcc-f7950055b6cb29d22fe2d7c7d7d0fe359a2e474b.tar.bz2
[multiple changes]
2010-10-26 Bob Duff <duff@adacore.com> * namet.adb (Finalize): More cleanup of statistics printouts. 2010-10-26 Robert Dewar <dewar@adacore.com> * ceinfo.adb: Minor reformatting. From-SVN: r165949
-rw-r--r--gcc/ada/ChangeLog8
-rw-r--r--gcc/ada/ceinfo.adb4
-rw-r--r--gcc/ada/namet.adb21
3 files changed, 22 insertions, 11 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 3d1b464..9366be1 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-26 Bob Duff <duff@adacore.com>
+
+ * namet.adb (Finalize): More cleanup of statistics printouts.
+
+2010-10-26 Robert Dewar <dewar@adacore.com>
+
+ * ceinfo.adb: Minor reformatting.
+
2010-10-26 Javier Miranda <miranda@adacore.com>
* sem_ch6.adb (Check_Overriding_Indicator, New_Overloaded_Entity): When
diff --git a/gcc/ada/ceinfo.adb b/gcc/ada/ceinfo.adb
index 47f134a..44e7c67 100644
--- a/gcc/ada/ceinfo.adb
+++ b/gcc/ada/ceinfo.adb
@@ -133,6 +133,7 @@ begin
Put_Line
("*** unknown field name " & Fieldnm & " at line " & Lineno);
end if;
+
raise Err;
end if;
end if;
@@ -161,7 +162,8 @@ begin
Put_Line
("*** unknown field name " & Fieldnm & " at line " & Lineno);
end if;
- raise Err;
+
+ raise Err;
end if;
end loop;
diff --git a/gcc/ada/namet.adb b/gcc/ada/namet.adb
index fc8b4e2..69f7afe 100644
--- a/gcc/ada/namet.adb
+++ b/gcc/ada/namet.adb
@@ -142,6 +142,8 @@ package body Namet is
-- 2 => in addition print number of entries per hash chain
-- 3 => in addition print content of entries
+ Zero : constant Int := Character'Pos ('0');
+
begin
if not Debug_Flag_H then
return;
@@ -192,12 +194,11 @@ package body Namet is
F (F'Last) := F (F'Last) + 1;
end if;
- N := Hash_Table (J);
+ if Verbosity >= 3 then
+ N := Hash_Table (J);
+ while N /= No_Name loop
+ S := Name_Entries.Table (N).Name_Chars_Index;
- while N /= No_Name loop
- S := Name_Entries.Table (N).Name_Chars_Index;
-
- if Verbosity >= 3 then
Write_Str (" ");
for J in 1 .. Name_Entries.Table (N).Name_Len loop
@@ -205,10 +206,10 @@ package body Namet is
end loop;
Write_Eol;
- end if;
- N := Name_Entries.Table (N).Hash_Link;
- end loop;
+ N := Name_Entries.Table (N).Hash_Link;
+ end loop;
+ end if;
end;
end if;
end loop;
@@ -244,8 +245,8 @@ package body Namet is
Write_Int (Probes / 200);
Write_Char ('.');
Probes := (Probes mod 200) / 2;
- Write_Char (Character'Val (48 + Probes / 10));
- Write_Char (Character'Val (48 + Probes mod 10));
+ Write_Char (Character'Val (Zero + Probes / 10));
+ Write_Char (Character'Val (Zero + Probes mod 10));
Write_Eol;
Write_Str ("Max_Chain_Length = ");