Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
Ocarina
Commits
62cb84c9
Commit
62cb84c9
authored
Apr 14, 2014
by
yoogx
Browse files
* Update checks on connection direction to match AADLv2.1 rules
parent
d67056c9
Changes
1
Show whitespace changes
Inline
Side-by-side
src/core/model/ocarina-analyzer-aadl-semantics.adb
View file @
62cb84c9
...
...
@@ -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 --
...
...
@@ -658,12 +658,19 @@ package body Ocarina.Analyzer.AADL.Semantics is
(
Category
(
Connection_Source
))
=
CC_Data
);
Bus_And_Require_Bus_Access
:=
Kind
(
Connection_Source
)
=
K_Subcomponent
(
Kind
(
Connection_Source
)
=
K_Subcomponent
and
then
Component_Category
'
Val
(
Category
(
Connection_Source
))
=
CC_Bus
and
then
Kind
(
Connection_Destination
)
=
K_Subcomponent_Access
and
then
Component_Category
'
Val
(
Subcomponent_Category
(
Connection_Destination
))
=
CC_Bus
;
(
Subcomponent_Category
(
Connection_Destination
))
=
CC_Bus
)
or
else
(
Kind
(
Connection_Source
)
=
K_Subcomponent_Access
and
then
Component_Category
'
Val
(
Subcomponent_Category
(
Connection_Source
))
=
CC_Bus
and
then
Kind
(
Connection_Destination
)
=
K_Subcomponent
and
then
Component_Category
'
Val
(
Category
(
Connection_Destination
))
=
CC_Bus
);
Provide_Bus_Access_And_Bus
:=
(
Kind
(
Connection_Destination
)
=
K_Subcomponent_Access
...
...
@@ -970,6 +977,8 @@ package body Ocarina.Analyzer.AADL.Semantics is
when
K_Subcomponent_Access
=>
Directions
:=
Is_Bidirectional
(
Node
)
or
else
(
not
Source_Is_Local
and
then
not
Destination_Is_Local
and
then
not
Is_Provided
(
Connection_Destination
)
...
...
@@ -995,7 +1004,7 @@ package body Ocarina.Analyzer.AADL.Semantics is
and
then
Kind
(
Connection_Source
)
=
K_Subcomponent
);
when
K_Subcomponent
=>
Directions
:=
False
;
Directions
:=
Is_Bidirectional
(
Node
)
;
when
others
=>
Directions
:=
True
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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