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 @@ ...@@ -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 Ocarina.Namet; use Ocarina.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;
......
...@@ -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 Ocarina.Namet; use Ocarina.Namet;
with Ocarina.ME_AADL.AADL_Instances.Nodes; with Ocarina.ME_AADL.AADL_Instances.Nodes;
with Ocarina.ME_AADL.AADL_Instances.Nutils; with Ocarina.ME_AADL.AADL_Instances.Nutils;
......
...@@ -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 --
...@@ -41,7 +41,7 @@ with Ocarina.Backends.XML_Tree.Nutils; ...@@ -41,7 +41,7 @@ with Ocarina.Backends.XML_Tree.Nutils;
with Ocarina.Backends.XML_Tree.Generator; with Ocarina.Backends.XML_Tree.Generator;
with GNAT.Command_Line; use GNAT.Command_Line; with GNAT.Command_Line; use GNAT.Command_Line;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.Backends.AADL_XML is package body Ocarina.Backends.AADL_XML is
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2006-2009 Telecom ParisTech, 2010-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 --
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
with Charset; use Charset; with Charset; use Charset;
with Locations; use Locations; with Locations; use Locations;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Utils; use Utils; with Utils; use Utils;
with Ocarina.Backends.Ada_Values; use Ocarina.Backends.Ada_Values; with Ocarina.Backends.Ada_Values; use Ocarina.Backends.Ada_Values;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2006-2009 Telecom ParisTech, 2010-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 Output; use Output; with Ocarina.Output; use Ocarina.Output;
with Ocarina.Backends.Ada_Tree.Nodes; use Ocarina.Backends.Ada_Tree.Nodes; with Ocarina.Backends.Ada_Tree.Nodes; use Ocarina.Backends.Ada_Tree.Nodes;
...@@ -39,10 +39,10 @@ package Ocarina.Backends.Ada_Tree.Debug is ...@@ -39,10 +39,10 @@ package Ocarina.Backends.Ada_Tree.Debug is
N_Indents : Natural := 0; N_Indents : Natural := 0;
procedure W_Eol (N : Natural := 1) renames Output.Write_Eol; procedure W_Eol (N : Natural := 1) renames Ocarina.Output.Write_Eol;
procedure W_Int (N : Int) renames Output.Write_Int; procedure W_Int (N : Int) renames Ocarina.Output.Write_Int;
procedure W_Line (N : String) renames Output.Write_Line; procedure W_Line (N : String) renames Ocarina.Output.Write_Line;
procedure W_Str (N : String) renames Output.Write_Str; procedure W_Str (N : String) renames Ocarina.Output.Write_Str;
procedure W_Indents; procedure W_Indents;
procedure W_Boolean (N : Boolean); procedure W_Boolean (N : Boolean);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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,8 +31,8 @@ ...@@ -31,8 +31,8 @@
-- -- -- --
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Output; use Output; with Ocarina.Output; use Ocarina.Output;
with Ocarina.Backends.Ada_Tree.Nodes; with Ocarina.Backends.Ada_Tree.Nodes;
with Ocarina.Backends.Ada_Tree.Nutils; with Ocarina.Backends.Ada_Tree.Nutils;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-2013 ESA & ISAE. -- -- Copyright (C) 2006-2009 Telecom ParisTech, 2010-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,8 +31,8 @@ ...@@ -31,8 +31,8 @@
-- -- -- --
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Output; use Output; with Ocarina.Output; use Ocarina.Output;
with Utils; use Utils; with Utils; use Utils;
with Outfiles; use Outfiles; with Outfiles; use Outfiles;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-2013 ESA & ISAE. -- -- Copyright (C) 2006-2009 Telecom ParisTech, 2010-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 --
...@@ -36,8 +36,8 @@ with GNAT.Case_Util; ...@@ -36,8 +36,8 @@ with GNAT.Case_Util;
with Charset; use Charset; with Charset; use Charset;
with Locations; use Locations; with Locations; use Locations;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Output; use Output; with Ocarina.Output; use Ocarina.Output;
with Types; use Types; with Types; use Types;
with Utils; use Utils; with Utils; use Utils;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-2012 ESA & ISAE. -- -- Copyright (C) 2006-2009 Telecom ParisTech, 2010-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 Ocarina.Namet; use Ocarina.Namet;
with Ocarina.AADL_Values; with Ocarina.AADL_Values;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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 Ocarina.Namet; use Ocarina.Namet;
with Ocarina.ME_AADL; with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Tree.Nodes; with Ocarina.ME_AADL.AADL_Tree.Nodes;
with Ocarina.ME_AADL.AADL_Tree.Entities; with Ocarina.ME_AADL.AADL_Tree.Entities;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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 Ocarina.Namet; use Ocarina.Namet;
with Ocarina.ME_AADL; with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes; with Ocarina.ME_AADL.AADL_Instances.Nodes;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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 --
...@@ -48,7 +48,7 @@ with Ocarina.Backends.Utils; ...@@ -48,7 +48,7 @@ with Ocarina.Backends.Utils;
with GNAT.Command_Line; use GNAT.Command_Line; with GNAT.Command_Line; use GNAT.Command_Line;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.Backends.ARINC653_Conf is package body Ocarina.Backends.ARINC653_Conf is
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2010-2012 ESA & ISAE. -- -- Copyright (C) 2010-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 Ocarina.Namet; use Ocarina.Namet;
with Utils; use Utils; with Utils; use Utils;
with Ocarina.ME_AADL; with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes; with Ocarina.ME_AADL.AADL_Instances.Nodes;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2010-2012 ESA & ISAE. -- -- Copyright (C) 2010-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 --
...@@ -40,13 +40,13 @@ with Ocarina.Backends.ASN1.Deployment; ...@@ -40,13 +40,13 @@ with Ocarina.Backends.ASN1.Deployment;
with Ocarina.Backends.Utils; with Ocarina.Backends.Utils;
with GNAT.Command_Line; with GNAT.Command_Line;
with Namet; with Ocarina.Namet;
package body Ocarina.Backends.ASN1 is package body Ocarina.Backends.ASN1 is
use GNAT.Command_Line; use GNAT.Command_Line;
use Namet; use Ocarina.Namet;
use Ocarina.Backends.Messages; use Ocarina.Backends.Messages;
use Ocarina.Backends.ASN1_Tree.Generator; use Ocarina.Backends.ASN1_Tree.Generator;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2010-2012 ESA & ISAE. -- -- Copyright (C) 2010-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 --
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
with Charset; use Charset; with Charset; use Charset;
with Locations; use Locations; with Locations; use Locations;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Utils; use Utils; with Utils; use Utils;
with Ocarina.Backends.ASN1_Tree.Nutils; use Ocarina.Backends.ASN1_Tree.Nutils; with Ocarina.Backends.ASN1_Tree.Nutils; use Ocarina.Backends.ASN1_Tree.Nutils;
with Ocarina.Backends.ASN1_Values; use Ocarina.Backends.ASN1_Values; with Ocarina.Backends.ASN1_Values; use Ocarina.Backends.ASN1_Values;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2010-2012 ESA & ISAE. -- -- Copyright (C) 2010-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 Output; use Output; with Ocarina.Output; use Ocarina.Output;
with Ocarina.Backends.ASN1_Tree.Nodes; use Ocarina.Backends.ASN1_Tree.Nodes; with Ocarina.Backends.ASN1_Tree.Nodes; use Ocarina.Backends.ASN1_Tree.Nodes;
...@@ -39,10 +39,10 @@ package Ocarina.Backends.ASN1_Tree.Debug is ...@@ -39,10 +39,10 @@ package Ocarina.Backends.ASN1_Tree.Debug is
N_Indents : Natural := 0; N_Indents : Natural := 0;
procedure W_Eol (N : Natural := 1) renames Output.Write_Eol; procedure W_Eol (N : Natural := 1) renames Ocarina.Output.Write_Eol;
procedure W_Int (N : Int) renames Output.Write_Int; procedure W_Int (N : Int) renames Ocarina.Output.Write_Int;
procedure W_Line (N : String) renames Output.Write_Line; procedure W_Line (N : String) renames Ocarina.Output.Write_Line;
procedure W_Str (N : String) renames Output.Write_Str; procedure W_Str (N : String) renames Ocarina.Output.Write_Str;
procedure W_Indents; procedure W_Indents;
procedure W_Byte (N : Byte); procedure W_Byte (N : Byte);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2010-2012 ESA & ISAE. -- -- Copyright (C) 2010-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 --
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
with GNAT.OS_Lib; use GNAT.OS_Lib; with GNAT.OS_Lib; use GNAT.OS_Lib;
with Outfiles; use Outfiles; with Outfiles; use Outfiles;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Output; use Output; with Ocarina.Output; use Ocarina.Output;
with Ocarina.Backends.ASN1_Values; with Ocarina.Backends.ASN1_Values;
with Ocarina.Backends.ASN1_Tree.Nodes; with Ocarina.Backends.ASN1_Tree.Nodes;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2010-2012 ESA & ISAE. -- -- Copyright (C) 2010-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 --
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
with GNAT.Table; with GNAT.Table;
with Namet; use Namet; with Ocarina.Namet; use Ocarina.Namet;
with Charset; use Charset; with Charset; use Charset;
with Locations; use Locations; with Locations; use Locations;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- 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 -- -- 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 @@
-- -- -- --