Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
kazoo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TASTE
kazoo
Commits
6d69a28d
PL1
Commit
6d69a28d
authored
4 years ago
by
Maxime Francois Perrotin
Browse files
Options
Downloads
Plain Diff
Merge branch 'feature_unit_raise' into 'master'
Feature unit raise See merge request
!48
parents
82088b97
18bc5833
No related branches found
No related tags found
1 merge request
!48
Feature unit raise
Pipeline
#581913
passed
4 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/taste-aadl_parser.adb
+6
-5
6 additions, 5 deletions
src/taste-aadl_parser.adb
test/TrafficLight_stm32f407/Makefile
+1
-1
1 addition, 1 deletion
test/TrafficLight_stm32f407/Makefile
with
7 additions
and
6 deletions
src/taste-aadl_parser.adb
+
6
−
5
View file @
6d69a28d
...
...
@@ -1134,11 +1134,12 @@ package body TASTE.AADL_Parser is
and
then
(
Unit_Str
/=
"kbyte"
and
Unit_Str
/=
"bytes"
))
or
else
(
Prop_Name
=
"Dispatch_Offset"
and
then
Unit_Str
/=
"ms"
)
then
Put_Error
(
"Unsupported unit '"
&
To_String
(
Unit_Str
)
&
"' used in ConcurrencyView_Properties.aadl. "
&
" Stack_Size shall be in "
&
"'bytes' or 'kbyte' and Dispatch_Offset in 'ms'"
);
raise
AADL_Parser_Error
with
"Unsupported unit '"
&
To_String
(
Unit_Str
)
&
"' used in ConcurrencyView_Properties.aadl. "
&
" Stack_Size shall be in "
&
"'bytes' or 'kbyte' and Dispatch_Offset in 'ms'"
;
return
;
end
if
;
...
...
This diff is collapsed.
Click to expand it.
test/TrafficLight_stm32f407/Makefile
+
1
−
1
View file @
6d69a28d
...
...
@@ -9,7 +9,7 @@ skeletons: InterfaceView.aadl DataView.aadl
$(
KAZOO
)
--gw
-o
work
$(
MAKE
)
-C
work dataview
work/glue_built
:
InterfaceView.aadl DeploymentView.aadl DataView.aadl
work/glue_built
:
InterfaceView.aadl DeploymentView.aadl DataView.aadl
ConcurrencyView_Properties.aadl
$(
KAZOO
)
--glue
--gw
-o
work
touch
work/glue_built
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment