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
35b268be
Commit
35b268be
authored
Dec 26, 2017
by
yoogx
Browse files
* Added Bounded_Array representation
For openaadl/ocarina#119
parent
045d4c00
Changes
14
Hide whitespace changes
Inline
Side-by-side
resources/data_model.aadl
View file @
35b268be
...
...
@@ -24,7 +24,7 @@ property set Data_Model is
-- types (10**(-scale) is the precision).
Data_Representation : enumeration
(Array, Boolean, Character, Enum, Float,
(Array, Boolean,
Bounded_Array,
Character, Enum, Float,
Fixed, Integer, String, Struct, Union)
applies to ( data );
-- The Data_Representation property may be used to specify the
...
...
tests/SAE-behaviour_annex-04202009/ba_example_005.aadl.out
View file @
35b268be
...
...
@@ -7,6 +7,7 @@
package
Test
public
with
Base_Types
;
...
...
@@ -39,6 +40,7 @@ public
end
Test
;
package
Base_Types
public
with
data_model
;
...
...
@@ -164,7 +166,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
tests/real-annexes-parsing/test_real_parse_01.aadl.out
View file @
35b268be
...
...
@@ -24,7 +24,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
tests/real-annexes-parsing/test_real_parse_02.aadl.out
View file @
35b268be
...
...
@@ -24,7 +24,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
tests/real-annexes-parsing/test_real_parse_03.aadl.out
View file @
35b268be
...
...
@@ -24,7 +24,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
tests/real-annexes-parsing/test_real_parse_04.aadl.out
View file @
35b268be
...
...
@@ -24,7 +24,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
tests/real-annexes-parsing/test_real_parse_05.aadl.out
View file @
35b268be
...
...
@@ -24,7 +24,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
tests/test042/test.aadl.out
View file @
35b268be
...
...
@@ -20,7 +20,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
tests/test_behavior_annex/test_ba_parser/ba_example_sub_1.aadl.out
View file @
35b268be
...
...
@@ -20,7 +20,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
@@ -58,6 +58,7 @@ data)
end
Data_Model
;
package
Base_Types
public
with
data_model
;
...
...
@@ -170,6 +171,7 @@ public
end
Base_Types
;
package
BA_example1
public
with
Base_Types
;
...
...
tests/test_behavior_annex/test_ba_parser/ba_example_sub_2.aadl.out
View file @
35b268be
...
...
@@ -20,7 +20,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
@@ -58,6 +58,7 @@ data)
end
Data_Model
;
package
Base_Types
public
with
data_model
;
...
...
@@ -170,6 +171,7 @@ public
end
Base_Types
;
package
BA_example2
public
with
Base_Types
;
...
...
tests/test_behavior_annex/test_ba_parser/ba_example_sub_3.aadl.out
View file @
35b268be
...
...
@@ -20,7 +20,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
@@ -58,6 +58,7 @@ data)
end
Data_Model
;
package
Base_Types
public
with
data_model
;
...
...
@@ -170,6 +171,7 @@ public
end
Base_Types
;
package
BA_example3
public
data
number
end
number
;
...
...
tests/test_behavior_annex/test_ba_parser/ba_example_th_1.aadl.out
View file @
35b268be
...
...
@@ -20,7 +20,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
@@ -58,6 +58,7 @@ data)
end
Data_Model
;
package
Base_Types
public
with
data_model
;
...
...
@@ -170,6 +171,7 @@ public
end
Base_Types
;
package
BA_example1
public
with
Base_types
,
Data_Model
;
...
...
tests/test_behavior_annex/test_ba_parser/ba_example_th_2.aadl.out
View file @
35b268be
...
...
@@ -20,7 +20,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
@@ -58,6 +58,7 @@ data)
end
Data_Model
;
package
Base_Types
public
with
data_model
;
...
...
@@ -170,6 +171,7 @@ public
end
Base_Types
;
package
BA_example2
public
with
Base_Types
;
...
...
tests/test_behavior_annex/test_ba_parser/ba_example_th_3.aadl.out
View file @
35b268be
...
...
@@ -20,7 +20,7 @@ data)
Data_Scale
:
aadlinteger
applies
to
(
data
);
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
Data_Representation
:
enumeration
(
Array
,
Boolean
,
Bounded_Array
,
Character
,
Enum
,
Float
,
Fixed
,
Integer
,
String
,
Struct
,
Union
)
applies
to
(
data
);
Dimension
:
list
of
aadlinteger
...
...
@@ -58,6 +58,7 @@ data)
end
Data_Model
;
package
Base_Types
public
with
data_model
;
...
...
@@ -176,6 +177,7 @@ property set Behavior_Properties is
end
Behavior_Properties
;
package
BA_example3
public
with
Base_Types
;
with
Behavior_Properties
;
...
...
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