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
d2a31d16
Commit
d2a31d16
authored
Oct 11, 2013
by
yoogx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Clarify error message in case of the instantiation of a
(event) data port without full type attached.
parent
baf7e1e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
1 deletion
+23
-1
src/core/instance/ocarina-instances-components-features.adb
src/core/instance/ocarina-instances-components-features.adb
+1
-1
src/core/instance/ocarina-instances-messages.adb
src/core/instance/ocarina-instances-messages.adb
+17
-0
src/core/instance/ocarina-instances-messages.ads
src/core/instance/ocarina-instances-messages.ads
+5
-0
No files found.
src/core/instance/ocarina-instances-components-features.adb
View file @
d2a31d16
...
...
@@ -315,7 +315,7 @@ package body Ocarina.Instances.Components.Features is
-- Abort the instantiation of the corresponding entity if there
-- is no such corresponding entity.
Display_Instantiation_Error
(
Feature
,
Fatal
=>
False
);
Display_
Type_
Instantiation_Error
(
Feature
,
Fatal
=>
False
);
return
No_Node
;
else
C
:=
ATE
.
Get_Referenced_Entity
(
Entity_Ref
(
Feature
));
...
...
src/core/instance/ocarina-instances-messages.adb
View file @
d2a31d16
...
...
@@ -88,4 +88,21 @@ package body Ocarina.Instances.Messages is
Exit_On_Error
(
Fatal
,
"Cannot instantiate full model, exit now"
);
end
Display_Instantiation_Error
;
procedure
Display_Type_Instantiation_Error
(
Node
:
Node_Id
;
Fatal
:
Boolean
:=
True
)
is
pragma
Assert
(
Present
(
Node
));
Error_Msg
:
constant
String
:=
"% (feature) cannot be properly instantiated: requires full type"
;
begin
Error_Loc
(
1
)
:=
Loc
(
Node
);
Error_Name
(
1
)
:=
Get_Name_Of_Entity
(
Node
);
if
Fatal
then
DE
(
Error_Msg
);
else
DW
(
Error_Msg
);
end
if
;
Exit_On_Error
(
Fatal
,
"Cannot instantiate full model, exit now"
);
end
Display_Type_Instantiation_Error
;
end
Ocarina
.
Instances
.
Messages
;
src/core/instance/ocarina-instances-messages.ads
View file @
d2a31d16
...
...
@@ -34,8 +34,13 @@
package
Ocarina
.
Instances
.
Messages
is
procedure
Display_No_Entity_Ref
(
Node
:
Node_Id
);
procedure
Display_Entity_Is_A_Component_Type
(
Node
:
Node_Id
);
procedure
Display_Instantiation_Error
(
Node
:
Node_Id
;
Fatal
:
Boolean
:=
True
);
procedure
Display_Type_Instantiation_Error
(
Node
:
Node_Id
;
Fatal
:
Boolean
:=
True
);
end
Ocarina
.
Instances
.
Messages
;
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