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
412d9e7e
Commit
412d9e7e
authored
Jun 05, 2015
by
yoogx
Browse files
* Correct resolution of properties applied to connections
For issue #39
parent
216677ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/core/model/ocarina-analyzer-aadl-finder.adb
View file @
412d9e7e
...
...
@@ -1113,7 +1113,8 @@ package body Ocarina.Analyzer.AADL.Finder is
is
pragma
Assert
(
Kind
(
Component
)
=
K_Component_Implementation
or
else
Kind
(
Component
)
=
K_Component_Type
);
or
else
Kind
(
Component
)
=
K_Component_Type
or
else
Kind
(
Component
)
=
K_Port_Spec
);
pragma
Assert
(
Kind
(
Identifier
)
=
K_Identifier
);
begin
return
Find_Subclause_Declaration_Classifier
...
...
@@ -1148,6 +1149,7 @@ package body Ocarina.Analyzer.AADL.Finder is
(
Kind
(
Component
)
=
K_Component_Implementation
or
else
Kind
(
Component
)
=
K_Component_Type
or
else
Kind
(
Component
)
=
K_Feature_Group_Type
or
else
Kind
(
Component
)
=
K_Port_spec
or
else
Kind
(
Component
)
=
K_Subcomponent_Access
);
pragma
Assert
(
Kind
(
Declaration_Identifier
)
=
K_Identifier
);
pragma
Assert
(
Subclause_Kinds
'
Length
>
0
);
...
...
src/core/model/ocarina-analyzer-aadl-links.adb
View file @
412d9e7e
...
...
@@ -1952,6 +1952,10 @@ package body Ocarina.Analyzer.AADL.Links is
when
K_Component_Type
|
K_Component_Implementation
=>
Corresponding_Container
:=
Pointed_Node
;
when
K_Connection
=>
Corresponding_Container
:=
Container_Component
(
Pointed_Node
);
when
others
=>
-- These entities cannot have 'applies to'
-- clause in their property associations.
...
...
src/core/model/ocarina-analyzer-aadl-queries.adb
View file @
412d9e7e
...
...
@@ -1021,6 +1021,9 @@ package body Ocarina.Analyzer.AADL.Queries is
or
else
Named_Element
'
Val
(
Category
(
List_Node
))
=
PO_Port_Connections
or
else
Named_Element
'
Val
(
Category
(
List_Node
))
=
PO_Port_Connection
or
else
Named_Element
'
Val
(
Category
(
List_Node
))
=
PO_Connection
...
...
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