From: Arnaud Charlet Date: Mon, 13 Jul 2009 08:12:11 +0000 (+0200) Subject: [multiple changes] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfb120b55dc31f9d6dc27a63747ec436fd6a80f2;p=platform%2Fupstream%2Fgcc.git [multiple changes] 2009-07-13 Robert Dewar * i-cobol.ads: Minor code fix (2**4 instead of 16 as modulus to avoid warning). * par-ch4.adb: Minor reformatting 2009-07-13 Ed Schonberg * freeze.adb, freeze.ads, exp_aggr.adb: Rename Expand_Atomic_Aggregate => Is_Atomic_Aggregate From-SVN: r149548 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 481f587..fb20bf2 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,15 @@ +2009-07-13 Robert Dewar + + * i-cobol.ads: Minor code fix (2**4 instead of 16 as modulus to avoid + warning). + + * par-ch4.adb: Minor reformatting + +2009-07-13 Ed Schonberg + + * freeze.adb, freeze.ads, exp_aggr.adb: Rename Expand_Atomic_Aggregate + => Is_Atomic_Aggregate + 2009-07-13 Emmanuel Briot * prj-nmsc.adb: Avoid traversing the list of source files if diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index fc61076..17862fe 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -5476,7 +5476,7 @@ package body Exp_Aggr is if Is_Atomic (Typ) and then Comes_From_Source (Parent (N)) - and then Expand_Atomic_Aggregate (N, Typ) + and then Is_Atomic_Aggregate (N, Typ) then return; diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 231ec87..152d982 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -1111,11 +1111,11 @@ package body Freeze is end loop; end Check_Unsigned_Type; - ----------------------------- - -- Expand_Atomic_Aggregate -- - ----------------------------- + ------------------------- + -- Is_Atomic_Aggregate -- + ------------------------- - function Expand_Atomic_Aggregate + function Is_Atomic_Aggregate (E : Entity_Id; Typ : Entity_Id) return Boolean is @@ -1154,7 +1154,7 @@ package body Freeze is else return False; end if; - end Expand_Atomic_Aggregate; + end Is_Atomic_Aggregate; ---------------- -- Freeze_All -- @@ -2364,7 +2364,7 @@ package body Freeze is and then Present (Expression (Parent (E))) and then Nkind (Expression (Parent (E))) = N_Aggregate and then - Expand_Atomic_Aggregate (Expression (Parent (E)), Etype (E)) + Is_Atomic_Aggregate (Expression (Parent (E)), Etype (E)) then null; end if; diff --git a/gcc/ada/freeze.ads b/gcc/ada/freeze.ads index ac2fa8c..f783210 100644 --- a/gcc/ada/freeze.ads +++ b/gcc/ada/freeze.ads @@ -175,7 +175,7 @@ package Freeze is -- do not allow a size clause if the size would not otherwise be known at -- compile time in any case. - function Expand_Atomic_Aggregate + function Is_Atomic_Aggregate (E : Entity_Id; Typ : Entity_Id) return Boolean; diff --git a/gcc/ada/i-cobol.ads b/gcc/ada/i-cobol.ads index 6178eb7..ad885e4 100644 --- a/gcc/ada/i-cobol.ads +++ b/gcc/ada/i-cobol.ads @@ -55,7 +55,7 @@ package Interfaces.COBOL is Max_Digits_Binary : constant := 9; Max_Digits_Long_Binary : constant := 18; - type Decimal_Element is mod 16; + type Decimal_Element is mod 2**4; type Packed_Decimal is array (Positive range <>) of Decimal_Element; pragma Pack (Packed_Decimal); diff --git a/gcc/ada/par-ch4.adb b/gcc/ada/par-ch4.adb index 38eccb1..6bfc40a 100644 --- a/gcc/ada/par-ch4.adb +++ b/gcc/ada/par-ch4.adb @@ -857,7 +857,6 @@ package body Ch4 is exception when Error_Resync => return Error; - end P_Function_Name; -- This function parses a restricted form of Names which are either @@ -929,7 +928,6 @@ package body Ch4 is exception when Error_Resync => return Error; - end P_Qualified_Simple_Name; -- This procedure differs from P_Qualified_Simple_Name only in that it @@ -994,7 +992,6 @@ package body Ch4 is Set_Selector_Name (Selector_Node, Designator_Node); return Selector_Node; end if; - end P_Qualified_Simple_Name_Resync; ---------------------- @@ -2106,7 +2103,6 @@ package body Ch4 is Resync_Expression; Expr_Form := EF_Simple; return Error; - end P_Simple_Expression; ----------------------------------------------- @@ -2482,15 +2478,15 @@ package body Ch4 is function P_Relational_Operator return Node_Kind is Op_Kind : Node_Kind; Relop_Node : constant array (Token_Class_Relop) of Node_Kind := - (Tok_Less => N_Op_Lt, - Tok_Equal => N_Op_Eq, - Tok_Greater => N_Op_Gt, - Tok_Not_Equal => N_Op_Ne, - Tok_Greater_Equal => N_Op_Ge, - Tok_Less_Equal => N_Op_Le, - Tok_In => N_In, - Tok_Not => N_Not_In, - Tok_Box => N_Op_Ne); + (Tok_Less => N_Op_Lt, + Tok_Equal => N_Op_Eq, + Tok_Greater => N_Op_Gt, + Tok_Not_Equal => N_Op_Ne, + Tok_Greater_Equal => N_Op_Ge, + Tok_Less_Equal => N_Op_Le, + Tok_In => N_In, + Tok_Not => N_Not_In, + Tok_Box => N_Op_Ne); begin if Token = Tok_Box then @@ -2528,9 +2524,9 @@ package body Ch4 is function P_Binary_Adding_Operator return Node_Kind is Addop_Node : constant array (Token_Class_Binary_Addop) of Node_Kind := - (Tok_Ampersand => N_Op_Concat, - Tok_Minus => N_Op_Subtract, - Tok_Plus => N_Op_Add); + (Tok_Ampersand => N_Op_Concat, + Tok_Minus => N_Op_Subtract, + Tok_Plus => N_Op_Add); begin return Addop_Node (Token); end P_Binary_Adding_Operator; @@ -2551,8 +2547,8 @@ package body Ch4 is function P_Unary_Adding_Operator return Node_Kind is Addop_Node : constant array (Token_Class_Unary_Addop) of Node_Kind := - (Tok_Minus => N_Op_Minus, - Tok_Plus => N_Op_Plus); + (Tok_Minus => N_Op_Minus, + Tok_Plus => N_Op_Plus); begin return Addop_Node (Token); end P_Unary_Adding_Operator; @@ -2670,8 +2666,8 @@ package body Ch4 is Inside_Conditional_Expression := Inside_Conditional_Expression + 1; if Token = Tok_If and then not Extensions_Allowed then - Error_Msg_SC ("conditional expression is an Ada extension"); - Error_Msg_SC ("\use -gnatX switch to compile this unit"); + Error_Msg_SC ("|conditional expression is an Ada extension"); + Error_Msg_SC ("\|use -gnatX switch to compile this unit"); end if; Scan; -- past IF or ELSIF