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) 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 --
-- it under terms of the GNU General Public License as published by the --
......@@ -35,7 +35,7 @@ with GNAT.OS_Lib; use GNAT.OS_Lib;
with GNAT.Case_Util;
with Charset; use Charset;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.Backends.Ada_Tree.Nodes;
with Ocarina.Backends.Ada_Tree.Nutils;
......
......@@ -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 --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
......@@ -47,7 +47,7 @@ with Ocarina.Backends.PO_HI_Ada.Runtime;
package body Ocarina.Backends.PO_HI_Ada.Transport is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
use Ocarina.ME_AADL.AADL_Instances.Entities;
......
......@@ -6,7 +6,7 @@
-- --
-- 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 --
-- it under terms of the GNU General Public License as published by the --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Tree.Nodes;
......@@ -50,7 +50,7 @@ with Ocarina.Backends.PO_HI_Ada.Runtime;
package body Ocarina.Backends.PO_HI_Ada.Types is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
use Ocarina.ME_AADL.AADL_Instances.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 --
......@@ -32,7 +32,7 @@
------------------------------------------------------------------------------
with GNAT.OS_Lib;
with Output;
with Ocarina.Output;
with Utils;
with Ocarina.Instances;
......@@ -58,12 +58,12 @@ with Ocarina.Backends.Execution_Tests;
with GNAT.Command_Line; use GNAT.Command_Line;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.Backends.PO_HI_Ada is
use GNAT.OS_Lib;
use Output;
use Ocarina.Output;
use Ocarina.Instances;
use Ocarina.Backends.Ada_Tree.Generator;
use Ocarina.Backends.Expander;
......
......@@ -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;
with Ocarina.Namet;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
......@@ -48,7 +48,7 @@ with Ocarina.Backends.Messages;
package body Ocarina.Backends.PO_HI_C.Activity is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
use Ocarina.Backends.Utils;
......
......@@ -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;
with Ocarina.Namet;
with Utils; use Utils;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
......@@ -53,7 +53,7 @@ with Locations;
package body Ocarina.Backends.PO_HI_C.Deployment is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
use Ocarina.ME_AADL.AADL_Instances.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 --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.ME_AADL;
with 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 --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.ME_AADL;
with 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 --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Utils; use Utils;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
......@@ -48,7 +48,7 @@ with Ocarina.Backends.C_Tree.Nutils;
package body Ocarina.Backends.PO_HI_C.Naming is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
use Ocarina.ME_AADL.AADL_Instances.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 --
......@@ -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 --
......@@ -32,7 +32,7 @@
------------------------------------------------------------------------------
with GNAT.OS_Lib;
with Output;
with Ocarina.Output;
with GNAT.Directory_Operations;
......@@ -62,15 +62,15 @@ with Ocarina.Backends.Properties;
with Ocarina.Backends.ASN1;
with GNAT.Command_Line;
with Namet;
with Ocarina.Namet;
package body Ocarina.Backends.PO_HI_C is
use GNAT.Command_Line;
use GNAT.OS_Lib;
use Namet;
use Output;
use Ocarina.Namet;
use Ocarina.Output;
use GNAT.Directory_Operations;
......
......@@ -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 Ocarina.ME_AADL;
with 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 --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Utils; use Utils;
with Ocarina.Backends.Messages;
......@@ -47,7 +47,7 @@ with Ocarina.ME_AADL.AADL_Instances.Nutils;
package body Ocarina.Backends.PO_HI_RTSJ.Mapping is
use Namet;
use Ocarina.Namet;
use Ocarina.Backends.Messages;
use Ocarina.Backends.RTSJ_Values;
use Ocarina.Backends.RTSJ_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 --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
......@@ -48,7 +48,7 @@ with Ocarina.Backends.RTSJ_Values;
package body Ocarina.Backends.PO_HI_RTSJ.Naming is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL;
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 --
......@@ -36,7 +36,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.RTSJ_Tree.Nodes;
with Ocarina.Backends.RTSJ_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 --
......@@ -31,7 +31,7 @@
-- --
------------------------------------------------------------------------------
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with GNAT.Command_Line; use GNAT.Command_Line;
with Ocarina.Instances;
......
......@@ -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;
with Ocarina.Namet;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
......@@ -50,7 +50,7 @@ with Ocarina.Instances.Queries;
package body Ocarina.Backends.POK_C.Activity is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
use Ocarina.Backends.Utils;
......
......@@ -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;
with Ocarina.Namet;
with Utils; use Utils;
with Locations;
......@@ -57,7 +57,7 @@ with Ocarina.ME_AADL.AADL_Instances.Entities.Properties;
package body Ocarina.Backends.POK_C.Deployment is
use Namet;
use Ocarina.Namet;
use Locations;
use Ocarina.Backends.Properties;
use Ocarina.Backends.Messages;
......
......@@ -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;
with Ocarina.Namet;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
with Ocarina.ME_AADL.AADL_Instances.Nutils;
......@@ -49,7 +49,7 @@ with Ocarina.Instances.Queries;
package body Ocarina.Backends.POK_C.Main is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
use Ocarina.ME_AADL.AADL_Instances.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 --
......@@ -32,9 +32,9 @@
------------------------------------------------------------------------------
with Locations; use Locations;
with Namet;
with Ocarina.Namet;
with GNAT.OS_Lib;
with Output;
with Ocarina.Output;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
with Ocarina.ME_AADL.AADL_Instances.Nutils;
......@@ -48,8 +48,8 @@ with Ocarina.Backends.C_Tree.Nodes;
with Ocarina.Instances.Queries;
package body Ocarina.Backends.POK_C.Makefile is
use Namet;
use Output;
use Ocarina.Namet;
use Ocarina.Output;
use GNAT.OS_Lib;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
......
Supports Markdown
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