Work in progress

ada/buildsupport.adb

@@ -11,8 +11,8 @@ with Ada.Strings.Unbounded,
      GNAT.OS_Lib,
      Errors,
      Locations,
-     Namet,
-     Types,
+     Ocarina.Namet,
+     Ocarina.Types,
      System.Assertions,
      Ocarina.Analyzer,
      Ocarina.Backends.Properties,
@@ -35,8 +35,8 @@ use Ada.Strings.Unbounded,
     Ada.Text_IO,
     Ada.Characters.Handling,
     Locations,
-    Namet,
-    Types,
+    Ocarina.Namet,
+    Ocarina.Types,
     Ocarina,
     Ocarina.Analyzer,
     Ocarina.Backends.Properties,
@@ -779,7 +779,8 @@ procedure BuildSupport is
                   "programming_properties.aadl" &
                   "memory_properties.aadl" &
                   "modeling_properties.aadl" &
-                  "arinc653_properties.aadl" &
+                  "arinc653.aadl" &
+                  --  "arinc653_properties.aadl" &
                   "base_types.aadl" &
                   "data_model.aadl" &
                   "deployment.aadl";

ada/buildsupport_utils.adb

@@ -604,7 +604,7 @@ package body Buildsupport_Utils is
          CI           : constant Node_Id := Corresponding_Instance (Func);
          Name         : constant String := AIN_Case (Func);
          Next_Prefix  : constant String := Prefix &
-                           (if Prefix'Length > 0 then "_" else "") & Name;
+                           (if Prefix'Length > 0 then "." else "") & Name;
       begin
 
          case Get_Category_Of_Component (CI) is
@@ -619,7 +619,7 @@ package body Buildsupport_Utils is
                end if;
 
                --  Routes := Routes & Parse_System_Connections (CI);
-               Routes_Map.Insert (Key => Name,
+               Routes_Map.Insert (Key      => Name,
                                   New_Item => Parse_System_Connections (CI));
 
                if No (AIN.Subcomponents (CI)) or Res = Functions.Empty_Vector
@@ -644,8 +644,7 @@ package body Buildsupport_Utils is
          Current_Function := AIN.Next_Node (Current_Function);
       end loop;
 
-      --  Routes := Routes & Parse_System_Connections (System);
-      Routes_Map.Insert (Key => "_Root",
+      Routes_Map.Insert (Key      => "_Root",
                          New_Item => Parse_System_Connections (System));
       for C in Routes_Map.Iterate loop
          Put_Line ("Routes of Function " & Connection_Maps.Key (C));

ada/buildsupport_utils.ads

@@ -5,8 +5,8 @@
 --  Set of helper functions for buildsupport
 with Ocarina,
      --  Ocarina.Types,
-     Types,
-     Namet,
+     Ocarina.Types,
+     Ocarina.Namet,
      Ocarina.Backends.Properties,
      Ada.Containers.Indefinite_Ordered_Maps,
      Ada.Containers.Indefinite_Vectors,
@@ -16,8 +16,8 @@ with Ocarina,
      Option_Type;
 
 use Ocarina,
-    Types,
-    Namet,
+    Ocarina.Types,
+    Ocarina.Namet,
     Ocarina.Backends.Properties,
     Ocarina.ME_AADL.AADL_Tree.Nodes,
     Ocarina.ME_AADL.AADL_Instances.Nodes,

ada/imported_routines.ads

@@ -2,8 +2,8 @@
 --  (c) 2015 European Space Agency - maxime.perrotin@esa.int
 --  LGPL license, see LICENSE file
 
---  with Ocarina.Types; use Ocarina.Types;
-with Types; use Types;
+with Ocarina.Types; use Ocarina.Types;
+--  with Types; use Types;
 
 package Imported_Routines is