Commit 54df6737 authored by yoogx's avatar yoogx
Browse files

* Minor reformatting for GNAT GPL 2014 & GCC 4.9.x

parent 78b6cd55
...@@ -2,25 +2,16 @@ include $(top_srcdir)/Makefile.common ...@@ -2,25 +2,16 @@ include $(top_srcdir)/Makefile.common
# The order of the project files is important for saving compile time # The order of the project files is important for saving compile time
BUILD_PROJECTS=\ BUILD_PROJECTS= ocarina-core.gpr ocarina-frontends.gpr \
ocarina-core.gpr \ ocarina-backends.gpr ocarina-config.gpr ocarina-transfo.gpr \
ocarina-frontends.gpr \
ocarina-backends.gpr \
ocarina-config.gpr \
ocarina-transfo.gpr \
ocarina-main.gpr ocarina-main.gpr
# All project files have to be packaged with "make dist" # All project files have to be packaged with "make dist"
EXTRA_DIST=\ EXTRA_DIST= $(srcdir)/ocarina.gpr.in $(srcdir)/ocarina-frontends.gpr \
$(srcdir)/ocarina.gpr.in \ $(srcdir)/ocarina-backends.gpr $(srcdir)/ocarina-core.gpr \
$(srcdir)/ocarina-frontends.gpr \ $(srcdir)/ocarina-main.gpr $(srcdir)/ocarina-transfo.gpr \
$(srcdir)/ocarina-backends.gpr \ $(srcdir)/ocarina-config.gpr $(srcdir)/restrictions.adc
$(srcdir)/ocarina-core.gpr \
$(srcdir)/ocarina-main.gpr \
$(srcdir)/ocarina-transfo.gpr \
$(srcdir)/ocarina-config.gpr \
$(srcdir)/restrictions.adc
BUILD_STAMPS = $(BUILD_PROJECTS:.gpr=.gpr-build) BUILD_STAMPS = $(BUILD_PROJECTS:.gpr=.gpr-build)
...@@ -30,20 +21,19 @@ CLEAN_STAMPS = $(CLEAN_PROJECTS:.gpr=.gpr-clean) ...@@ -30,20 +21,19 @@ CLEAN_STAMPS = $(CLEAN_PROJECTS:.gpr=.gpr-clean)
# Object directories (*.o, *.ali) # Object directories (*.o, *.ali)
OBJECT_DIRS = $(top_builddir)/src/core/objects \ OBJECT_DIRS = $(top_builddir)/src/core/objects \
$(top_builddir)/src/frontends/objects \ $(top_builddir)/src/frontends/objects \
$(top_builddir)/src/backends/objects \ $(top_builddir)/src/backends/objects \
$(top_builddir)/src/transfo/objects \ $(top_builddir)/src/transfo/objects \
$(top_builddir)/src/main/objects $(top_builddir)/src/main/objects
# Library directories (*.ali, *.a) # Library directories (*.ali, *.a)
LIB_DIRS = $(top_builddir)/src/core/libs \ LIB_DIRS = $(top_builddir)/src/core/libs \
$(top_builddir)/src/frontends/libs \ $(top_builddir)/src/frontends/libs \
$(top_builddir)/src/backends/libs \ $(top_builddir)/src/backends/libs \
$(top_builddir)/src/transfo/libs \ $(top_builddir)/src/transfo/libs \
$(top_builddir)/src/config/libs \ $(top_builddir)/src/config/libs $(top_builddir)/src/main/libs
$(top_builddir)/src/main/libs
# All directories used for the build process. If the configure is # All directories used for the build process. If the configure is
# performed from a directory different from the top source directory, # performed from a directory different from the top source directory,
...@@ -60,17 +50,16 @@ BUILD_DIRS_STAMPS = $(BUILD_DIRS:=-stamp) ...@@ -60,17 +50,16 @@ BUILD_DIRS_STAMPS = $(BUILD_DIRS:=-stamp)
# Pseudo-IDL files that are used to generate the tree manipulators. # Pseudo-IDL files that are used to generate the tree manipulators.
TREE_PIDL_SPECS = \ TREE_PIDL_SPECS = src/core/tree/ocarina-me_aadl-aadl_tree-nodes.idl \
src/core/tree/ocarina-me_aadl-aadl_tree-nodes.idl \ src/core/tree/ocarina-me_aadl-aadl_instances-nodes.idl \
src/core/tree/ocarina-me_aadl-aadl_instances-nodes.idl \ src/core/tree/ocarina-me_aadl_ba-ba_tree-nodes.idl \
src/core/tree/ocarina-me_aadl_ba-ba_tree-nodes.idl \ src/core/tree/ocarina-me_real-real_tree-nodes.idl \
src/core/tree/ocarina-me_real-real_tree-nodes.idl \ src/backends/ocarina-backends-ada_tree-nodes.idl \
src/backends/ocarina-backends-ada_tree-nodes.idl \ src/backends/ocarina-backends-c_tree-nodes.idl \
src/backends/ocarina-backends-c_tree-nodes.idl \ src/backends/ocarina-backends-asn1_tree-nodes.idl \
src/backends/ocarina-backends-asn1_tree-nodes.idl \ src/backends/ocarina-backends-xml_tree-nodes.idl \
src/backends/ocarina-backends-xml_tree-nodes.idl \ src/backends/ocarina-backends-pn-nodes.idl \
src/backends/ocarina-backends-pn-nodes.idl \ src/backends/ocarina-backends-mast_tree-nodes.idl \
src/backends/ocarina-backends-mast_tree-nodes.idl \
src/backends/ocarina-backends-rtsj_tree-nodes.idl src/backends/ocarina-backends-rtsj_tree-nodes.idl
TREE_ADA_SPECS = ${addprefix $(top_builddir)/, $(TREE_PIDL_SPECS:.idl=.ads)} TREE_ADA_SPECS = ${addprefix $(top_builddir)/, $(TREE_PIDL_SPECS:.idl=.ads)}
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2011-2012 ESA & ISAE. -- -- Copyright (C) 2011-2014 ESA & ISAE. --
-- -- -- --
-- Ocarina is free software; you can redistribute it and/or modify -- -- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the -- -- it under terms of the GNU General Public License as published by the --
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
-- -- -- --
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with Namet; use Namet; with Namet; use Namet;
with Ocarina.Instances.Queries; use Ocarina.Instances.Queries; with Ocarina.Instances.Queries; use Ocarina.Instances.Queries;
with Ocarina.AADL_Values; with Ocarina.AADL_Values;
...@@ -52,7 +52,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -52,7 +52,7 @@ package body Ocarina.Backends.AADL_XML.Main is
use Ocarina.Backends.XML_Tree.Nutils; use Ocarina.Backends.XML_Tree.Nutils;
use Ocarina.Backends.AADL_XML.Mapping; use Ocarina.Backends.AADL_XML.Mapping;
package ATN renames Ocarina.ME_AADL.AADL_Tree.Nodes; package ATN renames Ocarina.ME_AADL.AADL_Tree.Nodes;
package AINU renames Ocarina.ME_AADL.AADL_Instances.Nutils; package AINU renames Ocarina.ME_AADL.AADL_Instances.Nutils;
package XTN renames Ocarina.Backends.XML_Tree.Nodes; package XTN renames Ocarina.Backends.XML_Tree.Nodes;
use type ATN.Node_Kind; use type ATN.Node_Kind;
...@@ -67,8 +67,8 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -67,8 +67,8 @@ package body Ocarina.Backends.AADL_XML.Main is
------------------- -------------------
function Map_Component (E : Node_Id) return Node_Id is function Map_Component (E : Node_Id) return Node_Id is
Category_Name_String : constant array (Component_Category'Range) Category_Name_String : constant array
of Name_Id := (Component_Category'Range) of Name_Id :=
(CC_Abstract => Get_String_Name ("abstract"), (CC_Abstract => Get_String_Name ("abstract"),
CC_Bus => Get_String_Name ("bus"), CC_Bus => Get_String_Name ("bus"),
CC_Data => Get_String_Name ("data"), CC_Data => Get_String_Name ("data"),
...@@ -85,8 +85,8 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -85,8 +85,8 @@ package body Ocarina.Backends.AADL_XML.Main is
CC_Virtual_Bus => Get_String_Name ("virtual bus"), CC_Virtual_Bus => Get_String_Name ("virtual bus"),
CC_Virtual_Processor => Get_String_Name ("virtual processor")); CC_Virtual_Processor => Get_String_Name ("virtual processor"));
N : Node_Id; N : Node_Id;
Classifier_Node : Node_Id; Classifier_Node : Node_Id;
begin begin
N := Make_XML_Node ("component"); N := Make_XML_Node ("component");
...@@ -113,8 +113,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -113,8 +113,7 @@ package body Ocarina.Backends.AADL_XML.Main is
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
(Make_Defining_Identifier (Get_String_Name ("identifier")), (Make_Defining_Identifier (Get_String_Name ("identifier")),
Make_Defining_Identifier Make_Defining_Identifier (Display_Name (Identifier (E)))),
(Display_Name (Identifier (E)))),
XTN.Items (N)); XTN.Items (N));
end if; end if;
...@@ -122,8 +121,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -122,8 +121,7 @@ package body Ocarina.Backends.AADL_XML.Main is
Classifier_Node := Make_XML_Node ("classifier"); Classifier_Node := Make_XML_Node ("classifier");
Append_Node_To_List Append_Node_To_List
(Make_Defining_Identifier (Make_Defining_Identifier (Display_Name (Identifier (E))),
(Display_Name (Identifier (E))),
XTN.Subitems (Classifier_Node)); XTN.Subitems (Classifier_Node));
Append_Node_To_List (Classifier_Node, XTN.Subitems (N)); Append_Node_To_List (Classifier_Node, XTN.Subitems (N));
...@@ -148,9 +146,9 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -148,9 +146,9 @@ package body Ocarina.Backends.AADL_XML.Main is
end if; end if;
end Visit_Subcomponents_Of; end Visit_Subcomponents_Of;
Root_System_Node : Node_Id := No_Node; Root_System_Node : Node_Id := No_Node;
AADL_XML_Node : Node_Id := No_Node; AADL_XML_Node : Node_Id := No_Node;
Current_XML_Node : Node_Id := No_Node; Current_XML_Node : Node_Id := No_Node;
----------- -----------
-- Visit -- -- Visit --
...@@ -176,20 +174,19 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -176,20 +174,19 @@ package body Ocarina.Backends.AADL_XML.Main is
--------------------- ---------------------
procedure Visit_Component (E : Node_Id) is procedure Visit_Component (E : Node_Id) is
Category : constant Component_Category Category : constant Component_Category := Get_Category_Of_Component (E);
:= Get_Category_Of_Component (E); N : Node_Id;
N : Node_Id;
Old_XML_Node : Node_Id;
Old_XML_Node : Node_Id; Subcomponents_Node : Node_Id;
Subcomponents_Node : Node_Id; Features_Node : Node_Id;
Features_Node : Node_Id; Properties_Node : Node_Id;
Properties_Node : Node_Id; Feature_Node : Node_Id;
Feature_Node : Node_Id; F : Node_Id;
F : Node_Id; P : Node_Id;
P : Node_Id; U : Node_Id;
U : Node_Id; Property_Node : Node_Id;
Property_Node : Node_Id; Components_Node : Node_Id;
Components_Node : Node_Id;
Property_Value_Node : Node_Id; Property_Value_Node : Node_Id;
AADL_Property_Value : Node_Id; AADL_Property_Value : Node_Id;
...@@ -212,10 +209,12 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -212,10 +209,12 @@ package body Ocarina.Backends.AADL_XML.Main is
XTN.Items (AADL_XML_Node)); XTN.Items (AADL_XML_Node));
Append_Node_To_List Append_Node_To_List
(AADL_XML_Node, XTN.Subitems (XTN.Root_Node (XTN.XML_File (U)))); (AADL_XML_Node,
XTN.Subitems (XTN.Root_Node (XTN.XML_File (U))));
Components_Node := Make_XML_Node ("components"); Components_Node := Make_XML_Node ("components");
Append_Node_To_List Append_Node_To_List
(Components_Node, XTN.Subitems (AADL_XML_Node)); (Components_Node,
XTN.Subitems (AADL_XML_Node));
end if; end if;
Current_XML_Node := Components_Node; Current_XML_Node := Components_Node;
end if; end if;
...@@ -240,8 +239,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -240,8 +239,7 @@ package body Ocarina.Backends.AADL_XML.Main is
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
(Make_Defining_Identifier (Get_String_Name ("identifier")), (Make_Defining_Identifier (Get_String_Name ("identifier")),
Make_Defining_Identifier Make_Defining_Identifier (Display_Name (Identifier (F)))),
(Display_Name (Identifier (F)))),
XTN.Items (Feature_Node)); XTN.Items (Feature_Node));
-- Direction: in/out/inout -- Direction: in/out/inout
...@@ -270,7 +268,8 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -270,7 +268,8 @@ package body Ocarina.Backends.AADL_XML.Main is
XTN.Items (Direction_Node)); XTN.Items (Direction_Node));
Append_Node_To_List Append_Node_To_List
(Direction_Node, XTN.Subitems (Feature_Node)); (Direction_Node,
XTN.Subitems (Feature_Node));
end; end;
-- Type: event/data/event data -- Type: event/data/event data
...@@ -300,8 +299,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -300,8 +299,7 @@ package body Ocarina.Backends.AADL_XML.Main is
Make_Defining_Identifier (Type_Kind)), Make_Defining_Identifier (Type_Kind)),
XTN.Items (Type_Node)); XTN.Items (Type_Node));
Append_Node_To_List Append_Node_To_List (Type_Node, XTN.Subitems (Feature_Node));
(Type_Node, XTN.Subitems (Feature_Node));
end; end;
-- Classifier -- Classifier
...@@ -315,7 +313,8 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -315,7 +313,8 @@ package body Ocarina.Backends.AADL_XML.Main is
(Display_Name (Identifier (Corresponding_Instance (F)))), (Display_Name (Identifier (Corresponding_Instance (F)))),
XTN.Subitems (Classifier_Node)); XTN.Subitems (Classifier_Node));
Append_Node_To_List Append_Node_To_List
(Classifier_Node, XTN.Subitems (Feature_Node)); (Classifier_Node,
XTN.Subitems (Feature_Node));
end; end;
Append_Node_To_List (Feature_Node, XTN.Subitems (Features_Node)); Append_Node_To_List (Feature_Node, XTN.Subitems (Features_Node));
...@@ -328,7 +327,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -328,7 +327,7 @@ package body Ocarina.Backends.AADL_XML.Main is
Subcomponents_Node := Make_XML_Node ("subcomponents"); Subcomponents_Node := Make_XML_Node ("subcomponents");
Append_Node_To_List (Subcomponents_Node, XTN.Subitems (N)); Append_Node_To_List (Subcomponents_Node, XTN.Subitems (N));
Old_XML_Node := Current_XML_Node; Old_XML_Node := Current_XML_Node;
Current_XML_Node := Subcomponents_Node; Current_XML_Node := Subcomponents_Node;
Visit_Subcomponents_Of (E); Visit_Subcomponents_Of (E);
Current_XML_Node := Old_XML_Node; Current_XML_Node := Old_XML_Node;
...@@ -350,19 +349,19 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -350,19 +349,19 @@ package body Ocarina.Backends.AADL_XML.Main is
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
(Make_Defining_Identifier (Get_String_Name ("name")), (Make_Defining_Identifier (Get_String_Name ("name")),
Make_Defining_Identifier Make_Defining_Identifier (Display_Name (Identifier (F)))),
(Display_Name (Identifier (F)))),
XTN.Items (Property_Node)); XTN.Items (Property_Node));
Property_Value_Node := Make_XML_Node ("property_value"); Property_Value_Node := Make_XML_Node ("property_value");
Append_Node_To_List Append_Node_To_List
(Property_Value_Node, XTN.Subitems (Property_Node)); (Property_Value_Node,
XTN.Subitems (Property_Node));
AADL_Property_Value := Get_Value_Of_Property_Association AADL_Property_Value :=
(E, Name (Identifier (F))); Get_Value_Of_Property_Association (E, Name (Identifier (F)));
if Present (AADL_Property_Value) if Present (AADL_Property_Value)
and then ATN.Kind (AADL_Property_Value) = ATN.K_SIGNED_AADLNUMBER and then ATN.Kind (AADL_Property_Value) = ATN.K_Signed_AADLNumber
and then Present (ATN.Unit_Identifier (AADL_Property_Value)) and then Present (ATN.Unit_Identifier (AADL_Property_Value))
then then
-- This property value denotes a property with a unit -- This property value denotes a property with a unit
...@@ -373,7 +372,8 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -373,7 +372,8 @@ package body Ocarina.Backends.AADL_XML.Main is
begin begin
Unit_Node := Make_XML_Node ("unit"); Unit_Node := Make_XML_Node ("unit");
Append_Node_To_List Append_Node_To_List
(Unit_Node, XTN.Subitems (Property_Value_Node)); (Unit_Node,
XTN.Subitems (Property_Value_Node));
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
...@@ -391,13 +391,12 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -391,13 +391,12 @@ package body Ocarina.Backends.AADL_XML.Main is
(Make_Defining_Identifier (Get_String_Name ("unit")), (Make_Defining_Identifier (Get_String_Name ("unit")),
Make_Defining_Identifier Make_Defining_Identifier
(ATN.Display_Name (ATN.Display_Name
(ATN.Unit_Identifier (ATN.Unit_Identifier (AADL_Property_Value)))),
(AADL_Property_Value)))),
XTN.Items (Unit_Node)); XTN.Items (Unit_Node));
end; end;
elsif Present (AADL_Property_Value) elsif Present (AADL_Property_Value)
and then ATN.Kind (AADL_Property_Value) = ATN.K_SIGNED_AADLNUMBER and then ATN.Kind (AADL_Property_Value) = ATN.K_Signed_AADLNumber
and then and then
(not Present (ATN.Unit_Identifier (AADL_Property_Value))) (not Present (ATN.Unit_Identifier (AADL_Property_Value)))
then then
...@@ -408,7 +407,8 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -408,7 +407,8 @@ package body Ocarina.Backends.AADL_XML.Main is
begin begin
Unit_Node := Make_XML_Node ("value"); Unit_Node := Make_XML_Node ("value");
Append_Node_To_List Append_Node_To_List
(Unit_Node, XTN.Subitems (Property_Value_Node)); (Unit_Node,
XTN.Subitems (Property_Value_Node));
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
...@@ -423,7 +423,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -423,7 +423,7 @@ package body Ocarina.Backends.AADL_XML.Main is
end; end;
elsif Present (AADL_Property_Value) elsif Present (AADL_Property_Value)
and then ATN.Kind (AADL_Property_Value) = ATN.K_LITERAL and then ATN.Kind (AADL_Property_Value) = ATN.K_Literal
then then
-- This property value denotes a literal -- This property value denotes a literal
...@@ -432,7 +432,8 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -432,7 +432,8 @@ package body Ocarina.Backends.AADL_XML.Main is
begin begin
Unit_Node := Make_XML_Node ("value"); Unit_Node := Make_XML_Node ("value");
Append_Node_To_List Append_Node_To_List
(Unit_Node, XTN.Subitems (Property_Value_Node)); (Unit_Node,
XTN.Subitems (Property_Value_Node));
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
...@@ -446,7 +447,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -446,7 +447,7 @@ package body Ocarina.Backends.AADL_XML.Main is
end; end;
elsif Present (AADL_Property_Value) elsif Present (AADL_Property_Value)
and then ATN.Kind (AADL_Property_Value) = ATN.K_REFERENCE_TERM and then ATN.Kind (AADL_Property_Value) = ATN.K_Reference_Term
then then
-- This property value denotes a reference term -- This property value denotes a reference term
...@@ -455,7 +456,8 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -455,7 +456,8 @@ package body Ocarina.Backends.AADL_XML.Main is
begin begin
Unit_Node := Make_XML_Node ("reference"); Unit_Node := Make_XML_Node ("reference");
Append_Node_To_List Append_Node_To_List
(Unit_Node, XTN.Subitems (Property_Value_Node)); (Unit_Node,
XTN.Subitems (Property_Value_Node));
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
...@@ -470,7 +472,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -470,7 +472,7 @@ package body Ocarina.Backends.AADL_XML.Main is
end; end;
elsif Present (AADL_Property_Value) elsif Present (AADL_Property_Value)
and then ATN.Kind (AADL_Property_Value) = ATN.K_ENUMERATION_TERM and then ATN.Kind (AADL_Property_Value) = ATN.K_Enumeration_Term
then then
-- This property value denotes an enumeration term -- This property value denotes an enumeration term
...@@ -479,19 +481,20 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -479,19 +481,20 @@ package body Ocarina.Backends.AADL_XML.Main is
begin begin
Unit_Node := Make_XML_Node ("value"); Unit_Node := Make_XML_Node ("value");
Append_Node_To_List Append_Node_To_List
(Unit_Node, XTN.Subitems (Property_Value_Node)); (Unit_Node,
XTN.Subitems (Property_Value_Node));
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
(Make_Defining_Identifier (Get_String_Name ("value")), (Make_Defining_Identifier (Get_String_Name ("value")),
Make_Defining_Identifier Make_Defining_Identifier
(ATN.Display_Name (ATN.Identifier (ATN.Display_Name
(AADL_Property_Value)))), (ATN.Identifier (AADL_Property_Value)))),
XTN.Items (Unit_Node)); XTN.Items (Unit_Node));
end; end;
elsif Present (AADL_Property_Value) elsif Present (AADL_Property_Value)
and then ATN.Kind (AADL_Property_Value) = ATN.K_NUMBER_RANGE_TERM and then ATN.Kind (AADL_Property_Value) = ATN.K_Number_Range_Term
then then
-- This property value denotes a number range term -- This property value denotes a number range term
...@@ -500,7 +503,8 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -500,7 +503,8 @@ package body Ocarina.Backends.AADL_XML.Main is
begin begin
Unit_Node := Make_XML_Node ("range"); Unit_Node := Make_XML_Node ("range");
Append_Node_To_List Append_Node_To_List
(Unit_Node, XTN.Subitems (Property_Value_Node)); (Unit_Node,
XTN.Subitems (Property_Value_Node));
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
...@@ -528,9 +532,9 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -528,9 +532,9 @@ package body Ocarina.Backends.AADL_XML.Main is
(AADL_Property_Value))))))), (AADL_Property_Value))))))),
XTN.Items (Unit_Node)); XTN.Items (Unit_Node));
if Present (ATN.Unit_Identifier if Present
(ATN.Lower_Bound (ATN.Unit_Identifier
(AADL_Property_Value))) (ATN.Lower_Bound (AADL_Property_Value)))
then then
Append_Node_To_List Append_Node_To_List
(Make_Assignement (Make_Assignement
...@@ -538,8 +542,7 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -538,8 +542,7 @@ package body Ocarina.Backends.AADL_XML.Main is
Make_Defining_Identifier Make_Defining_Identifier
(ATN.Display_Name (ATN.Display_Name
(ATN.Unit_Identifier (ATN.Unit_Identifier
(ATN.Lower_Bound (ATN.Lower_Bound (AADL_Property_Value))))),
(AADL_Property_Value))))),
XTN.Items (Unit_Node)); XTN.Items (Unit_Node));
end if; end if;
end; end;
...@@ -550,15 +553,17 @@ package body Ocarina.Backends.AADL_XML.Main is ...@@ -550,15 +553,17 @@ package body Ocarina.Backends.AADL_XML.Main is
declare declare
Unit_Node : Node_Id; Unit_Node : Node_Id;
begin begin
Unit_Node := Make_XML_Node Unit_Node :=
(ATN.Kind (AADL_Property_Value)'Img); Make_XML_Node (ATN.Kind (AADL_Property_Value)'Img);
Append_Node_To_List Append_Node_To_List
(Unit_Node, XTN.Subitems (Property_Value_Node)); (Unit_Node,
XTN.Subitems (Property_Value_Node));
end; end;
end if; end if;
Append_Node_To_List Append_Node_To_List
(Property_Node, XTN.Subitems (Properties_Node)); (Property_Node,
XTN.Subitems (Properties_Node));
F := Next_Node (F); F := Next_Node (F);
end loop; end loop;