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) 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 --
......@@ -37,7 +37,7 @@ with GNAT.Case_Util;
with Utils; use Utils;
with Charset; use Charset;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.Backends.C_Tree.Nodes;
with Ocarina.Backends.C_Tree.Nutils;
......
......@@ -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 --
......@@ -55,8 +55,8 @@ with Ocarina.Backends.XML_Tree.Generator;
with GNAT.Command_Line; use GNAT.Command_Line;
with GNAT.OS_Lib; use GNAT.OS_Lib;
with Namet; use Namet;
with Output; use Output;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.Output; use Ocarina.Output;
package body Ocarina.Backends.POK_C is
use Ocarina.Instances;
......
......@@ -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 --
......@@ -47,7 +47,7 @@ with Ocarina.Instances.Queries;
with GNAT.Command_Line; use GNAT.Command_Line;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.Backends.POK_Cheddar is
......
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-2013 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 --
......@@ -32,7 +32,7 @@
------------------------------------------------------------------------------
with Locations;
with Namet;
with Ocarina.Namet;
with Utils; use Utils;
with Ocarina.ME_AADL.AADL_Tree.Nodes;
......@@ -52,7 +52,7 @@ with Ocarina.Backends.Messages;
package body Ocarina.Backends.Properties is
use Locations;
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL.AADL_Tree.Nodes;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
use Ocarina.ME_AADL.AADL_Instances.Nutils;
......
......@@ -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,14 +31,14 @@
-- --
------------------------------------------------------------------------------
with Output;
with Namet;
with Ocarina.Output;
with Ocarina.Namet;
with Ocarina.ME_REAL.REAL_Tree.Nodes;
package body Ocarina.Backends.REAL.Debug is
use Ocarina.ME_REAL.REAL_Tree.Nodes;
use Namet;
use Output;
use Ocarina.Namet;
use Ocarina.Output;
--------------------
-- Print_All_Sets --
......
......@@ -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,8 +32,8 @@
------------------------------------------------------------------------------
with Ada.Numerics.Generic_Elementary_Functions;
with Namet;
with Output;
with Ocarina.Namet;
with Ocarina.Output;
with Locations; use Locations;
with Ocarina.Analyzer.REAL;
......@@ -70,8 +70,8 @@ package body Ocarina.Backends.REAL is
use Ocarina.REAL_Values;
use Ocarina.Instances.REAL_Finder;
use Ocarina.Backends.Messages;
use Namet;
use Output;
use Ocarina.Namet;
use Ocarina.Output;
package RN renames Ocarina.ME_REAL.REAL_Tree.Nodes;
package RNU renames Ocarina.ME_REAL.REAL_Tree.Nutils;
......
......@@ -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 --
......@@ -33,7 +33,7 @@
with Charset; use Charset;
with Locations; use Locations;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Utils; use Utils;
with Ocarina.Backends.RTSJ_Values; use Ocarina.Backends.RTSJ_Values;
with Ocarina.Backends.RTSJ_Tree.Nutils;
......
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- 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 Output; use Output;
with Ocarina.Output; use Ocarina.Output;
with Ocarina.Backends.RTSJ_Tree.Nodes; use Ocarina.Backends.RTSJ_Tree.Nodes;
......@@ -39,10 +39,10 @@ package Ocarina.Backends.RTSJ_Tree.Debug is
N_Indents : Natural := 0;
procedure W_Eol (N : Natural := 1) renames Output.Write_Eol;
procedure W_Int (N : Int) renames Output.Write_Int;
procedure W_Line (N : String) renames Output.Write_Line;
procedure W_Str (N : String) renames Output.Write_Str;
procedure W_Eol (N : Natural := 1) renames Ocarina.Output.Write_Eol;
procedure W_Int (N : Int) renames Ocarina.Output.Write_Int;
procedure W_Line (N : String) renames Ocarina.Output.Write_Line;
procedure W_Str (N : String) renames Ocarina.Output.Write_Str;
procedure W_Indents;
procedure W_Boolean (N : Boolean);
......
......@@ -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,8 +31,8 @@
-- --
------------------------------------------------------------------------------
with Namet; use Namet;
with Output; use Output;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.Output; use Ocarina.Output;
with Utils; use Utils;
with Outfiles; use Outfiles;
......
......@@ -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 --
......@@ -35,7 +35,7 @@ with GNAT.Table;
with Charset; use Charset;
with Locations; use Locations;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Utils; use Utils;
with Ocarina.Backends.Utils; use Ocarina.Backends.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; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with GNAT.Table;
......
......@@ -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 --
......@@ -45,7 +45,7 @@ with Ocarina.Backends.XML_Tree.Nodes;
with Ocarina.Backends.XML_Tree.Nutils;
with Ocarina.Backends.Stats.Mapping;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.Backends.Stats.Main is
......
......@@ -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 Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Tree.Nodes;
with Ocarina.ME_AADL.AADL_Tree.Entities;
......
......@@ -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 --
......@@ -40,7 +40,7 @@ with Ocarina.Backends.Utils;
with GNAT.Command_Line; use GNAT.Command_Line;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.Backends.Stats is
......
......@@ -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 --
......@@ -51,7 +51,7 @@ with Ocarina.Backends.Properties;
with GNAT.Command_Line; use GNAT.Command_Line;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.Backends.Subprograms is
use Ocarina.Instances;
......
......@@ -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 --
......@@ -35,7 +35,7 @@ with GNAT.OS_Lib;
with Ada.Directories;
with GNAT.Table;
with Namet;
with Ocarina.Namet;
with Locations;
with Ocarina.ME_AADL;
......@@ -63,7 +63,7 @@ package body Ocarina.Backends.Utils is
use GNAT.OS_Lib;
use Ada.Directories;
use Namet;
use Ocarina.Namet;
use Locations;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
......
......@@ -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 --
......@@ -33,7 +33,7 @@
with Charset; use Charset;
with Locations; use Locations;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Utils; use Utils;
with Ocarina.Backends.XML_Values; use Ocarina.Backends.XML_Values;
......
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- 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 Output; use Output;
with Ocarina.Output; use Ocarina.Output;
with Ocarina.Backends.XML_Tree.Nodes; use Ocarina.Backends.XML_Tree.Nodes;
......@@ -39,10 +39,10 @@ package Ocarina.Backends.XML_Tree.Debug is
N_Indents : Natural := 0;
procedure W_Eol (N : Natural := 1) renames Output.Write_Eol;
procedure W_Int (N : Int) renames Output.Write_Int;
procedure W_Line (N : String) renames Output.Write_Line;
procedure W_Str (N : String) renames Output.Write_Str;
procedure W_Eol (N : Natural := 1) renames Ocarina.Output.Write_Eol;
procedure W_Int (N : Int) renames Ocarina.Output.Write_Int;
procedure W_Line (N : String) renames Ocarina.Output.Write_Line;
procedure W_Str (N : String) renames Ocarina.Output.Write_Str;
procedure W_Indents;
procedure W_Byte (N : Byte);
......
......@@ -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,8 +31,8 @@
-- --
------------------------------------------------------------------------------
with Namet; use Namet;
with Output; use Output;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.Output; use Ocarina.Output;
with Utils; use Utils;
with Ada.Directories;
......
......@@ -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 --
......@@ -35,7 +35,7 @@ with GNAT.Table;
with Charset; use Charset;
with Locations; use Locations;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Utils; use Utils;
with Ocarina.Backends.Utils;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment