Commit 5a6d93a7 authored by jhugues's avatar jhugues
Browse files

* AADL pretty-printer now correct prints component access in

          applies to clauses



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@4613 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent d3b4c877
...@@ -833,9 +833,9 @@ package body Ocarina.BE_AADL.Properties.Values is ...@@ -833,9 +833,9 @@ package body Ocarina.BE_AADL.Properties.Values is
begin begin
To_Lower (S); To_Lower (S);
for I in S'Range loop for J in S'Range loop
if S (I) = '_' then if S (J) = '_' then
S (I) := ' '; S (J) := ' ';
end if; end if;
end loop; end loop;
Write_Str (S (4 .. S'Last)); Write_Str (S (4 .. S'Last));
...@@ -850,7 +850,6 @@ package body Ocarina.BE_AADL.Properties.Values is ...@@ -850,7 +850,6 @@ package body Ocarina.BE_AADL.Properties.Values is
Class_Ref : constant Node_Id := Classifier_Ref (Node); Class_Ref : constant Node_Id := Classifier_Ref (Node);
begin begin
case Named_Element'Val (Category (Node)) is case Named_Element'Val (Category (Node)) is
when PO_Port_Group => when PO_Port_Group =>
Print_Tokens ((T_Port, T_Group)); Print_Tokens ((T_Port, T_Group));
when PO_Server_Subprogram => when PO_Server_Subprogram =>
...@@ -908,9 +907,7 @@ package body Ocarina.BE_AADL.Properties.Values is ...@@ -908,9 +907,7 @@ package body Ocarina.BE_AADL.Properties.Values is
Print_Token (T_Classifier); Print_Token (T_Classifier);
when PO_Package => when PO_Package =>
Print_Token (T_Package); Print_Token (T_Package);
when PO_Component_Implementation => when PO_Component_Implementation =>
if Component_Category'Val (Component_Cat (Node)) = CC_Unknown then if Component_Category'Val (Component_Cat (Node)) = CC_Unknown then
Print_Identifier (Identifier (Node)); Print_Identifier (Identifier (Node));
else else
...@@ -923,6 +920,14 @@ package body Ocarina.BE_AADL.Properties.Values is ...@@ -923,6 +920,14 @@ package body Ocarina.BE_AADL.Properties.Values is
Write_Space; Write_Space;
Print_Entity_Reference (Class_Ref); Print_Entity_Reference (Class_Ref);
end if; end if;
when PO_Component_Access =>
if Component_Category'Val (Component_Cat (Node)) = CC_Unknown then
Print_Identifier (Identifier (Node));
else
Print_Component_Category (Component_Cat (Node));
end if;
Write_Space;
Print_Token (T_Access);
when others => when others =>
Print_Named_Element_Identifier Print_Named_Element_Identifier
......
...@@ -54,7 +54,7 @@ subprogram classifier) ...@@ -54,7 +54,7 @@ subprogram classifier)
applies to (memory); applies to (memory);
Timeout : Time Timeout : Time
applies to (data port, event data port, event port, component access); applies to (data port, event data port, event port, data access);
Supported_DAL_Type : type enumeration (LEVEL_A, LEVEL_B, LEVEL_C, LEVEL_D, LEVEL_E); Supported_DAL_Type : type enumeration (LEVEL_A, LEVEL_B, LEVEL_C, LEVEL_D, LEVEL_E);
......
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