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