Skip to content

R
riscv-gcc-1
Commit c3217dac by Robert Dewar Committed by Arnaud Charlet
Options

sem_prag.adb: Processing for new pragma Complete_Representation (Analyze_Pragma... 

2005-12-05  Robert Dewar  <dewar@adacore.com>

	* sem_prag.adb: Processing for new pragma Complete_Representation
	(Analyze_Pragma, case Debug): Implement two argument form.

	* par-prag.adb: Entry for new pragma Complete_Representation
	(Prag, case Debug): Recognize two argument form of pragma Debug
	New interface for Set_Style_Check_Options.

	* sem_ch13.adb: Implement new pragma Complete_Representation.

	* snames.adb, snames.ads, snames.h: Entry for new pragma
	Complete_Representation.

From-SVN: r108299
parent 6677e9d9
Showing with 204 additions and 128 deletions
gcc/ada/par-prag.adb
......@@ -329,27 +329,34 @@ begin
-- semantically we treat it as a procedure call (which has exactly the
-- same syntactic form, so that's why we can get away with this!)
when Pragma_Debug =>
Check_Arg_Count (1);
Check_No_Identifier (Arg1);
when Pragma_Debug => Debug : declare
Expr : Node_Id;
declare
Expr : constant Node_Id := New_Copy (Expression (Arg1));
begin
if Arg_Count = 2 then
Check_No_Identifier (Arg1);
Check_No_Identifier (Arg2);
Expr := New_Copy (Expression (Arg2));
begin
if Nkind (Expr) /= N_Indexed_Component
and then Nkind (Expr) /= N_Function_Call
and then Nkind (Expr) /= N_Identifier
and then Nkind (Expr) /= N_Selected_Component
then
Error_Msg
("argument of pragma% is not procedure call", Sloc (Expr));
raise Error_Resync;
else
Set_Debug_Statement
(Pragma_Node, P_Statement_Name (Expr));
end if;
end;
else
Check_Arg_Count (1);
Check_No_Identifier (Arg1);
Expr := New_Copy (Expression (Arg1));
end if;
if Nkind (Expr) /= N_Indexed_Component
and then Nkind (Expr) /= N_Function_Call
and then Nkind (Expr) /= N_Identifier
and then Nkind (Expr) /= N_Selected_Component
then
Error_Msg
("argument of pragma% is not procedure call", Sloc (Expr));
raise Error_Resync;
else
Set_Debug_Statement
(Pragma_Node, P_Statement_Name (Expr));
end if;
end Debug;
-------------------------------
-- Extensions_Allowed (GNAT) --
......@@ -929,7 +936,7 @@ begin
if not OK then
Error_Msg
("invalid style check option",
(Style_Msg_Buf (1 .. Style_Msg_Len),
Sloc (Expression (Arg1)) + Source_Ptr (Ptr));
raise Error_Resync;
end if;
......@@ -1013,6 +1020,7 @@ begin
Pragma_C_Pass_By_Copy |
Pragma_Comment |
Pragma_Common_Object |
Pragma_Complete_Representation |
Pragma_Complex_Representation |
Pragma_Component_Alignment |
Pragma_Controlled |
......
gcc/ada/sem_ch13.adb
......@@ -1731,6 +1731,9 @@ package body Sem_Ch13 is
Ccount : Natural := 0;
-- Number of component clauses in record rep clause
CR_Pragma : Node_Id := Empty;
-- Points to N_Pragma node if Complete_Representation pragma present
begin
Find_Type (Ident);
Rectype := Entity (Ident);
......@@ -1893,11 +1896,17 @@ package body Sem_Ch13 is
while Present (CC) loop
-- If pragma, just analyze it
-- Pragma
if Nkind (CC) = N_Pragma then
Analyze (CC);
-- The only pragma of interest is Complete_Representation
if Chars (CC) = Name_Complete_Representation then
CR_Pragma := CC;
end if;
-- Processing for real component clause
else
......@@ -2271,9 +2280,7 @@ package body Sem_Ch13 is
if Ekind (Comp) = E_Component
or else Ekind (Comp) = E_Discriminant
then
if No (Component_Clause (Comp)) then
return;
end if;
exit when No (Component_Clause (Comp));
end if;
Next_Entity (Comp);
......@@ -2282,7 +2289,28 @@ package body Sem_Ch13 is
-- If we fall out of loop, all components have component clauses
-- and so we can set the size to the maximum value.
Set_RM_Size (Rectype, Hbit + 1);
if No (Comp) then
Set_RM_Size (Rectype, Hbit + 1);
end if;
end if;
-- Check missing components if Complete_Representation pragma appeared
if Present (CR_Pragma) then
Comp := First_Entity (Rectype);
while Present (Comp) loop
if Ekind (Comp) = E_Component
or else
Ekind (Comp) = E_Discriminant
then
if No (Component_Clause (Comp)) then
Error_Msg_NE
("missing component clause for &", CR_Pragma, Comp);
end if;
end if;
Next_Entity (Comp);
end loop;
end if;
end Analyze_Record_Representation_Clause;
......@@ -2571,7 +2599,6 @@ package body Sem_Ch13 is
Check_Expr_Constants (Prefix (Nod));
when N_Attribute_Reference =>
if Attribute_Name (Nod) = Name_Address
or else
Attribute_Name (Nod) = Name_Access
......
gcc/ada/sem_prag.adb
......@@ -4967,6 +4967,21 @@ package body Sem_Prag is
end if;
end Compile_Time_Warning;
-----------------------------
-- Complete_Representation --
-----------------------------
-- pragma Complete_Representation;
when Pragma_Complete_Representation =>
GNAT_Pragma;
Check_Arg_Count (0);
if Nkind (Parent (N)) /= N_Record_Representation_Clause then
Error_Pragma
("pragma & must appear within record representation clause");
end if;
----------------------------
-- Complex_Representation --
----------------------------
......@@ -5573,18 +5588,39 @@ package body Sem_Prag is
-- Debug --
-----------
-- pragma Debug (PROCEDURE_CALL_STATEMENT);
-- pragma Debug ([boolean_EXPRESSION,] PROCEDURE_CALL_STATEMENT);
when Pragma_Debug => Debug : declare
Cond : Node_Id;
when Pragma_Debug => Debug : begin
begin
GNAT_Pragma;
-- Rewrite into a conditional with a static condition
Cond :=
New_Occurrence_Of
(Boolean_Literals (Debug_Pragmas_Enabled and Expander_Active),
Loc);
if Arg_Count = 2 then
Cond :=
Make_And_Then (Loc,
Left_Opnd => Relocate_Node (Cond),
Right_Opnd => Expression (Arg1));
end if;
-- Rewrite into a conditional with an appropriate condition. We
-- wrap the procedure call in a block so that overhead from e.g.
-- use of the secondary stack does not generate execution overhead
-- for suppressed conditions.
Rewrite (N, Make_Implicit_If_Statement (N,
Condition => New_Occurrence_Of (Boolean_Literals (
Debug_Pragmas_Enabled and Expander_Active), Loc),
Then_Statements => New_List (
Relocate_Node (Debug_Statement (N)))));
Condition => Cond,
Then_Statements => New_List (
Make_Block_Statement (Loc,
Handled_Statement_Sequence =>
Make_Handled_Sequence_Of_Statements (Loc,
Statements => New_List (
Relocate_Node (Debug_Statement (N))))))));
Analyze (N);
end Debug;
......@@ -9587,17 +9623,20 @@ package body Sem_Prag is
exit when not In_Character_Range (C);
Options (J) := Get_Character (C);
-- If at end of string, set options. As per discussion
-- above, no need to check for errors, since we issued
-- them in the parser.
if J = Slen then
Set_Style_Check_Options (Options);
exit;
else
J := J + 1;
end if;
J := J + 1;
end loop;
end;
elsif Nkind (A) = N_Identifier then
if Chars (A) = Name_All_Checks then
Set_Default_Style_Check_Options;
......@@ -9606,7 +9645,6 @@ package body Sem_Prag is
elsif Chars (A) = Name_Off then
Style_Check := False;
end if;
end if;
end if;
......@@ -10664,6 +10702,7 @@ package body Sem_Prag is
Pragma_Comment => 0,
Pragma_Common_Object => -1,
Pragma_Compile_Time_Warning => -1,
Pragma_Complete_Representation => 0,
Pragma_Complex_Representation => 0,
Pragma_Component_Alignment => -1,
Pragma_Controlled => 0,
......
gcc/ada/snames.adb
......@@ -229,6 +229,7 @@ package body Snames is
"attach_handler#" &
"comment#" &
"common_object#" &
"complete_representation#" &
"complex_representation#" &
"controlled#" &
"convention#" &
......
gcc/ada/snames.h
......@@ -270,96 +270,97 @@ extern unsigned char Get_Pragma_Id (int);
#define Pragma_Attach_Handler 55
#define Pragma_Comment 56
#define Pragma_Common_Object 57
#define Pragma_Complex_Representation 58
#define Pragma_Controlled 59
#define Pragma_Convention 60
#define Pragma_CPP_Class 61
#define Pragma_CPP_Constructor 62
#define Pragma_CPP_Virtual 63
#define Pragma_CPP_Vtable 64
#define Pragma_Debug 65
#define Pragma_Elaborate 66
#define Pragma_Elaborate_All 67
#define Pragma_Elaborate_Body 68
#define Pragma_Export 69
#define Pragma_Export_Exception 70
#define Pragma_Export_Function 71
#define Pragma_Export_Object 72
#define Pragma_Export_Procedure 73
#define Pragma_Export_Value 74
#define Pragma_Export_Valued_Procedure 75
#define Pragma_External 76
#define Pragma_Finalize_Storage_Only 77
#define Pragma_Ident 78
#define Pragma_Import 79
#define Pragma_Import_Exception 80
#define Pragma_Import_Function 81
#define Pragma_Import_Object 82
#define Pragma_Import_Procedure 83
#define Pragma_Import_Valued_Procedure 84
#define Pragma_Inline 85
#define Pragma_Inline_Always 86
#define Pragma_Inline_Generic 87
#define Pragma_Inspection_Point 88
#define Pragma_Interface_Name 89
#define Pragma_Interrupt_Handler 90
#define Pragma_Interrupt_Priority 91
#define Pragma_Java_Constructor 92
#define Pragma_Java_Interface 93
#define Pragma_Keep_Names 94
#define Pragma_Link_With 95
#define Pragma_Linker_Alias 96
#define Pragma_Linker_Constructor 97
#define Pragma_Linker_Destructor 98
#define Pragma_Linker_Options 99
#define Pragma_Linker_Section 100
#define Pragma_List 101
#define Pragma_Machine_Attribute 102
#define Pragma_Main 103
#define Pragma_Main_Storage 104
#define Pragma_Memory_Size 105
#define Pragma_No_Return 106
#define Pragma_Obsolescent 107
#define Pragma_Optimize 108
#define Pragma_Optional_Overriding 109
#define Pragma_Pack 110
#define Pragma_Page 111
#define Pragma_Passive 112
#define Pragma_Preelaborate 113
#define Pragma_Preelaborate_05 114
#define Pragma_Priority 115
#define Pragma_Psect_Object 116
#define Pragma_Pure 117
#define Pragma_Pure_05 118
#define Pragma_Pure_Function 119
#define Pragma_Remote_Call_Interface 120
#define Pragma_Remote_Types 121
#define Pragma_Share_Generic 122
#define Pragma_Shared 123
#define Pragma_Shared_Passive 124
#define Pragma_Source_Reference 125
#define Pragma_Stream_Convert 126
#define Pragma_Subtitle 127
#define Pragma_Suppress_All 128
#define Pragma_Suppress_Debug_Info 129
#define Pragma_Suppress_Initialization 130
#define Pragma_System_Name 131
#define Pragma_Task_Info 132
#define Pragma_Task_Name 133
#define Pragma_Task_Storage 134
#define Pragma_Thread_Body 135
#define Pragma_Time_Slice 136
#define Pragma_Title 137
#define Pragma_Unchecked_Union 138
#define Pragma_Unimplemented_Unit 139
#define Pragma_Unreferenced 140
#define Pragma_Unreserve_All_Interrupts 141
#define Pragma_Volatile 142
#define Pragma_Volatile_Components 143
#define Pragma_Weak_External 144
#define Pragma_AST_Entry 145
#define Pragma_Interface 146
#define Pragma_Storage_Size 147
#define Pragma_Storage_Unit 148
#define Pragma_Complete_Representation 58
#define Pragma_Complex_Representation 59
#define Pragma_Controlled 60
#define Pragma_Convention 61
#define Pragma_CPP_Class 62
#define Pragma_CPP_Constructor 63
#define Pragma_CPP_Virtual 64
#define Pragma_CPP_Vtable 65
#define Pragma_Debug 66
#define Pragma_Elaborate 67
#define Pragma_Elaborate_All 68
#define Pragma_Elaborate_Body 69
#define Pragma_Export 70
#define Pragma_Export_Exception 71
#define Pragma_Export_Function 72
#define Pragma_Export_Object 73
#define Pragma_Export_Procedure 74
#define Pragma_Export_Value 75
#define Pragma_Export_Valued_Procedure 76
#define Pragma_External 77
#define Pragma_Finalize_Storage_Only 78
#define Pragma_Ident 79
#define Pragma_Import 80
#define Pragma_Import_Exception 81
#define Pragma_Import_Function 82
#define Pragma_Import_Object 83
#define Pragma_Import_Procedure 84
#define Pragma_Import_Valued_Procedure 85
#define Pragma_Inline 86
#define Pragma_Inline_Always 87
#define Pragma_Inline_Generic 88
#define Pragma_Inspection_Point 89
#define Pragma_Interface_Name 90
#define Pragma_Interrupt_Handler 91
#define Pragma_Interrupt_Priority 92
#define Pragma_Java_Constructor 93
#define Pragma_Java_Interface 94
#define Pragma_Keep_Names 95
#define Pragma_Link_With 96
#define Pragma_Linker_Alias 97
#define Pragma_Linker_Constructor 98
#define Pragma_Linker_Destructor 99
#define Pragma_Linker_Options 100
#define Pragma_Linker_Section 101
#define Pragma_List 102
#define Pragma_Machine_Attribute 103
#define Pragma_Main 104
#define Pragma_Main_Storage 105
#define Pragma_Memory_Size 106
#define Pragma_No_Return 107
#define Pragma_Obsolescent 108
#define Pragma_Optimize 109
#define Pragma_Optional_Overriding 110
#define Pragma_Pack 111
#define Pragma_Page 112
#define Pragma_Passive 113
#define Pragma_Preelaborate 114
#define Pragma_Preelaborate_05 115
#define Pragma_Priority 116
#define Pragma_Psect_Object 117
#define Pragma_Pure 118
#define Pragma_Pure_05 119
#define Pragma_Pure_Function 120
#define Pragma_Remote_Call_Interface 121
#define Pragma_Remote_Types 122
#define Pragma_Share_Generic 123
#define Pragma_Shared 124
#define Pragma_Shared_Passive 125
#define Pragma_Source_Reference 126
#define Pragma_Stream_Convert 127
#define Pragma_Subtitle 128
#define Pragma_Suppress_All 129
#define Pragma_Suppress_Debug_Info 130
#define Pragma_Suppress_Initialization 131
#define Pragma_System_Name 132
#define Pragma_Task_Info 133
#define Pragma_Task_Name 134
#define Pragma_Task_Storage 135
#define Pragma_Thread_Body 136
#define Pragma_Time_Slice 137
#define Pragma_Title 138
#define Pragma_Unchecked_Union 139
#define Pragma_Unimplemented_Unit 140
#define Pragma_Unreferenced 141
#define Pragma_Unreserve_All_Interrupts 142
#define Pragma_Volatile 143
#define Pragma_Volatile_Components 144
#define Pragma_Weak_External 145
#define Pragma_AST_Entry 146
#define Pragma_Interface 147
#define Pragma_Storage_Size 148
#define Pragma_Storage_Unit 149
/* End of snames.h (C version of Snames package spec) */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment