From 39973bad3af65ebd5f0581914288a89fedfb3e5f Mon Sep 17 00:00:00 2001
From: yoogx <hugues.jerome@gmail.com>
Date: Thu, 14 Jan 2021 18:34:50 -0500
Subject: [PATCH]         * Code simplification

        For issue#61
---
 src/backends/aadl_xml/ocarina-backends-aadl_xml-main.adb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/backends/aadl_xml/ocarina-backends-aadl_xml-main.adb b/src/backends/aadl_xml/ocarina-backends-aadl_xml-main.adb
index 2a4f8b16..404eec99 100644
--- a/src/backends/aadl_xml/ocarina-backends-aadl_xml-main.adb
+++ b/src/backends/aadl_xml/ocarina-backends-aadl_xml-main.adb
@@ -153,8 +153,6 @@ package body Ocarina.Backends.AADL_XML.Main is
    -- Visit_Component --
    ---------------------
 
-   Root_System_Processed : boolean := False;
-
    procedure Visit_Component (E : Node_Id) is
       Category : constant Component_Category := Get_Category_Of_Component (E);
       N        : Node_Id;
@@ -174,9 +172,8 @@ package body Ocarina.Backends.AADL_XML.Main is
 
    begin
       if Category = CC_System and then
-        not Root_System_Processed
+        E = Root_System_Node
       then
-         Root_system_Processed := True;
          P := Map_HI_Node (E);
          Push_Entity (P);
 
@@ -553,7 +550,9 @@ package body Ocarina.Backends.AADL_XML.Main is
          end loop;
       end if;
 
-      if Category = CC_System then
+      if Category = CC_System and then
+        E = Root_System_Node
+      then
          Pop_Entity;
          Pop_Entity; --  A
       end if;