Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Ocarina
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
TASTE
Ocarina
Commits
4f5c3e4c
Commit
4f5c3e4c
authored
Nov 18, 2015
by
yoogx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Refine test for 9.4 (L7)
For issue #50
parent
ff7e1af2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
8 deletions
+38
-8
src/core/model/ocarina-analyzer-aadl-semantics.adb
src/core/model/ocarina-analyzer-aadl-semantics.adb
+14
-8
tests/MANIFEST
tests/MANIFEST
+1
-0
tests/github/issue_50/test2.aadl
tests/github/issue_50/test2.aadl
+23
-0
No files found.
src/core/model/ocarina-analyzer-aadl-semantics.adb
View file @
4f5c3e4c
...
...
@@ -1021,7 +1021,7 @@ package body Ocarina.Analyzer.AADL.Semantics is
Directions
:=
True
;
-- There is no direction for a port group
when
K_Subcomponent_Access
=>
when
K_Subcomponent_Access
|
K_Subcomponent
=>
Directions
:=
Is_Bidirectional
(
Node
)
or
else
...
...
@@ -1033,7 +1033,9 @@ package body Ocarina.Analyzer.AADL.Semantics is
(
not
Source_Is_Local
and
then
not
Destination_Is_Local
and
then
not
Is_Provided
(
Connection_Destination
)
and
then
not
(
Kind
(
Connection_Destination
)
=
K_Subcomponent_Access
and
then
Is_Provided
(
Connection_Destination
))
and
then
Kind
(
Connection_Source
)
=
K_Subcomponent_Access
and
then
Is_Provided
(
Connection_Source
))
...
...
@@ -1049,14 +1051,18 @@ package body Ocarina.Analyzer.AADL.Semantics is
(
not
Source_Is_Local
and
then
Destination_Is_Local
and
then
Is_Provided
(
Connection_Destination
)
and
then
(
Kind
(
Connection_Destination
)
=
K_Subcomponent_Access
and
then
Is_Provided
(
Connection_Destination
))
and
then
Kind
(
Connection_Source
)
=
K_Subcomponent_Access
and
then
Is_Provided
(
Connection_Source
))
or
else
(
Source_Is_Local
and
then
Destination_Is_Local
and
then
Is_Provided
(
Connection_Destination
)
and
then
(
Kind
(
Connection_Destination
)
=
K_Subcomponent_Access
and
then
Is_Provided
(
Connection_Destination
))
and
then
Kind
(
Connection_Source
)
=
K_Subcomponent
)
or
else
...
...
@@ -1071,15 +1077,15 @@ package body Ocarina.Analyzer.AADL.Semantics is
(((
Source_Is_Local
and
then
not
Destination_Is_Local
)
or
else
(
not
Source_Is_Local
and
then
Destination_Is_Local
))
and
then
not
Is_Provided
(
Connection_Destination
)
and
then
((
Kind
(
Connection_Destination
)
=
K_Subcomponent_Access
and
then
not
Is_Provided
(
Connection_Destination
))
or
else
Kind
(
Connection_Destination
)
=
K_Subcomponent
)
and
then
((
Kind
(
Connection_Source
)
=
K_Subcomponent_Access
and
then
not
Is_Provided
(
Connection_Source
))
or
else
Kind
(
Connection_Source
)
=
K_Subcomponent
));
when
K_Subcomponent
=>
Directions
:=
Is_Bidirectional
(
Node
);
when
others
=>
Directions
:=
True
;
end
case
;
...
...
tests/MANIFEST
View file @
4f5c3e4c
...
...
@@ -290,5 +290,6 @@ tests/github/issue_36/test.aadl
tests/github/issue_39/pb1.aadl
tests/github/issue_47/test.aadl
tests/github/issue_50/test.aadl
tests/github/issue_50/test2.aadl
tests/root_system/test.aadl
tests/github/issue_50/test2.aadl
0 → 100644
View file @
4f5c3e4c
package
Test
public
system
t1
features
rba
:
requires
bus
access
b1
.
i1
;
end
t1
;
bus
b1
end
b1
;
bus
implementation
b1
.
i1
end
b1
.
i1
;
system
s
end
s
;
system
implementation
s
.
impl
subcomponents
part1
:
system
t1
;
bus1
:
bus
b1
;
connections
c1
:
bus
access
part1
.
rba
->
bus1
;
end
s
.
impl
;
end
Test
;
\ No newline at end of file
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