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 --
......@@ -31,11 +31,11 @@
-- --
------------------------------------------------------------------------------
with Namet;
with Ocarina.Namet;
with Utils;
package body Ocarina.ME_REAL.Tokens is
use Namet;
use Ocarina.Namet;
procedure New_Token
(Token : Token_Type;
......
......@@ -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 Charset; use Charset;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.Me_AADL.AADL_Tree.Nodes; use Ocarina.Me_AADL.AADL_Tree.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 --
......@@ -33,7 +33,7 @@
with Charset;
with Locations;
with Namet;
with Ocarina.Namet;
with Ada.Characters.Handling;
with Ada.Numerics.Generic_Elementary_Functions;
......@@ -108,7 +108,7 @@ package body Ocarina.REAL_Values is
function Image (Value : Value_Type; Quoted : Boolean := True) return String
is
use Namet;
use Ocarina.Namet;
begin
Name_Len := 0;
......
......@@ -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,15 +35,15 @@ with Ada.Characters.Handling;
with Charset;
with Errors;
with Namet;
with Output; use Output;
with Ocarina.Namet;
with Ocarina.Output; use Ocarina.Output;
with Ocarina.AADL_Values;
package body Ocarina.FE_AADL.Lexer is
use ASCII;
use Namet;
use Ocarina.Namet;
use Errors;
use Ocarina.Files;
......
......@@ -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 Locations; use Locations;
with Ocarina.ME_AADL.AADL_Tree.Nodes;
with Ocarina.ME_AADL.AADL_Tree.Nutils;
with Namet;
with Ocarina.Namet;
with Ocarina.ME_AADL.Tokens;
with Ocarina.FE_AADL.Lexer;
......@@ -93,7 +93,7 @@ package body Ocarina.FE_AADL.Parser.Components is
use Ocarina.ME_AADL.Tokens;
use Lexer;
use Ocarina.ME_AADL.AADL_Tree.Nodes;
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL.AADL_Tree.Nutils;
Loc2, Start_Loc : Location;
......@@ -386,7 +386,7 @@ package body Ocarina.FE_AADL.Parser.Components is
Private_Declaration : Boolean)
return Node_Id
is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL.AADL_Tree.Nodes;
use Ocarina.ME_AADL.AADL_Tree.Nutils;
use Ocarina.Builder.AADL.Components;
......@@ -1093,7 +1093,7 @@ package body Ocarina.FE_AADL.Parser.Components is
(Identifier : Types.Node_Id)
return Boolean
is
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL.AADL_Tree.Nodes;
use Ocarina.ME_AADL.Tokens;
......
......@@ -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.Tokens;
with Ocarina.FE_AADL.Lexer;
with Namet;
with Ocarina.Namet;
with Ocarina.ME_AADL.AADL_Tree.Nutils;
with Locations;
with Ocarina.ME_AADL.AADL_Tree.Nodes;
......@@ -284,7 +284,7 @@ package body Ocarina.FE_AADL.Parser.Identifiers is
use Ocarina.ME_AADL.AADL_Tree.Nodes;
use Ocarina.ME_AADL.AADL_Tree.Nutils;
use Ocarina.ME_AADL.AADL_Tree.Entities;
use Namet;
use Ocarina.Namet;
use Locations;
use Ocarina.FE_AADL.Lexer;
......
......@@ -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 Ocarina.ME_AADL;
with Ocarina.ME_AADL.AADL_Tree.Nodes;
with Ocarina.ME_AADL.AADL_Tree.Nutils;
with Ocarina.ME_AADL.AADL_Tree.Entities;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.FE_AADL.Lexer;
with Ocarina.ME_AADL.Tokens;
with Ocarina.FE_AADL.Parser.Annexes;
......
......@@ -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;
......
......@@ -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,8 +32,8 @@
------------------------------------------------------------------------------
with Locations; use Locations;
with Namet; use Namet;
with Output; use Output;
with Ocarina.Namet; use Ocarina.Namet;
with Ocarina.Output; use Ocarina.Output;
with Ocarina.FE_AADL.Lexer; use Ocarina.FE_AADL.Lexer;
with Ocarina.FE_AADL.Parser.Namespaces; use Ocarina.FE_AADL.Parser.Namespaces;
......
......@@ -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,16 +35,16 @@ with Ada.Characters.Handling;
with Locations;
with Charset;
with Namet;
with Output;
with Ocarina.Namet;
with Ocarina.Output;
with Ocarina.FE_AADL.Lexer;
package body Ocarina.FE_AADL.Parser_Errors is
use Output;
use Ocarina.Output;
use Ocarina.FE_AADL.Lexer;
use Locations;
use Namet;
use Ocarina.Namet;
use Charset;
procedure Display_Parsing_Code (Code : Parsing_Code);
......
......@@ -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,14 +31,14 @@
-- --
------------------------------------------------------------------------------
with Output;
with Ocarina.Output;
with Ocarina.FE_AADL.Parser;
with Ocarina.ME_AADL.Tokens;
package body Ocarina.FE_AADL is
use Output;
use Ocarina.Output;
----------
-- Init --
......
......@@ -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,14 +35,14 @@ with Ada.Characters.Handling;
with Charset;
with Errors;
with Namet;
with Ocarina.Namet;
with Ocarina.AADL_Values;
package body Ocarina.FE_AADL_BA.Lexer is
use ASCII;
use Namet;
use Ocarina.Namet;
use Errors;
use Ocarina.Files;
......
......@@ -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 Locations;
with Namet;
with Ocarina.Namet;
with Ocarina.AADL_Values;
with Ocarina.ME_AADL_BA.Tokens;
with Ocarina.FE_AADL_BA.Lexer;
......@@ -208,7 +208,7 @@ package body Ocarina.FE_AADL_BA.Parser.Identifiers is
return Node_Id
is
use Locations;
use Namet;
use Ocarina.Namet;
use Ocarina.ME_AADL_BA.Tokens;
use Ocarina.FE_AADL_BA.Lexer;
use Ocarina.ME_AADL_BA.BA_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 Output;
with Ocarina.Output;
with GNAT.OS_Lib;
......@@ -45,7 +45,7 @@ with Ocarina.ME_AADL_BA.BA_Tree.Nutils;
package body Ocarina.FE_AADL_BA.Parser is
use Output;
use Ocarina.Output;
use Locations;
use GNAT.OS_Lib;
......
......@@ -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,13 +35,13 @@ with Ada.Characters.Handling;
with Locations;
with Charset;
with Output;
with Ocarina.Output;
with GNAT.OS_Lib;
with Ocarina.FE_AADL_BA.Lexer;
package body Ocarina.FE_AADL_BA.Parser_Errors is
use Output;
use Ocarina.Output;
use GNAT.OS_Lib;
use Ocarina.FE_AADL_BA.Lexer;
use Locations;
......
......@@ -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 Ocarina.Output;
with Ocarina.FE_AADL_BA.Parser;
with Ocarina.ME_AADL_BA.Tokens;
package body Ocarina.FE_AADL_BA is
use Output;
use Ocarina.Output;
----------
-- Init --
......
......@@ -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 Errors; use Errors;
with Namet; use Namet;
with Ocarina.Namet; use Ocarina.Namet;
package body Ocarina.FE_REAL.Lexer 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 --
......@@ -44,7 +44,7 @@ with Ocarina.Builder.REAL;
with Ocarina.Parser;
with Ocarina.Files;
with Ocarina.Analyzer.REAL;
with Namet;
with Ocarina.Namet;
package body Ocarina.FE_REAL.Parser is
......@@ -1928,7 +1928,7 @@ package body Ocarina.FE_REAL.Parser is
is
use GNAT.Command_Line;
use Ocarina.Parser;
use Namet;
use Ocarina.Namet;
C : Character;
begin
......
......@@ -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,13 +33,13 @@
with Locations;
with Charset;
with Output;
with Ocarina.Output;
with Ada.Characters.Handling;
with GNAT.OS_Lib; use GNAT.OS_Lib;
package body Ocarina.FE_REAL.Parser_Errors is
use Output;
use Ocarina.Output;
use Locations;
use Charset;
......
......@@ -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 Ocarina.Output;
with Ocarina.FE_REAL.Parser;
with Ocarina.ME_REAL.Tokens;
package body Ocarina.FE_REAL is
use Output;
use Ocarina.Output;
----------
-- Init --
......
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