* Adjust for changes i PolyORB_HI.Thread_Interrogators API

For #272
OpenAADL · Oct 29, 2020 · bb55e4c · bb55e4c
1 parent 90ac912
commit bb55e4c
Showing 1 changed file with 36 additions and 12 deletions.
diff --git a/src/backends/po_hi_ada/ocarina-backends-po_hi_ada-transport.adb b/src/backends/po_hi_ada/ocarina-backends-po_hi_ada-transport.adb
@@ -159,6 +159,13 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
            Parameter_Mode      => Mode_In);
       Append_Node_To_List (N, Profile);
 
+      N :=
+        Make_Parameter_Specification
+          (Defining_Identifier => Make_Defining_Identifier (PN (P_Error)),
+           Subtype_Mark        => RE (RE_Error_Kind),
+           Parameter_Mode      => Mode_Out);
+      Append_Node_To_List (N, Profile);
+
       --  Pre-condition
       if Add_SPARK2014_Annotations and then With_Aspect then
          Aspect := Make_Aspect_Specification
@@ -176,7 +183,7 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
         Make_Subprogram_Specification
           (Defining_Identifier => Make_Defining_Identifier (SN (S_Send)),
            Parameter_Profile   => Profile,
-           Return_Type         => RE (RE_Error_Kind),
+           Return_Type         => No_Node,
            Aspect_Specification => Aspect);
 
       return N;
@@ -535,7 +542,8 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
                 (RE (RE_Error_Kind),
                  Make_Record_Aggregate
                    (Make_List_Id (RE (RE_Error_Transport))));
-            N := Make_Return_Statement (N);
+            N := Make_Assignment_Statement
+               (Make_Defining_Identifier (PN (P_Error)), N);
             Append_Node_To_List (N, Statements);
 
          else
@@ -603,8 +611,8 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
                          (Map_Send_Name (Corresponding_Instance (T))),
                        Make_List_Id
                          (Make_Defining_Identifier (PN (P_Entity)),
-                          Make_Defining_Identifier (PN (P_Msg))));
-                  N := Make_Return_Statement (N);
+                          Make_Defining_Identifier (PN (P_Msg)),
+                          Make_Defining_Identifier (PN (P_Error))));
 
                   --  The case statement alternative
 
@@ -632,7 +640,9 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
                       (RE (RE_Error_Kind),
                        Make_Record_Aggregate
                          (Make_List_Id (RE (RE_Error_Transport))));
-                  N := Make_Return_Statement (N);
+                  N := Make_Assignment_Statement
+                  (Make_Defining_Identifier (PN (P_Error)), N);
+
                   Append_Node_To_List (N, Else_Statements);
 
                   ADN.Set_First_Node
@@ -655,7 +665,8 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
                       (RE (RE_Error_Kind),
                        Make_Record_Aggregate
                          (Make_List_Id (RE (RE_Error_Transport))));
-                  N := Make_Return_Statement (N);
+                  N := Make_Assignment_Statement
+                  (Make_Defining_Identifier (PN (P_Error)), N);
                   Append_Node_To_List (N, Statements);
                end if;
             end;
@@ -892,14 +903,22 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
               Parameter_Mode      => Mode_In);
          Append_Node_To_List (N, Profile);
 
+         N :=
+          Make_Parameter_Specification
+             (Defining_Identifier => Make_Defining_Identifier (PN (P_Error)),
+              Subtype_Mark        => RE (RE_Error_Kind),
+              Parameter_Mode      => Mode_Out);
+         Append_Node_To_List (N, Profile);
+
          --  The subprogram spec
 
          N :=
            Make_Subprogram_Specification
              (Defining_Identifier =>
                 Make_Defining_Identifier (Map_Send_Name (E)),
               Parameter_Profile => Profile,
-              Return_Type       => RE (RE_Error_Kind));
+              Return_Type       => No_Node);
+
          return N;
       end Internal_Send_Spec;
 
@@ -1026,7 +1045,9 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
                                       Make_Record_Aggregate
                                         (Make_List_Id (RE (RE_Error_None))));
 
-                                 N := Make_Return_Statement (N);
+                                 N := Make_Assignment_Statement
+                                    (Make_Defining_Identifier (PN (P_Error)),
+                                    N);
 
                                  --  Create the case statement alternative
 
@@ -1117,8 +1138,9 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
                                               Make_Defining_Identifier
                                                 (PN (P_Message)),
                                             Attribute => A_Length)));
-
-                                 N := Make_Return_Statement (N);
+                                 N := Make_Assignment_Statement
+                                    (Make_Defining_Identifier (PN (P_Error)),
+                                    N);
 
                                  --  Create the case statement alternative
 
@@ -1216,7 +1238,8 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
                       (RE (RE_Error_Kind),
                        Make_Record_Aggregate
                          (Make_List_Id (RE (RE_Error_Transport))));
-                  N := Make_Return_Statement (N);
+                  N := Make_Assignment_Statement
+                  (Make_Defining_Identifier (PN (P_Error)), N);
                   Append_Node_To_List (N, Else_Statements);
 
                   ADN.Set_First_Node
@@ -1241,7 +1264,8 @@ package body Ocarina.Backends.PO_HI_Ada.Transport is
                    (RE (RE_Error_Kind),
                     Make_Record_Aggregate
                       (Make_List_Id (RE (RE_Error_Transport))));
-               N := Make_Return_Statement (N);
+               N := Make_Assignment_Statement
+               (Make_Defining_Identifier (PN (P_Error)), N);
                Append_Node_To_List (N, Statements);
             end if;
          end if;