Commit 53a8f51e authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Merge branch 'rpi' into 'master'

Rpi

See merge request !61
parents 8688fe9f a3d9a20d
...@@ -2,7 +2,7 @@ all: ...@@ -2,7 +2,7 @@ all:
mkdir -p tmp mkdir -p tmp
mkdir -p new-templates mkdir -p new-templates
# Extract the latest template tags from any demo project and put them in the new-templates folder # Extract the latest template tags from any demo project and put them in the new-templates folder
cd ../test/test-cv && kazoo --doc -o ../../doc/tmp --gw -g --glue && mv ../../doc/tmp/Dump/Doc/* ../../doc/new-templates cd ../test/Demo_Distrib && kazoo --doc -o ../../doc/tmp --gw -g --glue && mv ../../doc/tmp/Dump/Doc/* ../../doc/new-templates
mkdir -p preprocess mkdir -p preprocess
cp templates/templates_from_wiki preprocess # copy the previous one cp templates/templates_from_wiki preprocess # copy the previous one
mv templates/templates_from_wiki templates/templates_from_wiki.old # delete the old templates mv templates/templates_from_wiki templates/templates_from_wiki.old # delete the old templates
......
...@@ -7,6 +7,7 @@ templates/skeletons/sub/function.tmplt ...@@ -7,6 +7,7 @@ templates/skeletons/sub/function.tmplt
templates/skeletons/sub/interface.tmplt templates/skeletons/sub/interface.tmplt
templates/skeletons/sub/makefile.tmplt templates/skeletons/sub/makefile.tmplt
templates/concurrency_view/sub/trigger.tmplt templates/concurrency_view/sub/trigger.tmplt
templates/concurrency_view/sub/bus.tmplt
templates/concurrency_view/sub/thread.tmplt templates/concurrency_view/sub/thread.tmplt
templates/concurrency_view/sub/pi.tmplt templates/concurrency_view/sub/pi.tmplt
templates/concurrency_view/sub/ri.tmplt templates/concurrency_view/sub/ri.tmplt
......
...@@ -18,6 +18,12 @@ This template is evaluated only once. The output is saved to the Makefile within ...@@ -18,6 +18,12 @@ This template is evaluated only once. The output is saved to the Makefile within
|Has_Context_Param |Has_Context_Param
|↳ and flag to indicate if function has context parameters |↳ and flag to indicate if function has context parameters
|- |-
|Instance_Of
|↳ and the instance name or empty string
|-
|Is_Shared_Type
|↳ true if component is an instance of a function stored in the shared types folder
|-
|CP_Files |CP_Files
|List of all context parameters ASN.1 files |List of all context parameters ASN.1 files
|- |-
...@@ -80,6 +86,12 @@ This template is evaluated only once. The output is saved to the Makefile within ...@@ -80,6 +86,12 @@ This template is evaluated only once. The output is saved to the Makefile within
|- |-
|Glue |Glue
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
|-
|CPU_Platform
|DOCUMENTATION MISSING
|-
|Is_FPGA
|DOCUMENTATION MISSING
|} |}
=== templates/skeletons/context-parameters.tmplt === === templates/skeletons/context-parameters.tmplt ===
This template is evaluated for every function which has context parameters. The output is saved to the file Context-<function name>.asn This template is evaluated for every function which has context parameters. The output is saved to the file Context-<function name>.asn
...@@ -112,7 +124,7 @@ This template is evaluated for every function which has context parameters. The ...@@ -112,7 +124,7 @@ This template is evaluated for every function which has context parameters. The
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
|- |-
|Instance_Of |Instance_Of
|DOCUMENTATION MISSING |Name of instance or empty string
|} |}
=== templates/skeletons/sub/trigger.tmplt === === templates/skeletons/sub/trigger.tmplt ===
This template is evaluated to trigger processing of other files from given directory. This template is evaluated to trigger processing of other files from given directory.
...@@ -148,7 +160,7 @@ This template is identical for Skeleton and Glue subfolders. ...@@ -148,7 +160,7 @@ This template is identical for Skeleton and Glue subfolders.
|Value of command line flag --polyorb-hi-c (or -p) |Value of command line flag --polyorb-hi-c (or -p)
|- |-
|List_Of_PIs |List_Of_PIs
|DOCUMENTATION MISSING |List of all provided interfaces (names only)
|- |-
|ASync_RI_Param_Type |ASync_RI_Param_Type
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
...@@ -607,6 +619,9 @@ The output of this template is saved to the file with name returned by processin ...@@ -607,6 +619,9 @@ The output of this template is saved to the file with name returned by processin
|- |-
|Shared_Lib_Dir |Shared_Lib_Dir
|Path to the shared component type folder |Path to the shared component type folder
|-
|List_Of_PIs
|List of all provided interfaces (names only)
|} |}
=== templates/concurrency_view/sub/trigger.tmplt === === templates/concurrency_view/sub/trigger.tmplt ===
This file is processed for every node. The result of this file indicates if the rest of templates for given node will be processed. This file is processed for every node. The result of this file indicates if the rest of templates for given node will be processed.
...@@ -680,6 +695,28 @@ This file is processed for every node. The result of this file indicates if the ...@@ -680,6 +695,28 @@ This file is processed for every node. The result of this file indicates if the
|Is_Distributed |Is_Distributed
|True if the system contains at least one bus |True if the system contains at least one bus
|} |}
=== templates/concurrency_view/sub/bus.tmplt ===
This template is parsed for all busses referenced in system.tmplt
{| class="wikitable"
!Parameter name
!Description
|-
|Bus_Name
|Name of the bus
|-
|Classifier
|AADL Classifier for the bus
|-
|Property_Names
|AADL property names (vector tag)
|-
|Property_Values
|AADL property values
|-
|AADL_Package
|AADL package name containing the bus
|}
=== templates/concurrency_view/sub/thread.tmplt === === templates/concurrency_view/sub/thread.tmplt ===
This file is processed for every thread in every partition in every node. This file is processed for every thread in every partition in every node.
{| class="wikitable" {| class="wikitable"
...@@ -1007,7 +1044,7 @@ This template is evaluated for every block. ...@@ -1007,7 +1044,7 @@ This template is evaluated for every block.
|Required interfaces (from ri.tmplt) |Required interfaces (from ri.tmplt)
|- |-
|List_Of_PIs |List_Of_PIs
|Complete list of provided interfaces |List of all provided interfaces (names only)
|- |-
|List_Of_ASync_RIs |List_Of_ASync_RIs
|Vector tag: name of asynchronous RIs |Vector tag: name of asynchronous RIs
...@@ -1139,7 +1176,7 @@ This template is evaluated for every block. ...@@ -1139,7 +1176,7 @@ This template is evaluated for every block.
|True if function is a function type |True if function is a function type
|- |-
|Instance_Of |Instance_Of
|DOCUMENTATION MISSING |Name of instance or empty string
|- |-
|Debug_Flag |Debug_Flag
|if -g is set in the command line |if -g is set in the command line
...@@ -1462,6 +1499,15 @@ This file is evaluated for every node. The result of this file is saved to the f ...@@ -1462,6 +1499,15 @@ This file is evaluated for every node. The result of this file is saved to the f
|- |-
|Glue |Glue
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
|-
|Block_Instance_Of
|DOCUMENTATION MISSING
|-
|Block_Languages
|DOCUMENTATION MISSING
|-
|Block_Names
|DOCUMENTATION MISSING
|} |}
=== templates/concurrency_view/sub/system.tmplt === === templates/concurrency_view/sub/system.tmplt ===
This file is evaluated for every node. The result of this file is save to the file with name returned by This file is evaluated for every node. The result of this file is save to the file with name returned by
...@@ -1477,7 +1523,10 @@ filesys.tmplt. ...@@ -1477,7 +1523,10 @@ filesys.tmplt.
|Vector Tag of node names |Vector Tag of node names
|- |-
|Node_CPU |Node_CPU
| -> Corresponding CPU name (eg x86_linux) | &#8627; Corresponding CPU name (e.g. x86_linux)
|-
|Node_Platform
| &#8627; Corresponding platform (e.g. PLATFORM_AIR)
|- |-
|Node_CPU_Classifier |Node_CPU_Classifier
| &#8627; Corresponding CPU Classifier (ocarina...::x86_linux) | &#8627; Corresponding CPU Classifier (ocarina...::x86_linux)
...@@ -1530,6 +1579,9 @@ filesys.tmplt. ...@@ -1530,6 +1579,9 @@ filesys.tmplt.
|Bus_Classifier |Bus_Classifier
| &#8627; Corresponding AADL classifier | &#8627; Corresponding AADL classifier
|- |-
|Bus_Properties
| &#8627; Corresponding AADL properties (from bus.tmplt)
|-
|Device_Node_Name |Device_Node_Name
| |
|- |-
...@@ -1645,4 +1697,7 @@ filesys.tmplt. ...@@ -1645,4 +1697,7 @@ filesys.tmplt.
|- |-
|Used_Shared_Types |Used_Shared_Types
|List of actually used shared component types |List of actually used shared component types
|-
|Block_Languages
|DOCUMENTATION MISSING
|} |}
\ No newline at end of file
...@@ -21,8 +21,8 @@ This template is evaluated for every block. ...@@ -21,8 +21,8 @@ This template is evaluated for every block.
| Required | Required interfaces (from | | Required | Required interfaces (from |
| | ri.tmplt) | | | ri.tmplt) |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| List_Of_PIs | Complete list of provided | | List_Of_PIs | List of all provided interfaces |
| | interfaces | | | (names only) |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| List_Of_ASync_RIs | Vector tag: name of asynchronous | | List_Of_ASync_RIs | Vector tag: name of asynchronous |
| | RIs | | | RIs |
...@@ -126,7 +126,7 @@ This template is evaluated for every block. ...@@ -126,7 +126,7 @@ This template is evaluated for every block.
| Is_Type | True if function is a function | | Is_Type | True if function is a function |
| | type | | | type |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Instance_Of | DOCUMENTATION MISSING | | Instance_Of | Name of instance or empty string |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Debug_Flag | if -g is set in the command line | | Debug_Flag | if -g is set in the command line |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
......
templates/concurrency_view/sub/bus.tmplt
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This template is parsed for all busses referenced in system.tmplt
+-----------------+--------------------------------------+
| Parameter name | Description |
+=================+======================================+
| Bus_Name | Name of the bus |
+-----------------+--------------------------------------+
| Classifier | AADL Classifier for the bus |
+-----------------+--------------------------------------+
| Property_Names | AADL property names (vector tag) |
+-----------------+--------------------------------------+
| Property_Values | AADL property values |
+-----------------+--------------------------------------+
| AADL_Package | AADL package name containing the bus |
+-----------------+--------------------------------------+
...@@ -101,3 +101,9 @@ used as a parameter for system.tmplt. ...@@ -101,3 +101,9 @@ used as a parameter for system.tmplt.
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Glue | DOCUMENTATION MISSING | | Glue | DOCUMENTATION MISSING |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Block_Instance_Of | DOCUMENTATION MISSING |
+-----------------------------------+-----------------------------------+
| Block_Languages | DOCUMENTATION MISSING |
+-----------------------------------+-----------------------------------+
| Block_Names | DOCUMENTATION MISSING |
+-----------------------------------+-----------------------------------+
...@@ -11,9 +11,12 @@ to the file with name returned by filesys.tmplt. ...@@ -11,9 +11,12 @@ to the file with name returned by filesys.tmplt.
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Node_Names | Vector Tag of node names | | Node_Names | Vector Tag of node names |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Node_CPU | -> Corresponding CPU name (eg | | Node_CPU | Corresponding CPU name (e.g. |
| | x86_linux) | | | x86_linux) |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Node_Platform | ↳ Corresponding platform (e.g. |
| | PLATFORM_AIR) |
+-----------------------------------+-----------------------------------+
| Node_CPU_Classifier | ↳ Corresponding CPU Classifier | | Node_CPU_Classifier | ↳ Corresponding CPU Classifier |
| | (ocarina...::x86_linux) | | | (ocarina...::x86_linux) |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
...@@ -61,6 +64,9 @@ to the file with name returned by filesys.tmplt. ...@@ -61,6 +64,9 @@ to the file with name returned by filesys.tmplt.
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Bus_Classifier | ↳ Corresponding AADL classifier | | Bus_Classifier | ↳ Corresponding AADL classifier |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Bus_Properties | ↳ Corresponding AADL properties |
| | (from bus.tmplt) |
+-----------------------------------+-----------------------------------+
| Device_Node_Name | | | Device_Node_Name | |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Device_Partition | | | Device_Partition | |
......
...@@ -18,6 +18,12 @@ This template is evaluated only once. The output is saved to the Makefile within ...@@ -18,6 +18,12 @@ This template is evaluated only once. The output is saved to the Makefile within
|Has_Context_Param |Has_Context_Param
|&#8627; and flag to indicate if function has context parameters |&#8627; and flag to indicate if function has context parameters
|- |-
|Instance_Of
|&#8627; and the instance name or empty string
|-
|Is_Shared_Type
|&#8627; true if component is an instance of a function stored in the shared types folder
|-
|CP_Files |CP_Files
|List of all context parameters ASN.1 files |List of all context parameters ASN.1 files
|- |-
...@@ -80,6 +86,12 @@ This template is evaluated only once. The output is saved to the Makefile within ...@@ -80,6 +86,12 @@ This template is evaluated only once. The output is saved to the Makefile within
|- |-
|Glue |Glue
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
|-
|CPU_Platform
|DOCUMENTATION MISSING
|-
|Is_FPGA
|DOCUMENTATION MISSING
|} |}
=== templates/skeletons/context-parameters.tmplt === === templates/skeletons/context-parameters.tmplt ===
This template is evaluated for every function which has context parameters. The output is saved to the file Context-<function name>.asn This template is evaluated for every function which has context parameters. The output is saved to the file Context-<function name>.asn
...@@ -112,7 +124,7 @@ This template is evaluated for every function which has context parameters. The ...@@ -112,7 +124,7 @@ This template is evaluated for every function which has context parameters. The
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
|- |-
|Instance_Of |Instance_Of
|DOCUMENTATION MISSING |Name of instance or empty string
|} |}
=== templates/skeletons/sub/trigger.tmplt === === templates/skeletons/sub/trigger.tmplt ===
This template is evaluated to trigger processing of other files from given directory. This template is evaluated to trigger processing of other files from given directory.
...@@ -148,7 +160,7 @@ This template is identical for Skeleton and Glue subfolders. ...@@ -148,7 +160,7 @@ This template is identical for Skeleton and Glue subfolders.
|Value of command line flag --polyorb-hi-c (or -p) |Value of command line flag --polyorb-hi-c (or -p)
|- |-
|List_Of_PIs |List_Of_PIs
|DOCUMENTATION MISSING |List of all provided interfaces (names only)
|- |-
|ASync_RI_Param_Type |ASync_RI_Param_Type
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
...@@ -607,6 +619,9 @@ The output of this template is saved to the file with name returned by processin ...@@ -607,6 +619,9 @@ The output of this template is saved to the file with name returned by processin
|- |-
|Shared_Lib_Dir |Shared_Lib_Dir
|Path to the shared component type folder |Path to the shared component type folder
|-
|List_Of_PIs
|List of all provided interfaces (names only)
|} |}
=== templates/concurrency_view/sub/trigger.tmplt === === templates/concurrency_view/sub/trigger.tmplt ===
This file is processed for every node. The result of this file indicates if the rest of templates for given node will be processed. This file is processed for every node. The result of this file indicates if the rest of templates for given node will be processed.
...@@ -680,6 +695,28 @@ This file is processed for every node. The result of this file indicates if the ...@@ -680,6 +695,28 @@ This file is processed for every node. The result of this file indicates if the
|Is_Distributed |Is_Distributed
|True if the system contains at least one bus |True if the system contains at least one bus
|} |}
=== templates/concurrency_view/sub/bus.tmplt ===
This template is parsed for all busses referenced in system.tmplt
{| class="wikitable"
!Parameter name
!Description
|-
|Bus_Name
|Name of the bus
|-
|Classifier
|AADL Classifier for the bus
|-
|Property_Names
|AADL property names (vector tag)
|-
|Property_Values
|AADL property values
|-
|AADL_Package
|AADL package name containing the bus
|}
=== templates/concurrency_view/sub/thread.tmplt === === templates/concurrency_view/sub/thread.tmplt ===
This file is processed for every thread in every partition in every node. This file is processed for every thread in every partition in every node.
{| class="wikitable" {| class="wikitable"
...@@ -1007,7 +1044,7 @@ This template is evaluated for every block. ...@@ -1007,7 +1044,7 @@ This template is evaluated for every block.
|Required interfaces (from ri.tmplt) |Required interfaces (from ri.tmplt)
|- |-
|List_Of_PIs |List_Of_PIs
|Complete list of provided interfaces |List of all provided interfaces (names only)
|- |-
|List_Of_ASync_RIs |List_Of_ASync_RIs
|Vector tag: name of asynchronous RIs |Vector tag: name of asynchronous RIs
...@@ -1139,7 +1176,7 @@ This template is evaluated for every block. ...@@ -1139,7 +1176,7 @@ This template is evaluated for every block.
|True if function is a function type |True if function is a function type
|- |-
|Instance_Of |Instance_Of
|DOCUMENTATION MISSING |Name of instance or empty string
|- |-
|Debug_Flag |Debug_Flag
|if -g is set in the command line |if -g is set in the command line
...@@ -1462,6 +1499,15 @@ This file is evaluated for every node. The result of this file is saved to the f ...@@ -1462,6 +1499,15 @@ This file is evaluated for every node. The result of this file is saved to the f
|- |-
|Glue |Glue
|DOCUMENTATION MISSING |DOCUMENTATION MISSING
|-
|Block_Instance_Of
|DOCUMENTATION MISSING
|-
|Block_Languages
|DOCUMENTATION MISSING
|-
|Block_Names
|DOCUMENTATION MISSING
|} |}
=== templates/concurrency_view/sub/system.tmplt === === templates/concurrency_view/sub/system.tmplt ===
This file is evaluated for every node. The result of this file is save to the file with name returned by This file is evaluated for every node. The result of this file is save to the file with name returned by
...@@ -1477,7 +1523,10 @@ filesys.tmplt. ...@@ -1477,7 +1523,10 @@ filesys.tmplt.
|Vector Tag of node names |Vector Tag of node names
|- |-
|Node_CPU |Node_CPU
| -> Corresponding CPU name (eg x86_linux) | &#8627; Corresponding CPU name (e.g. x86_linux)
|-
|Node_Platform
| &#8627; Corresponding platform (e.g. PLATFORM_AIR)
|- |-
|Node_CPU_Classifier |Node_CPU_Classifier
| &#8627; Corresponding CPU Classifier (ocarina...::x86_linux) | &#8627; Corresponding CPU Classifier (ocarina...::x86_linux)
...@@ -1530,6 +1579,9 @@ filesys.tmplt. ...@@ -1530,6 +1579,9 @@ filesys.tmplt.
|Bus_Classifier |Bus_Classifier
| &#8627; Corresponding AADL classifier | &#8627; Corresponding AADL classifier
|- |-
|Bus_Properties
| &#8627; Corresponding AADL properties (from bus.tmplt)
|-
|Device_Node_Name |Device_Node_Name
| |
|- |-
......
...@@ -23,5 +23,5 @@ parameters. The output is saved to the file Context-.asn ...@@ -23,5 +23,5 @@ parameters. The output is saved to the file Context-.asn
+----------------+-----------------------------------------------------+ +----------------+-----------------------------------------------------+
| Is_Type | DOCUMENTATION MISSING | | Is_Type | DOCUMENTATION MISSING |
+----------------+-----------------------------------------------------+ +----------------+-----------------------------------------------------+
| Instance_Of | DOCUMENTATION MISSING | | Instance_Of | Name of instance or empty string |
+----------------+-----------------------------------------------------+ +----------------+-----------------------------------------------------+
...@@ -19,6 +19,13 @@ Makefile within output directory. ...@@ -19,6 +19,13 @@ Makefile within output directory.
| Has_Context_Param | ↳ and flag to indicate if | | Has_Context_Param | ↳ and flag to indicate if |
| | function has context parameters | | | function has context parameters |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Instance_Of | ↳ and the instance name or empty |
| | string |
+-----------------------------------+-----------------------------------+
| Is_Shared_Type | ↳ true if component is an |
| | instance of a function stored in |
| | the shared types folder |
+-----------------------------------+-----------------------------------+
| CP_Files | List of all context parameters | | CP_Files | List of all context parameters |
| | ASN.1 files | | | ASN.1 files |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
...@@ -64,3 +71,7 @@ Makefile within output directory. ...@@ -64,3 +71,7 @@ Makefile within output directory.
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| Glue | DOCUMENTATION MISSING | | Glue | DOCUMENTATION MISSING |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| CPU_Platform | DOCUMENTATION MISSING |
+-----------------------------------+-----------------------------------+
| Is_FPGA | DOCUMENTATION MISSING |
+-----------------------------------+-----------------------------------+
...@@ -41,3 +41,6 @@ languagename] ...@@ -41,3 +41,6 @@ languagename]
| Shared_Lib_Dir | Path to the shared component type | | Shared_Lib_Dir | Path to the shared component type |
| | folder | | | folder |
+-----------------------------------+-----------------------------------+ +-----------------------------------+-----------------------------------+
| List_Of_PIs | List of all provided interfaces |
| | (names only) |
+-----------------------------------+-----------------------------------+
...@@ -25,7 +25,7 @@ and Glue subfolders. ...@@ -25,7 +25,7 @@ and Glue subfolders.
+-----------------------+---------------------------------------------------+ +-----------------------+---------------------------------------------------+
| Use_POHIC | Value of command line flag --polyorb-hi-c (or -p) | | Use_POHIC | Value of command line flag --polyorb-hi-c (or -p) |
+-----------------------+---------------------------------------------------+ +-----------------------+---------------------------------------------------+
| List_Of_PIs | DOCUMENTATION MISSING | | List_Of_PIs | List of all provided interfaces (names only) |
+-----------------------+---------------------------------------------------+ +-----------------------+---------------------------------------------------+
| ASync_RI_Param_Type | DOCUMENTATION MISSING | | ASync_RI_Param_Type | DOCUMENTATION MISSING |
+-----------------------+---------------------------------------------------+ +-----------------------+---------------------------------------------------+
......
...@@ -24,7 +24,6 @@ begin ...@@ -24,7 +24,6 @@ begin
Model.Concurrency_View.Generate_CV; Model.Concurrency_View.Generate_CV;
end if; end if;
Model.Generate_Build_Script;
Model.Generate_Code; Model.Generate_Code;
if Model.Configuration.Generate_Doc then if Model.Configuration.Generate_Doc then
......
-- ************************ TASTE AADL Parser ************************** -- -- ************************ TASTE AADL Parser ************************** --
-- Based on Ocarina **************************************************** -- -- Based on Ocarina **************************************************** --
-- (c) 2019 Maxime Perrotin / European Space Agency - maxime.perrotin@esa.int -- (c) 2019-2021 Maxime Perrotin / ESA - maxime.perrotin@esa.int
-- LGPL license, see LICENSE file -- ********************************************************************* --
--
with System.Assertions, with System.Assertions,
Ada.Exceptions, Ada.Exceptions,
Ada.IO_Exceptions, Ada.IO_Exceptions,
...@@ -20,10 +20,8 @@ with System.Assertions, ...@@ -20,10 +20,8 @@ with System.Assertions,
Ocarina.Configuration, Ocarina.Configuration,
Ocarina.Files, Ocarina.Files,
Ocarina.Parser, Ocarina.Parser,
-- Ocarina.FE_AADL.Parser,
Ocarina.Options, Ocarina.Options,
TASTE.Backend, TASTE.Backend,
TASTE.Backend.Build_Script,
TASTE.Backend.Code_Generators, TASTE.Backend.Code_Generators,
TASTE.Semantic_Check; TASTE.Semantic_Check;
...@@ -37,7 +35,6 @@ use Ada.Text_IO, ...@@ -37,7 +35,6 @@ use Ada.Text_IO,
Ocarina; Ocarina;
-- for the parsing of ConcurrencyView_Properties.aadl: -- for the parsing of ConcurrencyView_Properties.aadl:
-- with ocarina.BE_AADL; use ocarina.BE_AADL;
with Ocarina.ME_AADL.AADL_Tree.Nodes; with Ocarina.ME_AADL.AADL_Tree.Nodes;
with Ocarina.ME_AADL.AADL_Tree.Nutils; with Ocarina.ME_AADL.AADL_Tree.Nutils;
use Ocarina.ME_AADL.AADL_Tree.Nodes;