Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
Ocarina
Commits
9405df9b
Commit
9405df9b
authored
May 05, 2014
by
yoogx
Browse files
* Renamed Namet to Ocarina.Namet, Output to Ocarina.Output to
avoid collision with external packages
parent
f4b3e4ea
Changes
213
Hide whitespace changes
Inline
Side-by-side
src/backends/ocarina-backends-aadl_xml-main.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2011-201
2
ESA & ISAE. --
-- Copyright (C) 2011-201
4
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
.
Instances
.
Queries
;
use
Ocarina
.
Instances
.
Queries
;
with
Ocarina
.
AADL_Values
;
...
...
src/backends/ocarina-backends-aadl_xml-mapping.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2011-201
2
ESA & ISAE. --
-- Copyright (C) 2011-201
4
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
.
AADL_Instances
.
Nodes
;
with
Ocarina
.
ME_AADL
.
AADL_Instances
.
Nutils
;
...
...
src/backends/ocarina-backends-aadl_xml.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2011-201
2
ESA & ISAE. --
-- Copyright (C) 2011-201
4
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.XML_Tree.Nutils;
with
Ocarina
.
Backends
.
XML_Tree
.
Generator
;
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
...
...
src/backends/ocarina-backends-ada_tree-debug.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
4
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
.
Ada_Values
;
use
Ocarina
.
Backends
.
Ada_Values
;
...
...
src/backends/ocarina-backends-ada_tree-debug.ads
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
4
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
.
Ada_Tree
.
Nodes
;
use
Ocarina
.
Backends
.
Ada_Tree
.
Nodes
;
...
...
@@ -39,10 +39,10 @@ package Ocarina.Backends.Ada_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
);
...
...
src/backends/ocarina-backends-ada_tree-generator-spark.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-201
4
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
Ocarina
.
Backends
.
Ada_Tree
.
Nodes
;
with
Ocarina
.
Backends
.
Ada_Tree
.
Nutils
;
...
...
src/backends/ocarina-backends-ada_tree-generator.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
3
ESA & ISAE. --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
4
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
;
...
...
src/backends/ocarina-backends-ada_tree-nutils.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
3
ESA & ISAE. --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
4
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,8 +36,8 @@ with GNAT.Case_Util;
with
Charset
;
use
Charset
;
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
Types
;
use
Types
;
with
Utils
;
use
Utils
;
...
...
src/backends/ocarina-backends-ada_values.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-201
4
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
;
...
...
src/backends/ocarina-backends-arinc653_conf-mapping.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-201
4
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
;
...
...
src/backends/ocarina-backends-arinc653_conf-scheduling.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-201
4
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
;
...
...
src/backends/ocarina-backends-arinc653_conf.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2009 Telecom ParisTech, 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2009 Telecom ParisTech, 2010-201
4
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 --
...
...
@@ -48,7 +48,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
.
ARINC653_Conf
is
...
...
src/backends/ocarina-backends-asn1-deployment.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2010-201
4
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
;
with
Ocarina
.
ME_AADL
.
AADL_Instances
.
Nodes
;
...
...
src/backends/ocarina-backends-asn1.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2010-201
4
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,13 +40,13 @@ with Ocarina.Backends.ASN1.Deployment;
with
Ocarina
.
Backends
.
Utils
;
with
GNAT
.
Command_Line
;
with
Namet
;
with
Ocarina
.
Namet
;
package
body
Ocarina
.
Backends
.
ASN1
is
use
GNAT
.
Command_Line
;
use
Namet
;
use
Ocarina
.
Namet
;
use
Ocarina
.
Backends
.
Messages
;
use
Ocarina
.
Backends
.
ASN1_Tree
.
Generator
;
...
...
src/backends/ocarina-backends-asn1_tree-debug.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2010-201
4
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
.
ASN1_Tree
.
Nutils
;
use
Ocarina
.
Backends
.
ASN1_Tree
.
Nutils
;
with
Ocarina
.
Backends
.
ASN1_Values
;
use
Ocarina
.
Backends
.
ASN1_Values
;
...
...
src/backends/ocarina-backends-asn1_tree-debug.ads
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2010-201
4
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
.
ASN1_Tree
.
Nodes
;
use
Ocarina
.
Backends
.
ASN1_Tree
.
Nodes
;
...
...
@@ -39,10 +39,10 @@ package Ocarina.Backends.ASN1_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-asn1_tree-generator.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2010-201
4
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,8 +33,8 @@
with
GNAT
.
OS_Lib
;
use
GNAT
.
OS_Lib
;
with
Outfiles
;
use
Outfiles
;
with
Namet
;
use
Namet
;
with
Output
;
use
Output
;
with
Ocarina
.
Namet
;
use
Ocarina
.
Namet
;
with
Ocarina
.
Output
;
use
Ocarina
.
Output
;
with
Ocarina
.
Backends
.
ASN1_Values
;
with
Ocarina
.
Backends
.
ASN1_Tree
.
Nodes
;
...
...
src/backends/ocarina-backends-asn1_tree-nutils.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2010-201
4
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
.
Table
;
with
Namet
;
use
Namet
;
with
Ocarina
.
Namet
;
use
Ocarina
.
Namet
;
with
Charset
;
use
Charset
;
with
Locations
;
use
Locations
;
...
...
src/backends/ocarina-backends-asn1_values.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- 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 --
-- 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
;
...
...
src/backends/ocarina-backends-boundt.adb
View file @
9405df9b
...
...
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-201
2
ESA & ISAE. --
-- Copyright (C) 2008-2009 Telecom ParisTech, 2010-201
4
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
.
Backends
.
Messages
;
with
Ocarina
.
ME_AADL
;
with
Ocarina
.
ME_AADL
.
AADL_Instances
.
Nodes
;
...
...
@@ -52,7 +52,7 @@ package body Ocarina.Backends.BoundT is
package
ATN
renames
Ocarina
.
ME_AADL
.
AADL_Tree
.
Nodes
;
package
AIN
renames
Ocarina
.
ME_AADL
.
AADL_Instances
.
Nodes
;
use
Namet
;
use
Ocarina
.
Namet
;
use
Ocarina
.
Backends
.
Messages
;
use
Ada
.
Text_IO
;
use
Ocarina
.
ME_AADL
;
...
...
Prev
1
2
3
4
5
…
11
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment