Commit f43d6356 authored by hugues.jerome's avatar hugues.jerome

* Minor reformatting



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@1483 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent a368f8ee
......@@ -206,7 +206,6 @@ package body Ocarina.Backends.C_Common.Subprograms is
S := First_Node (Features (E));
while Present (S) loop
Visit (Corresponding_Instance (S));
S := Next_Node (S);
......@@ -404,12 +403,14 @@ package body Ocarina.Backends.C_Common.Subprograms is
-- Visit the component instance corresponding to the
-- subcomponent S.
if Get_Current_Backend_Kind = PolyORB_Kernel_C
and then Get_Category_Of_Component
(Corresponding_Instance (S)) = CC_Process then
and then Get_Category_Of_Component
(Corresponding_Instance (S)) = CC_Process
then
null;
else
if Get_Category_Of_Component
(Corresponding_Instance (S)) /= CC_Device then
(Corresponding_Instance (S)) /= CC_Device
then
Visit (Corresponding_Instance (S));
end if;
end if;
......@@ -439,8 +440,8 @@ package body Ocarina.Backends.C_Common.Subprograms is
if Kind (Feature) = K_Port_Spec_Instance
and then Is_In (Feature)
and then Is_Event (Feature)
and then not Is_Data (Feature) then
and then not Is_Data (Feature)
then
if Get_Port_Compute_Entrypoint (Feature) /= No_Node then
Visit (Get_Port_Compute_Entrypoint (Feature));
end if;
......
......@@ -806,34 +806,32 @@ package body Ocarina.Backends.C_Common.Types is
Start_Recording_Handlings;
if Get_Current_Backend_Kind = PolyORB_Kernel_C and then
not AINU.Is_Empty (Subcomponents (E)) then
if Get_Current_Backend_Kind = PolyORB_Kernel_C
and then not AINU.Is_Empty (Subcomponents (E))
then
S := First_Node (Subcomponents (E));
while Present (S) loop
-- Visit the component instance corresponding to the
-- subcomponent S.
if AINU.Is_Data (Corresponding_Instance (S)) and then
Is_Protected_Data (Corresponding_Instance (S)) then
if AINU.Is_Data (Corresponding_Instance (S))
and then Is_Protected_Data (Corresponding_Instance (S))
then
Add_Include (PKR.RH (RH_Deployment));
if POK_Flavor = ARINC653 then
Declaration := Make_Extern_Entity_Declaration
(Make_Variable_Declaration
(Make_Defining_Identifier
(Map_Associated_Locking_Entity_Name
(S)),
PKR.RE (RE_Semaphore_Id_Type)));
(Map_Associated_Locking_Entity_Name (S)),
PKR.RE (RE_Semaphore_Id_Type)));
else
Declaration := Make_Extern_Entity_Declaration
(Make_Variable_Declaration
(Make_Defining_Identifier
(Map_Associated_Locking_Entity_Name
(S)),
PKR.RE (RE_Pok_Sem_Id_T)));
(Map_Associated_Locking_Entity_Name (S)),
PKR.RE (RE_Pok_Sem_Id_T)));
end if;
Append_Node_To_List
......
......@@ -1663,7 +1663,7 @@ package body Ocarina.Backends.C_Tree.Nutils is
Hybrid : constant Boolean :=
AINU.Is_Subprogram (Caller) and then
Properties.Get_Subprogram_Kind (Caller) =
Properties.Subprogram_Hybrid_Ada_95;
Properties.Subprogram_Hybrid_Ada_95; -- XXX why Ada ?
begin
-- The lists have to be created
......
......@@ -659,7 +659,7 @@ package body Ocarina.Backends.PO_HI_Ada.Types is
if CCP /= Concurrency_Priority_Ceiling then
Display_Located_Error
(Loc (E),
"Incompatoble concurrency protocol, "
"Incompatible concurrency protocol, "
& "PolyORB-HI/Ada requires "
& "Priority_Ceiling",
True);
......
......@@ -1507,7 +1507,7 @@ package body Ocarina.Backends.PO_HI_C.Activity is
N := Make_Variable_Declaration
(Map_C_Defining_Identifier (S),
Map_C_Data_Type_Designator
(Corresponding_Instance (S)));
(Corresponding_Instance (S)));
Append_Node_To_List
(Make_Extern_Entity_Declaration (N),
......
......@@ -285,11 +285,11 @@ package body Ocarina.Instances.Components.Subprogram_Calls is
return No_Node;
end if;
end;
else
Display_No_Entity_Ref (New_Instance);
return No_Node;
end if;
end Instantiate_Subprogram_Call;
----------------------------------------
......@@ -316,14 +316,16 @@ package body Ocarina.Instances.Components.Subprogram_Calls is
New_Subinstance := Instantiate_Component
(Instance_Root,
Corresponding_Declaration
(Corresponding_Instance (Call_Instance)));
(Corresponding_Instance (Call_Instance)));
if Present (New_Subinstance) then
Set_Corresponding_Instance (Call_Instance, New_Subinstance);
return Call_Instance;
else
return No_Node;
end if;
else
return Call_Instance;
end if;
......
......@@ -117,9 +117,9 @@ package body Ocarina.Me_AADL.AADL_Instances.Entities.Properties is
-- and its value corresponds to the name of one
-- element of the list.
if No (AIN.In_Modes (List_Node)) or else
AINU.Is_Empty (ATN.Modes (AIN.In_Modes (List_Node))) or else
In_Mode = No_Name
if No (AIN.In_Modes (List_Node))
or else AINU.Is_Empty (ATN.Modes (AIN.In_Modes (List_Node)))
or else In_Mode = No_Name
then
return List_Node;
else
......
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