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
8b0c42a8
Commit
8b0c42a8
authored
May 26, 2015
by
Arnaud Schach
Browse files
Merge remote-tracking branch 'remotes/openaadl/master'
parents
51988726
27d419b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/core/instance/ocarina-instances.adb
View file @
8b0c42a8
...
...
@@ -33,6 +33,7 @@
with
Errors
;
with
Locations
;
with
Utils
;
with
Ocarina
.
Namet
;
with
Ocarina
.
Output
;
...
...
@@ -55,6 +56,7 @@ package body Ocarina.Instances is
use
Errors
;
use
Locations
;
use
Utils
;
use
Ocarina
.
Namet
;
use
Ocarina
.
Output
;
...
...
@@ -174,10 +176,11 @@ package body Ocarina.Instances is
List_Node
:=
Root_Systems
.
First
;
while
Present
(
List_Node
)
loop
exit
when
(
ATE
.
Get_Name_Of_Entity
(
List_Node
,
False
)
=
Root_System_Name
(
To_Lower
(
ATE
.
Get_Name_Of_Entity
(
List_Node
,
False
))
=
To_Lower
(
Root_System_Name
)
or
else
ATE
.
Get_Name_Of_Entity
(
List_Node
,
False
,
True
)
=
Root_System_Name
);
To_Lower
(
ATE
.
Get_Name_Of_Entity
(
List_Node
,
False
,
True
)
)
=
To_Lower
(
Root_System_Name
)
)
;
List_Node
:=
ATN
.
Next_Entity
(
List_Node
);
end
loop
;
...
...
@@ -211,11 +214,15 @@ package body Ocarina.Instances is
if
Root_System_Name
/=
No_Name
and
then
ATE
.
Get_Name_Of_Entity
(
Root_System
,
False
)
/=
Root_System_Name
To_Lower
(
ATE
.
Get_Name_Of_Entity
(
Root_System
,
False
))
/=
To_Lower
(
Root_System_Name
)
and
then
To_Lower
(
ATE
.
Get_Name_Of_Entity
(
Root_System
,
False
,
True
))
/=
To_Lower
(
Root_System_Name
)
then
Error_Name
(
1
)
:=
Root_System_Name
;
Error_Name
(
2
)
:=
ATE
.
Get_Name_Of_Entity
(
Root_System
);
Error_Name
(
2
)
:=
ATE
.
Get_Name_Of_Entity
(
Root_System
,
False
,
True
);
DE
(
"system % is not a root system, use %"
);
Root_System
:=
No_Node
;
Exit_On_Error
(
True
,
"Cannot instantiate AADL model"
);
...
...
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