diff options
| -rw-r--r-- | gcc/ada/cstand.adb | 8 | ||||
| -rw-r--r-- | gcc/ada/exp_ch11.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/exp_prag.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/exp_util.adb | 16 | ||||
| -rw-r--r-- | gcc/ada/sem_res.adb | 4 | ||||
| -rw-r--r-- | gcc/ada/stringt.adb | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/gcc/ada/cstand.adb b/gcc/ada/cstand.adb index b2e6ef9..8ae0e47 100644 --- a/gcc/ada/cstand.adb +++ b/gcc/ada/cstand.adb @@ -787,7 +787,7 @@ package body CStand is B_Node := New_Node (N_Character_Literal, Stloc); Set_Is_Static_Expression (B_Node); Set_Chars (B_Node, No_Name); - Set_Char_Literal_Value (B_Node, UI_From_Int (16#FF#)); + Set_Char_Literal_Value (B_Node, UI_From_CC (16#FF#)); Set_Entity (B_Node, Empty); Set_Etype (B_Node, Standard_Character); Set_High_Bound (R_Node, B_Node); @@ -833,7 +833,7 @@ package body CStand is B_Node := New_Node (N_Character_Literal, Stloc); Set_Is_Static_Expression (B_Node); Set_Chars (B_Node, No_Name); - Set_Char_Literal_Value (B_Node, UI_From_Int (16#FFFF#)); + Set_Char_Literal_Value (B_Node, UI_From_CC (16#FFFF#)); Set_Entity (B_Node, Empty); Set_Etype (B_Node, Standard_Wide_Character); Set_High_Bound (R_Node, B_Node); @@ -882,7 +882,7 @@ package body CStand is B_Node := New_Node (N_Character_Literal, Stloc); Set_Is_Static_Expression (B_Node); Set_Chars (B_Node, No_Name); - Set_Char_Literal_Value (B_Node, UI_From_Int (16#7FFF_FFFF#)); + Set_Char_Literal_Value (B_Node, UI_From_CC (16#7FFF_FFFF#)); Set_Entity (B_Node, Empty); Set_Etype (B_Node, Standard_Wide_Wide_Character); Set_High_Bound (R_Node, B_Node); @@ -1088,7 +1088,7 @@ package body CStand is Set_Is_Static_Expression (Expr_Decl); Set_Chars (Expr_Decl, No_Name); Set_Etype (Expr_Decl, Standard_Character); - Set_Char_Literal_Value (Expr_Decl, UI_From_Int (Int (Ccode))); + Set_Char_Literal_Value (Expr_Decl, UI_From_CC (Ccode)); end; Append (Decl, Decl_A); diff --git a/gcc/ada/exp_ch11.adb b/gcc/ada/exp_ch11.adb index b2eff31..855d303 100644 --- a/gcc/ada/exp_ch11.adb +++ b/gcc/ada/exp_ch11.adb @@ -1246,7 +1246,7 @@ package body Exp_Ch11 is Append_To (L, Make_Character_Literal (Loc, Chars => Name_uA, - Char_Literal_Value => UI_From_Int (Character'Pos ('A')))); + Char_Literal_Value => UI_From_CC (Get_Char_Code ('A')))); -- Name_Length component: Nam'Length diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb index 35ec250..0fe8bff 100644 --- a/gcc/ada/exp_prag.adb +++ b/gcc/ada/exp_prag.adb @@ -2010,7 +2010,7 @@ package body Exp_Prag is Rewrite (Expression (Lang_Char), Make_Character_Literal (Loc, Chars => Name_uC, - Char_Literal_Value => UI_From_Int (Character'Pos ('C')))); + Char_Literal_Value => UI_From_CC (Get_Char_Code ('C')))); Analyze (Expression (Lang_Char)); -- Change the value of Foreign_Data diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index 30c293c..263b42f 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -4183,7 +4183,7 @@ package body Exp_Util is Build_Task_Image_Prefix (Loc, Len, Res, Pos, Pref, Sum, Decls, Stats); - Set_Character_Literal_Name (Char_Code (Character'Pos ('('))); + Set_Character_Literal_Name (Get_Char_Code ('(')); Append_To (Stats, Make_Assignment_Statement (Loc, @@ -4194,7 +4194,7 @@ package body Exp_Util is Expression => Make_Character_Literal (Loc, Chars => Name_Find, - Char_Literal_Value => UI_From_Int (Character'Pos ('('))))); + Char_Literal_Value => UI_From_CC (Get_Char_Code ('('))))); Append_To (Stats, Make_Assignment_Statement (Loc, @@ -4244,7 +4244,7 @@ package body Exp_Util is Expressions => New_List (Make_Integer_Literal (Loc, 1)))))); - Set_Character_Literal_Name (Char_Code (Character'Pos (','))); + Set_Character_Literal_Name (Get_Char_Code (',')); Append_To (Stats, Make_Assignment_Statement (Loc, @@ -4254,7 +4254,7 @@ package body Exp_Util is Expression => Make_Character_Literal (Loc, Chars => Name_Find, - Char_Literal_Value => UI_From_Int (Character'Pos (','))))); + Char_Literal_Value => UI_From_CC (Get_Char_Code (','))))); Append_To (Stats, Make_Assignment_Statement (Loc, @@ -4266,7 +4266,7 @@ package body Exp_Util is end if; end loop; - Set_Character_Literal_Name (Char_Code (Character'Pos (')'))); + Set_Character_Literal_Name (Get_Char_Code (')')); Append_To (Stats, Make_Assignment_Statement (Loc, @@ -4277,7 +4277,7 @@ package body Exp_Util is Expression => Make_Character_Literal (Loc, Chars => Name_Find, - Char_Literal_Value => UI_From_Int (Character'Pos (')'))))); + Char_Literal_Value => UI_From_CC (Get_Char_Code (')'))))); return Build_Task_Image_Function (Loc, Decls, Stats, Res); end Build_Task_Array_Image; @@ -4569,7 +4569,7 @@ package body Exp_Util is Build_Task_Image_Prefix (Loc, Len, Res, Pos, Pref, Sum, Decls, Stats); - Set_Character_Literal_Name (Char_Code (Character'Pos ('.'))); + Set_Character_Literal_Name (Get_Char_Code ('.')); -- Res (Pos) := '.'; @@ -4582,7 +4582,7 @@ package body Exp_Util is Make_Character_Literal (Loc, Chars => Name_Find, Char_Literal_Value => - UI_From_Int (Character'Pos ('.'))))); + UI_From_CC (Get_Char_Code ('.'))))); Append_To (Stats, Make_Assignment_Statement (Loc, diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 1c686cd..734e457 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -2245,12 +2245,12 @@ package body Sem_Res is elsif Nkind (N) = N_String_Literal and then Is_Character_Type (Typ) then - Set_Character_Literal_Name (Char_Code (Character'Pos ('A'))); + Set_Character_Literal_Name (Get_Char_Code ('A')); Rewrite (N, Make_Character_Literal (Sloc (N), Chars => Name_Find, Char_Literal_Value => - UI_From_Int (Character'Pos ('A')))); + UI_From_CC (Get_Char_Code ('A')))); Set_Etype (N, Any_Character); Set_Is_Static_Expression (N); diff --git a/gcc/ada/stringt.adb b/gcc/ada/stringt.adb index e96b96f..5bae3cc 100644 --- a/gcc/ada/stringt.adb +++ b/gcc/ada/stringt.adb @@ -441,7 +441,7 @@ package body Stringt is for J in 1 .. String_Length (Id) loop C := Get_String_Char (Id, J); - if C = Character'Pos ('"') then + if C = Get_Char_Code ('"') then Write_Str (""""""); else Write_Char_Code (C); |