Commit 9405df9b authored by yoogx's avatar yoogx
Browse files

* Renamed Namet to Ocarina.Namet, Output to Ocarina.Output to

          avoid collision with external packages
parent f4b3e4ea
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -32,7 +32,7 @@
------------------------------------------------------------------------------
with Ocarina.Instances.Queries;
with Namet;
with Ocarina.Namet;
package body Ocarina.Instances.REAL_Checker.Queries.Bound_Predicates is
use Ocarina.Instances.Queries;
......@@ -48,7 +48,7 @@ package body Ocarina.Instances.REAL_Checker.Queries.Bound_Predicates is
return Boolean
is
pragma Unreferenced (Option);
use Namet;
use Ocarina.Namet;
Str_1 : constant Name_Id := Get_String_Name
("actual_processor_binding");
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2012 ESA & ISAE. --
-- Copyright (C) 2012-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -33,7 +33,7 @@
with Ocarina.ME_AADL.AADL_Instances.Nodes;
with Ocarina.Instances.Queries;
with Namet;
with Ocarina.Namet;
package body Ocarina.Instances.REAL_Checker.Queries.Provided_Class_Predicates
is
......@@ -51,7 +51,7 @@ is
return Boolean
is
pragma Unreferenced (Option);
use Namet;
use Ocarina.Namet;
Str_1 : constant Name_Id := Get_String_Name
("provided_virtual_bus_class");
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -41,8 +41,8 @@ with Ocarina.Instances.Finder;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Debug;
with Ocarina.ME_AADL.AADL_Instances.Nutils;
with Namet; use Namet;
with Output; use Output;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.Output; use Ocarina.Output;
package body Ocarina.Instances.REAL_Checker.Queries is
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2013 ESA & ISAE. --
-- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -33,8 +33,8 @@
with Errors;
with Locations;
with Namet;
with Output;
with Ocarina.Namet;
with Ocarina.Output;
with Ocarina.ME_AADL.AADL_Tree.Nodes;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
......@@ -55,8 +55,8 @@ package body Ocarina.Instances is
use Errors;
use Locations;
use Namet;
use Output;
use Ocarina.Namet;
use Ocarina.Output;
use Ocarina.ME_AADL.AADL_Tree.Nodes;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -40,10 +40,10 @@ with Ocarina.ME_AADL.AADL_Tree.Nutils;
with Ocarina.ME_AADL.AADL_Instances.Entities;
with Ocarina.Instances.Queries;
with GNAT.Dynamic_Tables;
with Namet;
with Ocarina.Namet;
package body Ocarina.REAL_Expander.Flow_Analysis is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL.AADL_Instances.Entities;
use Ocarina.ME_AADL;
use Ocarina.Instances.Queries;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -37,7 +37,7 @@ with Ocarina.ME_REAL.REAL_Tree.Nutils;
with Ocarina.Builder.REAL;
with Ocarina.Analyzer.REAL.Finder;
with Ocarina.REAL_Values;
with Namet;
with Ocarina.Namet;
package body Ocarina.REAL_Expander is
use Ocarina.ME_REAL.REAL_Tree.Nodes;
......@@ -45,7 +45,7 @@ package body Ocarina.REAL_Expander is
use Ocarina.ME_REAL.REAL_Tree.Nutils;
use Ocarina.Builder.REAL;
use Ocarina.Analyzer.REAL.Finder;
use Namet;
use Ocarina.Namet;
------------
-- Expand --
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -34,7 +34,7 @@
with GNAT.OS_Lib;
with Errors;
with Namet;
with Ocarina.Namet;
with Ocarina.Options; use Ocarina.Options;
......@@ -44,7 +44,7 @@ package body Ocarina.Files is
use GNAT.OS_Lib;
use Errors;
use Namet;
use Ocarina.Namet;
----------------------------
-- Add_File_To_Parse_List --
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with GNAT.OS_Lib; use GNAT.OS_Lib;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -33,8 +33,8 @@
with Charset; use Charset;
with Errors; use Errors;
with Namet; use Namet;
with Output; use Output;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.Output; use Ocarina.Output;
with Ocarina.Options; use Ocarina.Options;
with Ocarina.Property_Sets; use Ocarina.Property_Sets;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2005-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Errors;
with Ocarina.Me_AADL.AADL_Tree.Nutils;
with Ocarina.Me_AADL.AADL_Instances.Nutils;
......@@ -44,9 +44,9 @@ package body Ocarina is
----------------
procedure Initialize is
use Namet;
use Ocarina.Namet;
begin
Namet.Initialize;
Ocarina.Namet.Initialize;
Errors.Initialize;
V_Zero := New_Integer_Value (0);
V_One := New_Integer_Value (1);
......@@ -58,7 +58,7 @@ package body Ocarina is
procedure Reset is
begin
Namet.Initialize;
Ocarina.Namet.Initialize;
Errors.Initialize;
Ocarina.Me_AADL.AADL_Tree.Nutils.Reset_Nodes;
Ocarina.Me_AADL.AADL_Instances.Nutils.Reset_Nodes;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2013 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Ocarina.Analyzer.AADL.Naming_Rules;
with Ocarina.Analyzer.Messages;
......@@ -45,7 +45,7 @@ with Ocarina.Property_Sets;
package body Ocarina.Analyzer.AADL.Finder is
use Namet;
use Ocarina.Namet;
use Ocarina.Analyzer.AADL.Naming_Rules;
use Ocarina.Analyzer.Messages;
use Ocarina.ME_AADL;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -32,7 +32,7 @@
------------------------------------------------------------------------------
with Errors;
with Namet;
with Ocarina.Namet;
with Ocarina.Analyzer.Messages;
......@@ -44,7 +44,7 @@ with Ocarina.ME_AADL.AADL_Tree.Entities;
package body Ocarina.Analyzer.AADL.Naming_Rules is
use Errors;
use Namet;
use Ocarina.Namet;
use Ocarina.Analyzer.Messages;
use Ocarina.ME_AADL;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -32,7 +32,7 @@
------------------------------------------------------------------------------
with Errors;
with Namet;
with Ocarina.Namet;
with Ocarina.AADL_Values;
......@@ -51,7 +51,7 @@ with Ocarina.Processor.Properties;
package body Ocarina.Analyzer.AADL.Semantics is
use Errors;
use Namet;
use Ocarina.Namet;
use Ocarina.AADL_Values;
use Ocarina.Analyzer.Messages;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2004-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2004-2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -31,8 +31,8 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Output;
with Ocarina.Namet;
with Ocarina.Output;
with Ocarina.Me_AADL.AADL_Tree.Debug;
with Ocarina.Me_AADL.AADL_Tree.Entities.Properties;
......@@ -56,7 +56,7 @@ package body Ocarina.Analyzer.Messages is
-----------------------
procedure Display_Node_Link (Node1 : Node_Id; Node2 : Node_Id) is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
begin
......@@ -95,9 +95,9 @@ package body Ocarina.Analyzer.Messages is
Loc : Location := No_Location)
is
use Ocarina.Me_AADL.AADL_Tree.Debug;
use Namet;
use Ocarina.Namet;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
use Output;
use Ocarina.Output;
use Ocarina.ME_AADL;
begin
......@@ -160,8 +160,8 @@ package body Ocarina.Analyzer.Messages is
Name : Name_Id;
Loc2 : Location)
is
use Namet;
use Output;
use Ocarina.Namet;
use Ocarina.Output;
begin
Set_Standard_Error;
......@@ -183,8 +183,8 @@ package body Ocarina.Analyzer.Messages is
(Ident1 : Node_Id;
Ident2 : Node_Id)
is
use Namet;
use Output;
use Ocarina.Namet;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
begin
......@@ -215,7 +215,7 @@ package body Ocarina.Analyzer.Messages is
(Loc : Location;
Kind : Ocarina.Me_AADL.AADL_Tree.Nodes.Node_Kind)
is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Debug;
begin
Write_Str (Image (Loc));
......@@ -232,8 +232,8 @@ package body Ocarina.Analyzer.Messages is
Kind : Ocarina.Me_AADL.AADL_Tree.Nodes.Node_Kind;
Name : Name_Id)
is
use Namet;
use Output;
use Ocarina.Namet;
use Ocarina.Output;
begin
Set_Standard_Error;
......@@ -254,8 +254,8 @@ package body Ocarina.Analyzer.Messages is
Item : Node_Id)
is
use Ocarina.Me_AADL.AADL_Tree.Nodes;
use Output;
use Namet;
use Ocarina.Output;
use Ocarina.Namet;
begin
Set_Standard_Error;
......@@ -279,8 +279,8 @@ package body Ocarina.Analyzer.Messages is
Loc : Location)
is
use Ocarina.Me_AADL.AADL_Tree.Nodes;
use Output;
use Namet;
use Ocarina.Output;
use Ocarina.Namet;
begin
Set_Standard_Error;
......@@ -309,8 +309,8 @@ package body Ocarina.Analyzer.Messages is
Loc : Location)
is
use Ocarina.Me_AADL.AADL_Tree.Nodes;
use Output;
use Namet;
use Ocarina.Output;
use Ocarina.Namet;
begin
Set_Standard_Error;
......@@ -362,7 +362,7 @@ package body Ocarina.Analyzer.Messages is
-------------------
procedure Debug_Message (Location : String; Message : String) is
use Output;
use Ocarina.Output;
begin
if D_Analyzer then
Set_Standard_Error;
......@@ -380,7 +380,7 @@ package body Ocarina.Analyzer.Messages is
------------------------------
procedure Display_Cyclic_Extension (Cycling_Node : Node_Id) is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
pragma Assert (Present (Cycling_Node));
......@@ -398,7 +398,7 @@ package body Ocarina.Analyzer.Messages is
------------------------------
procedure Display_Cyclic_Inversion (Cycling_Node : Node_Id) is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
pragma Assert (Present (Cycling_Node));
......@@ -416,7 +416,7 @@ package body Ocarina.Analyzer.Messages is
----------------------------------
procedure Display_Cyclic_Subcomponents (Cycling_Node : Node_Id) is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
pragma Assert (Present (Cycling_Node));
......@@ -437,7 +437,7 @@ package body Ocarina.Analyzer.Messages is
(Initial_Mode : Node_Id;
Existing_Initial_Mode : Node_Id)
is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
pragma Assert (Kind (Initial_Mode) = K_Mode);
......@@ -465,9 +465,9 @@ package body Ocarina.Analyzer.Messages is
is
use Ocarina.ME_AADL;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
use Namet;
use Ocarina.Namet;
use Ocarina.Me_AADL.AADL_Tree.Debug;
use Output;
use Ocarina.Output;
pragma Assert (Present (Node));
......@@ -528,7 +528,7 @@ package body Ocarina.Analyzer.Messages is
Property_Value : Node_Id;
Property_Name : Node_Id)
is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
pragma Assert (Kind (Property_Name) = K_Property_Definition_Declaration);
......@@ -566,7 +566,7 @@ package body Ocarina.Analyzer.Messages is
----------------------------------------
procedure Display_Inconsistent_Property_Type (Property_Type : Node_Id) is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
pragma Assert (Present (Property_Type));
......@@ -586,8 +586,8 @@ package body Ocarina.Analyzer.Messages is
Property_Value2 : Node_Id;
Reference_Property : Node_Id)
is
use Output;
use Namet;
use Ocarina.Output;
use Ocarina.Namet;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
use Ocarina.Me_AADL.AADL_Tree.Debug;
......@@ -655,7 +655,7 @@ package body Ocarina.Analyzer.Messages is
(Property_Association : Node_Id;
Property_Name : Node_Id)
is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
pragma Assert (Kind (Property_Name) = K_Property_Definition_Declaration);
......@@ -695,7 +695,7 @@ package body Ocarina.Analyzer.Messages is
(Property_Association : Node_Id;
Property_Name : Node_Id)
is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
pragma Assert (Kind (Property_Name) = K_Property_Definition_Declaration);
......@@ -727,7 +727,7 @@ package body Ocarina.Analyzer.Messages is
(Property_Association : Node_Id;
Entity : Node_Id)
is
use Output;
use Ocarina.Output;
use Ocarina.Me_AADL.AADL_Tree.Nodes;
pragma Assert (Kind (Property_Association) = K_Property_Association);
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Utils;
with Ocarina.Builder.REAL;
with Ocarina.Analyzer.AADL.Finder;
......@@ -43,7 +43,7 @@ with Ocarina.ME_AADL.AADL_Tree.Nodes;
package body Ocarina.Analyzer.REAL.Finder is
use Namet;
use Ocarina.Namet;
use Ocarina.Builder.REAL;
use Ocarina.ME_REAL.REAL_Tree.Nodes;
use Ocarina.ME_REAL.REAL_Tree.Utils;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --
-- it under terms of the GNU General Public License as published by the --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Errors;
with Ocarina.Analyzer.Messages;
......@@ -51,7 +51,7 @@ with Ocarina.REAL_Expander.Flow_Analysis;
package body Ocarina.Analyzer.REAL is
use Namet;
use Ocarina.Namet;
use Errors;
use Ocarina.Analyzer.REAL.Finder;
use Ocarina.Analyzer.Messages;
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2012 ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-2014 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify --