par-ch3.adb (P_Type_Declaration): Properly handle missing type keyword

2008-08-01  Robert Dewar  <dewar@adacore.com>

	* par-ch3.adb (P_Type_Declaration): Properly handle missing type
	keyword

From-SVN: r138503

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a294cf6e137cd0d9ac8a538d142c74a6c9ec2060..2e8aa97fa61181b1583d04b960a57dfa57eff84a 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,37 @@
+2008-08-01  Gary Dismukes  <dismukes@adacore.com>
+
+       * exp_ch6.adb (Expand_Call): Adjustment to previous fix for passing
+       correct accessibility levels. In the "when others" case, retrieve the
+       access level of the Etype of Prev rather than Prev_Orig, because the
+       original exression has not always been analyzed.
+
+2008-08-01  Robert Dewar  <dewar@adacore.com>
+
+       * prj-nmsc.adb: Minor reformatting
+
+       * sem_ch4.adb: Minor reformatting
+       Minor code reorganization
+
+       * prj.ads: Minor reformatting
+
+       * s-os_lib.adb: Minor reformatting
+
+       * par-prag.adb (Prag, case Wide_Character_Encoding): Deal with upper
+       half encodings
+
+       * scans.ads: Minor reformatting.
+
+       * sem_prag.adb (Analyze_Pragma): Put entries in alpha order
+       (Analyze_Pragma): Make sure all GNAT pragmas call GNAT_Pragma
+
+       * sem_res.adb:
+       (Resolve_Call): Check violation of No_Specific_Termination_Handlers
+
+       * sem_ch12.adb: Minor comment reformatting
+
+       * par-ch3.adb (P_Type_Declaration): Properly handle missing type
+       keyword
+
 2008-08-01  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/utils.c (convert_vms_descriptor): Add gnu_expr_alt_type

diff --git a/gcc/ada/par-ch3.adb b/gcc/ada/par-ch3.adb
index c2ec59be9dc2c5c640e1bd049a72b4d6f9492796..87ea4007d479c99eac9a517792aae3efb1be84e7 100644 (file)
--- a/gcc/ada/par-ch3.adb
+++ b/gcc/ada/par-ch3.adb
@@ -295,15 +295,8 @@ package body Ch3 is
 
       else
          T_Type;
-
-         if Token = Tok_Identifier
-           and then Nkind (Token_Node) = N_Defining_Identifier
-         then
-            Ident_Node := Token_Node;
-            Scan; -- past defining identifier
-         else
-            Ident_Node := P_Defining_Identifier (C_Is);
-         end if;
+         Type_Token_Location := Type_Loc;
+         Ident_Node := P_Defining_Identifier (C_Is);
       end if;
 
       Discr_Sloc := Token_Ptr;