Skip to content

GitLab

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
Hide whitespace changes
Inline Side-by-side
src/backends/ocarina-backends-mast.adb
View file @ 9405df9b
......@@ -6,7 +6,7 @@
-- --
-- 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 --
-- it under terms of the GNU General Public License as published by the --
......@@ -41,7 +41,7 @@ with Ocarina.Backends.MAST.Main;
with Ocarina.Backends.MAST_Tree.Generator;
with GNAT.Command_Line; use GNAT.Command_Line;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.Backends.MAST is
......
src/backends/ocarina-backends-mast_tree-debug.adb
View file @ 9405df9b
......@@ -6,7 +6,7 @@
-- --
-- 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 --
-- 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.MAST_Values; use Ocarina.Backends.MAST_Values;
......
src/backends/ocarina-backends-mast_tree-debug.ads
View file @ 9405df9b
......@@ -6,7 +6,7 @@
-- --
-- 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 --
-- 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.MAST_Tree.Nodes; use Ocarina.Backends.MAST_Tree.Nodes;
......@@ -39,10 +39,10 @@ package Ocarina.Backends.MAST_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);
......
src/backends/ocarina-backends-mast_tree-generator.adb
View file @ 9405df9b
......@@ -6,7 +6,7 @@
-- --
-- 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 --
-- 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 GNAT.OS_Lib; use GNAT.OS_Lib;
......
src/backends/ocarina-backends-mast_tree-nutils.adb
View file @ 9405df9b
......@@ -6,7 +6,7 @@
-- --
-- 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 --
-- 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 Ocarina.Backends.MAST_Values;
-- with Utils; use Utils;
......
src/backends/ocarina-backends-mast_values.adb
View file @ 9405df9b
......@@ -6,7 +6,7 @@
-- --
-- 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 --
-- 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.AADL_Values;
with GNAT.Table;
......
src/backends/ocarina-backends-messages.adb
View file @ 9405df9b
......@@ -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 --
......@@ -32,7 +32,7 @@
------------------------------------------------------------------------------
with GNAT.OS_Lib; use GNAT.OS_Lib;
with Output; use Output;
with Ocarina.Output; use Ocarina.Output;
with Ocarina.Options; use Ocarina.Options;
package body Ocarina.Backends.Messages is
......
src/backends/ocarina-backends-pn-components.adb
View file @ 9405df9b
......@@ -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 Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
with Namet;
with Ocarina.Namet;
with Ocarina.Backends.PN.Nodes;
with Ocarina.Backends.PN.Nutils;
......@@ -237,7 +237,7 @@ package body Ocarina.Backends.PN.Components is
is
use OPN;
use Ocarina.Backends.PN.Nutils;
use Namet;
use Ocarina.Namet;
use Ocarina.Backends.Properties;
use Ocarina.Aadl_Values;
use Ocarina.Backends.PN.Iutils;
......@@ -1643,7 +1643,7 @@ package body Ocarina.Backends.PN.Components is
use Ocarina.Backends.PN.Utils;
use OAV;
use Ocarina.Backends.Properties;
use Namet;
use Ocarina.Namet;
use AIN;
use OPND;
......@@ -2477,7 +2477,7 @@ package body Ocarina.Backends.PN.Components is
use Ocarina.Backends.PN.Iutils;
use Ocarina.Aadl_Values;
use Ocarina.Backends.Properties;
use Namet;
use Ocarina.Namet;
use AIN;
PN_Spg_Par : Node_Id;
......@@ -2594,7 +2594,7 @@ package body Ocarina.Backends.PN.Components is
F : Types.Value_Id)
is
use Namet;
use Ocarina.Namet;
use AIN;
use Ocarina.AADL_Values;
use Ocarina.Backends.PN.Nodes;
......@@ -2696,7 +2696,7 @@ package body Ocarina.Backends.PN.Components is
use Ocarina.Backends.PN.Iutils;
use Ocarina.Aadl_Values;
use Ocarina.Backends.Properties;
use Namet;
use Ocarina.Namet;
use AIN;
use Ocarina.Backends.Utils;
use Ocarina.Instances.Queries;
......@@ -2864,7 +2864,7 @@ package body Ocarina.Backends.PN.Components is
use Ocarina.Backends.PN.Iutils;
use Ocarina.Aadl_Values;
use Ocarina.Backends.Properties;
use Namet;
use Ocarina.Namet;
use AIN;
use Ocarina.Backends.Utils;
use Ocarina.Instances.Queries;
......@@ -3185,7 +3185,7 @@ package body Ocarina.Backends.PN.Components is
use Ocarina.Backends.PN.Nutils;
use Ocarina.Backends.PN.Iutils;
use Ocarina.Aadl_Values;
use Namet;
use Ocarina.Namet;
type Thread_Pattern is array (Integer range <>) of Name_Id;
......
src/backends/ocarina-backends-pn-debug.adb
View file @ 9405df9b
......@@ -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;
package body Ocarina.Backends.PN.Debug is
......
src/backends/ocarina-backends-pn-debug.ads
View file @ 9405df9b
......@@ -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 --
......@@ -32,16 +32,16 @@
------------------------------------------------------------------------------
with Ocarina.Backends.PN.Nodes; use Ocarina.Backends.PN.Nodes;
with Output; use Output;
with Ocarina.Output; use Ocarina.Output;
package Ocarina.Backends.PN.Debug is
N_Indents : Integer := -1;
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);
......
src/backends/ocarina-backends-pn-format-cami.adb
View file @ 9405df9b
......@@ -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,12 +31,12 @@
-- --
------------------------------------------------------------------------------
with Output;
with Ocarina.Output;
with Ocarina.Backends.PN.Debug;
with Ocarina.Backends.PN.Nodes;
with Ocarina.Backends.PN.Nutils;
with Namet;
with Ocarina.Namet;
with Ocarina.AADL_Values;
with Ocarina.Backends.Utils;
......@@ -53,10 +53,10 @@ package body Ocarina.Backends.PN.Format.Cami is
procedure Print_Place (Pn_Generated : Node_Id;
Pn_P : Node_Id)
is
use Output;
use Ocarina.Output;
use Ocarina.Backends.PN.Debug;
use OPN;
use Namet;
use Ocarina.Namet;
use OAV;
begin
......@@ -171,10 +171,10 @@ package body Ocarina.Backends.PN.Format.Cami is
procedure Print_Trans (Pn_Generated : Node_Id;
Pn_T : Node_Id)
is
use Output;
use Ocarina.Output;
use Ocarina.Backends.PN.Debug;
use OPN;
use Namet;
use Ocarina.Namet;
use OAV;
use OPU;
use Ocarina.Backends.Utils;
......@@ -345,9 +345,9 @@ package body Ocarina.Backends.PN.Format.Cami is
procedure Print_Formalism_Information
(Pn_Generated : Node_Id)
is
use Output;
use Ocarina.Output;
use OPN;
use Namet;
use Ocarina.Namet;
use OAV;
use OPU;
......
src/backends/ocarina-backends-pn-format-tina.adb
View file @ 9405df9b
......@@ -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,10 +31,10 @@
-- --
------------------------------------------------------------------------------
with Output;
with Ocarina.Output;
with Ocarina.Backends.PN.Nodes;
with Ocarina.Backends.PN.Nutils;
with Namet;
with Ocarina.Namet;
with Ocarina.AADL_Values;
package body Ocarina.Backends.PN.Format.Tina is
......@@ -48,9 +48,9 @@ package body Ocarina.Backends.PN.Format.Tina is
-------------------
procedure Print_Place (Pn_Generated : Node_Id; Pn_P : Node_Id) is
use Output;
use Ocarina.Output;
use OPN;
use Namet;
use Ocarina.Namet;
use OAV;
begin
......@@ -68,9 +68,9 @@ package body Ocarina.Backends.PN.Format.Tina is
-------------------
procedure Print_Trans (Pn_Generated : Node_Id; Pn_T : Node_Id) is
use Output;
use Ocarina.Output;
use OPN;
use Namet;
use Ocarina.Namet;
use OAV;
use OPU;
......@@ -155,9 +155,9 @@ package body Ocarina.Backends.PN.Format.Tina is
procedure Print_Formalism_Information
(Pn_Generated : Node_Id)
is
use Output;
use Ocarina.Output;
use OPN;
use Namet;
use Ocarina.Namet;
use OAV;
use OPU;
......
src/backends/ocarina-backends-pn-iutils.adb
View file @ 9405df9b
......@@ -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.AADL_Values;
with Namet;
with Ocarina.Namet;
with Ocarina.Instances.Queries;
with Ocarina.Backends.PN.Nodes;
......@@ -577,7 +577,7 @@ package body Ocarina.Backends.PN.Iutils is
is
use Ocarina.Backends.PN.Nodes;
use Ocarina.Backends.PN.Nutils;
use Namet;
use Ocarina.Namet;
begin
......@@ -603,7 +603,7 @@ package body Ocarina.Backends.PN.Iutils is
is
use Ocarina.Backends.PN.Nodes;
use Ocarina.Backends.PN.Nutils;
use Namet;
use Ocarina.Namet;
use Ocarina.Instances.Queries;
begin
......@@ -813,7 +813,7 @@ package body Ocarina.Backends.PN.Iutils is
is
use Ocarina.Backends.PN.Nodes;
use Ocarina.Aadl_Values;
use Namet;
use Ocarina.Namet;
use Ocarina.Instances.Queries;
use Ocarina.Backends.PN.Nutils;
......@@ -850,7 +850,7 @@ package body Ocarina.Backends.PN.Iutils is
is
use Ocarina.Backends.PN.Nodes;
use Ocarina.Aadl_Values;
use Namet;
use Ocarina.Namet;
use Ocarina.Instances.Queries;
begin
......@@ -898,7 +898,7 @@ package body Ocarina.Backends.PN.Iutils is
use Ocarina.Backends.PN.Nutils;
use Ocarina.Backends.PN.Nodes;
use Ocarina.Aadl_Values;
use Namet;
use Ocarina.Namet;
I : constant Node_Id := New_Node (K_CPN_Specific_Informations);
begin
......@@ -1041,7 +1041,7 @@ package body Ocarina.Backends.PN.Iutils is
is
use Ocarina.Backends.PN.Nodes;
use Ocarina.Backends.PN.Nutils;
use Namet;
use Ocarina.Namet;
use Ocarina.AADL_Values;
use Ocarina.ME_AADL.AADL_Instances.Entities;
use Ocarina.ME_AADL;
......@@ -1181,7 +1181,7 @@ package body Ocarina.Backends.PN.Iutils is
is
use Ocarina.Backends.PN.Nodes;
use Ocarina.Aadl_Values;
use Namet;
use Ocarina.Namet;
use Ocarina.Instances.Queries;
use Ocarina.Backends.PN.Nutils;
use OPND;
......@@ -1277,7 +1277,7 @@ package body Ocarina.Backends.PN.Iutils is
is
use Ocarina.Backends.PN.Nodes;
use Ocarina.Aadl_Values;
use Namet;
use Ocarina.Namet;
use Ocarina.Instances.Queries;
use Ocarina.Backends.PN.Nutils;
......
src/backends/ocarina-backends-pn.adb
View file @ 9405df9b
......@@ -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 GNAT.OS_Lib; use GNAT.OS_Lib;
with Namet;
with Ocarina.Namet;
with Ocarina.Backends.Expander;
with Ocarina.Backends.PN.Components;
......@@ -45,7 +45,7 @@ with Ocarina.Backends.PN.Format.Cami;
with Ocarina.Backends.PN.Printer;
with Output;
with Ocarina.Output;
with Ocarina.Backends.Utils;
package body Ocarina.Backends.PN is
......@@ -53,14 +53,14 @@ package body Ocarina.Backends.PN is
package OPFT renames Ocarina.Backends.PN.Format.Tina;
package OPFC renames Ocarina.Backends.PN.Format.Cami;
use Namet;
use Ocarina.Namet;
use Ocarina.Instances;
use Ocarina.Backends.Expander;
use Ocarina.Backends.PN.Components;
use Ocarina.Backends.PN.Printer;
use OPFT;
use OPFC;
use Output;
use Ocarina.Output;
use Ocarina.Backends.Utils;
procedure Generate_TINA (AADL_Root : Types.Node_Id);
......
src/backends/ocarina-backends-po_hi_ada-activity.adb
View file @ 9405df9b
......@@ -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 Locations;
with Ocarina.ME_AADL;
......@@ -51,7 +51,7 @@ with Ocarina.Backends.PO_HI_Ada.Runtime;
package body Ocarina.Backends.PO_HI_Ada.Activity is
use Namet;
use Ocarina.Namet;
use Locations;
use Ocarina.ME_AADL;
use Ocarina.ME_AADL.AADL_Instances.Nodes;
......
src/backends/ocarina-backends-po_hi_ada-deployment.adb
View file @ 9405df9b
......@@ -6,7 +6,7 @@
-- --
-- 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 --
-- 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;
......@@ -49,7 +49,7 @@ with Ocarina.Backends.PO_HI_Ada.Runtime;
package body Ocarina.Backends.PO_HI_Ada.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;
......
src/backends/ocarina-backends-po_hi_ada-main.adb
View file @ 9405df9b
......@@ -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; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Instances.Nodes;
with Ocarina.ME_AADL.AADL_Instances.Nutils;
......
src/backends/ocarina-backends-po_hi_ada-mapping.adb
View file @ 9405df9b
......@@ -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; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Utils; use Utils;
with Ocarina.ME_AADL.AADL_Tree.Nodes;
......