mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 09:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Ada] Simplify conversion from Character to Char_Code

Browse Source 
Replace "Char_Code (Character'Pos (...))" with "Get_Char_Code (...)".
The Get_Char_Code routine is inlined, so there is no performance penalty
when it is called with static actual parameters.

The N_Character_Literal has field Char_Literal_Value of type Unat, but
we should really only store there values from Char_Code type (e.g. there
are no characters with negative ASCII codes). It seems cleaner to use
UI_From_CC and not a more general UI_From_Int when setting the character
literal values.

Cleanup related to handling of character values in SPARK
counterexamples, which just like the code for names in task arrays
create N_Character_Literal nodes.

gcc/ada/

	* exp_prag.adb (Expand_Pragma_Import_Or_Interface): Use
	Get_Char_Code.
	* exp_util.adb (Build_Task_Array_Image): Simplify conversion to
	Char_Code.
	(Build_Task_Image_Prefix): Likewise.
	(Build_Task_Record_Image): Likewise.
	* cstand.adb (Create_Standard): Use UI_From_Int instead of
	UI_From_CC.
	* exp_ch11.adb (Expand_N_Exception_Declaration): Likewise.
	* sem_res.adb (Patch_Up_Value): Likewise.
	* stringt.adb (Write_String_Table_Entry): Use Get_Char_Code.
This commit is contained in:
Piotr Trojanek 2022-01-19 14:05:16 +01:00 committed by Pierre-Marie de Rodat
parent 60ab3d0f2d
commit 0e38fbfe14
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ada/cstand.adb
View File

@ -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);

2
gcc/ada/exp_ch11.adb
View File

@ -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

2
gcc/ada/exp_prag.adb
View File

@ -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

16
gcc/ada/exp_util.adb
View File

@ -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,

4
gcc/ada/sem_res.adb
View File

@ -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);

2
gcc/ada/stringt.adb
View File

@ -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);