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
a73afec4
Commit
a73afec4
authored
Nov 23, 2018
by
Jerome Hugues
Browse files
* Resolve unit iff unit identifier present
Add corresponding test case For issue #177
parent
e75f4d62
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
src/core/model/ocarina-analyzer-aadl-links.adb
View file @
a73afec4
...
...
@@ -3206,7 +3206,7 @@ package body Ocarina.Analyzer.AADL.Links is
if
Present
(
Property_Type
)
then
declare
Unit_Type
:
Node_Id
;
Unit_Type
:
Node_Id
:=
No_Node
;
V_Unit_Id
:
constant
Node_Id
:=
Unit_Identifier
(
Node
);
Unit_Id
:
Node_Id
;
...
...
@@ -3217,10 +3217,11 @@ package body Ocarina.Analyzer.AADL.Links is
-- iterate over the property designator until we
-- find the corresponding entity to operate on.
if
Kind
(
Property_Type_Designator
(
Entity
(
Property_Type_Designator
(
Property_Type
))))
=
K_Record_Type
if
Present
(
V_Unit_Id
)
and
then
Kind
(
Property_Type_Designator
(
Entity
(
Property_Type_Designator
(
Property_Type
))))
=
K_Record_Type
then
List_Node
:=
First_Node
(
List_Items
...
...
@@ -3242,11 +3243,13 @@ package body Ocarina.Analyzer.AADL.Links is
List_Node
:=
Next_Node
(
List_Node
);
end
loop
;
else
Unit_Type
:=
Unwind_Units_Type
(
Root
,
Property_Type_Designator
if
Present
(
V_Unit_Id
)
then
Unit_Type
:=
Unwind_Units_Type
(
Root
,
Property_Type_Designator
(
Entity
(
Property_Type_Designator
(
Property_Type
))));
end
if
;
end
if
;
else
Unit_Type
:=
Unwind_Units_Type
(
Root
,
Property_Type
);
...
...
tests/MANIFEST
View file @
a73afec4
...
...
@@ -326,6 +326,7 @@ tests/github/issue_56/testFeatureGroup.aadl
tests/github/issue_66/test.aadl
tests/github/issue_87/test.aadl
tests/github/issue_174/test.aadl
tests/github/issue_177/test.aadl
tests/root_system/test.aadl
...
...
tests/github/issue_177/MANIFEST
0 → 100644
View file @
a73afec4
AADL_VERSION=-aadlv2
OCARINA_FLAGS= -f -g aadl
tests/github/issue_177/test.aadl
0 → 100644
View file @
a73afec4
property
set
ps
is
Position_In_File
:
record
(
line
:
aadlinteger
;
column
:
aadlinteger
;)
applies
to
(
data
);
end
ps
;
package
foo
public
with
PS
;
DATA
T_Int8
PROPERTIES
PS
::
Position_In_File
=>
[
line
=>
10
;
column
=>
1
;
];
end
T_Int8
;
end
foo
;
tests/github/issue_177/test.aadl.out
0 → 100644
View file @
a73afec4
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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